diff options
| author | nyan <nyan@FreeBSD.org> | 2006-05-08 12:03:58 +0000 |
|---|---|---|
| committer | nyan <nyan@FreeBSD.org> | 2006-05-08 12:03:58 +0000 |
| commit | c4293ab6a17e85a65d0792b63b2831a1c4115ac5 (patch) | |
| tree | 401f6ed6663cd747740af4bcb646b2e75ad5bff9 | |
| parent | 67d1f3b8dccf3b0fea1a67148a590e43467ffcc2 (diff) | |
| download | FreeBSD-src-c4293ab6a17e85a65d0792b63b2831a1c4115ac5.zip FreeBSD-src-c4293ab6a17e85a65d0792b63b2831a1c4115ac5.tar.gz | |
- Move defines for PC-98 machine type from pc98/cbus/cbus.h into
pc98/pc98/pc98_machdep.h.
- Fix PC98_SYSTEM_PARAMETER_SIZE.
- Remove unused defines.
| -rw-r--r-- | sys/pc98/cbus/cbus.h | 8 | ||||
| -rw-r--r-- | sys/pc98/pc98/pc98_machdep.h | 38 |
2 files changed, 17 insertions, 29 deletions
diff --git a/sys/pc98/cbus/cbus.h b/sys/pc98/cbus/cbus.h index ca18b24..4c48305 100644 --- a/sys/pc98/cbus/cbus.h +++ b/sys/pc98/cbus/cbus.h @@ -101,12 +101,4 @@ #define RAM_SIZE (RAM_END - RAM_BEGIN) #endif /* !RAM_BEGIN */ -#define M_NEC_PC98 0x0001 -#define M_EPSON_PC98 0x0002 -#define M_NOT_H98 0x0010 -#define M_H98 0x0020 -#define M_NOTE 0x0040 -#define M_NORMAL 0x1000 -#define M_8M 0x8000 - #endif /* !_PC98_PC98_PC98_H_ */ diff --git a/sys/pc98/pc98/pc98_machdep.h b/sys/pc98/pc98/pc98_machdep.h index f9248af..ffd4ba8 100644 --- a/sys/pc98/pc98/pc98_machdep.h +++ b/sys/pc98/pc98/pc98_machdep.h @@ -37,34 +37,19 @@ struct ccb_calc_geometry; int scsi_da_bios_params(struct ccb_calc_geometry *); #define PC98_VECTOR_SIZE (0x400) -#define PC98_SYSTEM_PARAMETER_SIZE (0x230) - -#define PC98_SAVE_AREA(highreso_flag) (0xa1000) -#define PC98_SAVE_AREA_ADDRESS (0x10) +#define PC98_SYSTEM_PARAMETER_SIZE (0x240) +#define PC98_SAVE_AREA (0xa1000) #if defined(_KERNEL) && !defined(LOCORE) /* BIOS parameter block */ extern unsigned char pc98_system_parameter[]; /* in locore.c */ -#define OFS_BOOT_boothowto 0x210 -#define OFS_BOOT_bootdev 0x214 -#define OFS_BOOT_cyloffset 0x218 -#define OFS_WD_BIOS_SECSIZE(i) (0x200+(i)*6) -#define OFS_WD_BIOS_NCYL(i) (0x202+(i)*6) -#define OFS_WD_BIOS_HEAD(i) (0x205+(i)*6) -#define OFS_WD_BIOS_SEC(i) (0x204+(i)*6) -#define OFS_pc98_machine_type 0x220 -#define OFS_epson_machine_id 0x224 + +#define OFS_pc98_machine_type 0x220 +#define OFS_epson_machine_id 0x224 #define OFS_epson_bios_id 0x225 -#define OFS_epson_system_type 0x226 +#define OFS_epson_system_type 0x226 #define PC98_SYSTEM_PARAMETER(x) pc98_system_parameter[(x)-0x400] -#define BOOT_boothowto (*(unsigned long*)(&pc98_system_parameter[OFS_BOOT_boothowto])) -#define BOOT_bootdev (*(unsigned long*)(&pc98_system_parameter[OFS_BOOT_bootdev])) -#define BOOT_cyloffset (*(unsigned long*)(&pc98_system_parameter[OFS_BOOT_cyloffset])) -#define WD_BIOS_SECSIZE(i) (*(unsigned short*)(&pc98_system_parameter[OFS_WD_BIOS_SECSIZE(i)])) -#define WD_BIOS_NCYL(i) (*(unsigned short*)(&pc98_system_parameter[OFS_WD_BIOS_NCYL(i)])) -#define WD_BIOS_HEAD(i) (pc98_system_parameter[OFS_WD_BIOS_HEAD(i)]) -#define WD_BIOS_SEC(i) (pc98_system_parameter[OFS_WD_BIOS_SEC(i)]) #define pc98_machine_type (*(unsigned long*)&pc98_system_parameter[OFS_pc98_machine_type]) #define epson_machine_id (pc98_system_parameter[OFS_epson_machine_id]) #define epson_bios_id (pc98_system_parameter[OFS_epson_bios_id]) @@ -73,6 +58,17 @@ extern unsigned char pc98_system_parameter[]; /* in locore.c */ # define PC98_TYPE_CHECK(x) ((pc98_machine_type & (x)) == (x)) /* + * PC98 machine type + */ +#define M_NEC_PC98 0x0001 +#define M_EPSON_PC98 0x0002 +#define M_NOT_H98 0x0010 +#define M_H98 0x0020 +#define M_NOTE 0x0040 +#define M_NORMAL 0x1000 +#define M_8M 0x8000 + +/* * EPSON machine list */ #define EPSON_PC386_NOTE_A 0x20 |
