From cf8d13a76fa5fe5514e2d9cc0fffd41fb2fc2a7b Mon Sep 17 00:00:00 2001 From: Laurent Vivier Date: Tue, 25 May 2004 19:32:12 +0000 Subject: [PATCH] Use absolute address to lowmem variables --- second/ld.script | 14 -------------- second/lowmem.h | 27 ++++++++++++++------------- 2 files changed, 14 insertions(+), 27 deletions(-) diff --git a/second/ld.script b/second/ld.script index 7cd11eb..aa98b75 100644 --- a/second/ld.script +++ b/second/ld.script @@ -1,20 +1,6 @@ OUTPUT_ARCH(m68k) SECTIONS { - MemTop = 0x0108; - VIA1Base = 0x01D4; - SCCRd = 0x01d8; - ROMBase = 0x02ae; - HWCfgFlags = 0x0B22; - SCSIBase = 0x0C00; - ASCBase = 0x0CC0; - TimeVIADB = 0x0cea; - VIA2Base = 0x0CEC; - TimeDBRA = 0x0D00; - PMgrBase = 0x0D18; - UnivROMBits = 0x0DD4; - Time = 0x020C; - .text : { __bootloader_start = .; diff --git a/second/lowmem.h b/second/lowmem.h index 5460b73..8a08a71 100644 --- a/second/lowmem.h +++ b/second/lowmem.h @@ -6,16 +6,17 @@ /* these symbols are defined in ld.script */ -extern unsigned long VIA1Base; -extern unsigned long SCCRd; -extern unsigned long ROMBase; -extern unsigned long HWCfgFlags; -extern unsigned long SCSIBase; -extern unsigned long ASCBase; -extern unsigned long VIA2Base; -extern unsigned long PMgrBase; -extern unsigned long UnivROMBits; -extern unsigned short TimeVIADB; -extern unsigned short TimeDBRA; -extern unsigned long MemTop; -extern unsigned long Time; +#define VIA1Base (*(unsigned long*)0x01D4) +#define SCCRd (*(unsigned long*)0x01d8) +#define ROMBase (*(unsigned long*)0x02ae) +#define HWCfgFlags (*(unsigned long*)0x0B22) +#define SCSIBase (*(unsigned long*)0x0C00) +#define ASCBase (*(unsigned long*)0x0CC0) +#define VIA2Base (*(unsigned long*)0x0CEC) +#define PMgrBase (*(unsigned long*)0x0D18) +#define UnivROMBits (*(unsigned long*)0x0DD4) +#define TimeVIADB (*(unsigned short*)0x0cea) +#define TimeDBRA (*(unsigned short*)0x0D00) +#define MemTop (*(unsigned long*)0x0108) +#define Time (*(unsigned long*)0x020C) +