diff options
Diffstat (limited to 'sys/arch/mac68k/include')
| -rw-r--r-- | sys/arch/mac68k/include/autoconf.h | 4 | ||||
| -rw-r--r-- | sys/arch/mac68k/include/cpu.h | 16 | ||||
| -rw-r--r-- | sys/arch/mac68k/include/intr.h | 6 |
3 files changed, 7 insertions, 19 deletions
diff --git a/sys/arch/mac68k/include/autoconf.h b/sys/arch/mac68k/include/autoconf.h index b9ee1bcd266..f507f701145 100644 --- a/sys/arch/mac68k/include/autoconf.h +++ b/sys/arch/mac68k/include/autoconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.h,v 1.10 2006/01/02 18:10:05 miod Exp $ */ +/* $OpenBSD: autoconf.h,v 1.11 2006/01/13 19:36:44 miod Exp $ */ /* $NetBSD: autoconf.h,v 1.5 1996/12/17 06:47:40 scottr Exp $ */ /* @@ -62,8 +62,6 @@ void resettodr(void); void mac68k_calibrate_delay(void); void startrtclock(void); -/* macrom.c */ -void mrg_init(void); #endif /* _KERNEL */ #endif /* _MAC68K_AUTOCONF_H_ */ diff --git a/sys/arch/mac68k/include/cpu.h b/sys/arch/mac68k/include/cpu.h index aeabbaaafd7..a68d0f43416 100644 --- a/sys/arch/mac68k/include/cpu.h +++ b/sys/arch/mac68k/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.35 2006/01/01 13:16:01 miod Exp $ */ +/* $OpenBSD: cpu.h,v 1.36 2006/01/13 19:36:44 miod Exp $ */ /* $NetBSD: cpu.h,v 1.45 1997/02/10 22:13:40 scottr Exp $ */ /* @@ -252,12 +252,9 @@ struct mac68k_machine_S { /* What kind of model is this */ struct cpu_model_info { - int machineid; /* MacOS Gestalt value. */ - char *model_major; /* Make this distinction to save a few */ - char *model_minor; /* bytes--might be useful, too. */ - int class; /* Rough class of machine. */ - /* forwarded romvec_s is defined in mac68k/macrom.h */ - struct romvec_s *rom_vectors; /* Pointer to our known rom vectors */ + int machineid; /* MacOS Gestalt value. */ + const char *model; /* Model description */ + int class; /* Rough class of machine. */ }; extern struct cpu_model_info *current_mac_model; @@ -268,11 +265,6 @@ extern struct mac68k_machine_S mac68k_machine; extern unsigned long load_addr; #endif /* _KERNEL */ -/* physical memory sections */ -#define ROMBASE (0x40800000) -#define ROMLEN (0x00200000) /* 2MB will work for all 68k */ -#define ROMMAPSIZE btoc(ROMLEN) /* 32k of page tables. */ - #define IIOMAPSIZE btoc(0x00100000) /* 1MB should be enough */ /* XXX -- Need to do something about superspace. diff --git a/sys/arch/mac68k/include/intr.h b/sys/arch/mac68k/include/intr.h index d7a835dd596..2f5b821acfe 100644 --- a/sys/arch/mac68k/include/intr.h +++ b/sys/arch/mac68k/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.12 2005/05/01 09:55:49 miod Exp $ */ +/* $OpenBSD: intr.h,v 1.13 2006/01/13 19:36:44 miod Exp $ */ /* $NetBSD: intr.h,v 1.9 1998/08/12 06:58:42 scottr Exp $ */ /* @@ -134,8 +134,7 @@ extern volatile u_int8_t ssir; #define SIR_NET 0x01 #define SIR_CLOCK 0x02 #define SIR_SERIAL 0x04 -#define SIR_DTMGR 0x08 -#define SIR_ADB 0x10 +#define SIR_ADB 0x08 #define siron(mask) \ __asm __volatile ( "orb %0,_ssir" : : "i" (mask)) @@ -145,7 +144,6 @@ extern volatile u_int8_t ssir; #define setsoftnet() siron(SIR_NET) #define setsoftclock() siron(SIR_CLOCK) #define setsoftserial() siron(SIR_SERIAL) -#define setsoftdtmgr() siron(SIR_DTMGR) #define setsoftadb() siron(SIR_ADB) /* intr.c */ |