Moved macros which are related to BIOS work area from pc98.h

(corresponds to isa.h) to pc98_machdep.h.

14 files changed, 50 insertions, 76 deletions

diff --git a/sys/pc98/cbus/cbus.h b/sys/pc98/cbus/cbus.h
index 1f27d3a..7c4e466 100644
--- a/sys/pc98/cbus/cbus.h
+++ b/sys/pc98/cbus/cbus.h
@@ -169,24 +169,6 @@
 #endif	COMPAQ_RAMRELOC
 #endif
 
-#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 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_epson_bios_id	0x225
-#define OFS_epson_system_type	0x226
-
 #define	M_NEC_PC98	0x0001
 #define	M_EPSON_PC98	0x0002
 #define	M_NOT_H98	0x0010
@@ -195,26 +177,6 @@
 #define	M_NORMAL	0x1000
 #define	M_8M		0x8000
 
-#if defined(KERNEL) && !defined(LOCORE)
-/* BIOS parameter block */
-extern unsigned char	pc98_system_parameter[]; /* in locore.c */
-#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])
-#define epson_system_type	(pc98_system_parameter[OFS_epson_system_type])
-
-# define PC98_TYPE_CHECK(x)	((pc98_machine_type & (x)) == (x))
-
-#endif /* KERNEL */
-
 /*
  * Obtained from NetBSD/pc98
  */
diff --git a/sys/pc98/cbus/clock.c b/sys/pc98/cbus/clock.c
index 7345338..570ac6b 100644
--- a/sys/pc98/cbus/clock.c
+++ b/sys/pc98/cbus/clock.c
@@ -71,6 +71,7 @@
 #include <i386/isa/icu.h>
 #ifdef PC98
 #include <pc98/pc98/pc98.h>
+#include <pc98/pc98/pc98_machdep.h>
 #include <i386/isa/isa_device.h>
 #else
 #include <i386/isa/isa.h>
diff --git a/sys/pc98/cbus/fdc.c b/sys/pc98/cbus/fdc.c
index 304ddfe..57d77bb 100644
--- a/sys/pc98/cbus/fdc.c
+++ b/sys/pc98/cbus/fdc.c
@@ -74,6 +74,7 @@
 #endif
 #ifdef PC98
 #include <pc98/pc98/pc98.h>
+#include <pc98/pc98/pc98_machdep.h>
 #include <pc98/pc98/epsonio.h>
 #include <i386/isa/isa_device.h>
 #include <pc98/pc98/fdreg.h>
diff --git a/sys/pc98/cbus/pcrtc.c b/sys/pc98/cbus/pcrtc.c
index 7345338..570ac6b 100644
--- a/sys/pc98/cbus/pcrtc.c
+++ b/sys/pc98/cbus/pcrtc.c
@@ -71,6 +71,7 @@
 #include <i386/isa/icu.h>
 #ifdef PC98
 #include <pc98/pc98/pc98.h>
+#include <pc98/pc98/pc98_machdep.h>
 #include <i386/isa/isa_device.h>
 #else
 #include <i386/isa/isa.h>
diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c
index 8183ade..8338bdc 100644
--- a/sys/pc98/cbus/sio.c
+++ b/sys/pc98/cbus/sio.c
@@ -138,6 +138,7 @@
 
 #ifdef PC98
 #include <pc98/pc98/pc98.h>
+#include <pc98/pc98/pc98_machdep.h>
 #include <i386/isa/icu.h>
 #include <i386/isa/isa_device.h>
 #include <pc98/pc98/sioreg.h>
diff --git a/sys/pc98/pc98/clock.c b/sys/pc98/pc98/clock.c
index 7345338..570ac6b 100644
--- a/sys/pc98/pc98/clock.c
+++ b/sys/pc98/pc98/clock.c
@@ -71,6 +71,7 @@
 #include <i386/isa/icu.h>
 #ifdef PC98
 #include <pc98/pc98/pc98.h>
+#include <pc98/pc98/pc98_machdep.h>
 #include <i386/isa/isa_device.h>
 #else
 #include <i386/isa/isa.h>
diff --git a/sys/pc98/pc98/fd.c b/sys/pc98/pc98/fd.c
index 304ddfe..57d77bb 100644
--- a/sys/pc98/pc98/fd.c
+++ b/sys/pc98/pc98/fd.c
@@ -74,6 +74,7 @@
 #endif
 #ifdef PC98
 #include <pc98/pc98/pc98.h>
+#include <pc98/pc98/pc98_machdep.h>
 #include <pc98/pc98/epsonio.h>
 #include <i386/isa/isa_device.h>
 #include <pc98/pc98/fdreg.h>
diff --git a/sys/pc98/pc98/pc98.c b/sys/pc98/pc98/pc98.c
index e3e9c84..3b6bc53 100644
--- a/sys/pc98/pc98/pc98.c
+++ b/sys/pc98/pc98/pc98.c
@@ -68,6 +68,7 @@
 #include <i386/isa/isa_device.h>
 #ifdef PC98
 #include <pc98/pc98/pc98.h>
+#include <pc98/pc98/pc98_machdep.h>
 #include <pc98/pc98/epsonio.h>
 #else
 #include <i386/isa/isa.h>
diff --git a/sys/pc98/pc98/pc98.h b/sys/pc98/pc98/pc98.h
index 1f27d3a..7c4e466 100644
--- a/sys/pc98/pc98/pc98.h
+++ b/sys/pc98/pc98/pc98.h
@@ -169,24 +169,6 @@
 #endif	COMPAQ_RAMRELOC
 #endif
 
-#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 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_epson_bios_id	0x225
-#define OFS_epson_system_type	0x226
-
 #define	M_NEC_PC98	0x0001
 #define	M_EPSON_PC98	0x0002
 #define	M_NOT_H98	0x0010
@@ -195,26 +177,6 @@
 #define	M_NORMAL	0x1000
 #define	M_8M		0x8000
 
-#if defined(KERNEL) && !defined(LOCORE)
-/* BIOS parameter block */
-extern unsigned char	pc98_system_parameter[]; /* in locore.c */
-#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])
-#define epson_system_type	(pc98_system_parameter[OFS_epson_system_type])
-
-# define PC98_TYPE_CHECK(x)	((pc98_machine_type & (x)) == (x))
-
-#endif /* KERNEL */
-
 /*
  * Obtained from NetBSD/pc98
  */
diff --git a/sys/pc98/pc98/pc98_machdep.c b/sys/pc98/pc98/pc98_machdep.c
index 9e82bf6..cd578fa 100644
--- a/sys/pc98/pc98/pc98_machdep.c
+++ b/sys/pc98/pc98/pc98_machdep.c
@@ -47,6 +47,7 @@
 #include <vm/vm_extern.h>
 
 #include <pc98/pc98/pc98.h>
+#include <pc98/pc98/pc98_machdep.h>
 #include <i386/isa/isa_device.h>
 
 extern	int Maxmem;
diff --git a/sys/pc98/pc98/pc98_machdep.h b/sys/pc98/pc98/pc98_machdep.h
index 42f5cf1..116043f 100644
--- a/sys/pc98/pc98/pc98_machdep.h
+++ b/sys/pc98/pc98/pc98_machdep.h
@@ -32,6 +32,45 @@ void	pc98_init_dmac __P((void));
 void	pc98_getmemsize __P((void));
 
 struct disk_parms;
+struct scsi_link;
 int	sd_bios_parms __P((struct disk_parms *, struct scsi_link *));
 
+#define	PC98_VECTOR_SIZE			(0x400)
+#define	PC98_SYSTEM_PARAMETER_SIZE		(0x230)
+
+#define	PC98_SAVE_AREA(highreso_flag)	(0xa1000)
+#define	PC98_SAVE_AREA_ADDRESS		(0x10)
+
+#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_epson_bios_id		0x225
+#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])
+#define	epson_system_type	(pc98_system_parameter[OFS_epson_system_type])
+
+# define PC98_TYPE_CHECK(x)	((pc98_machine_type & (x)) == (x))
+
+#endif /* KERNEL */
+
 #endif /* __PC98_PC98_PC98_MACHDEP_H__ */
diff --git a/sys/pc98/pc98/sio.c b/sys/pc98/pc98/sio.c
index 8183ade..8338bdc 100644
--- a/sys/pc98/pc98/sio.c
+++ b/sys/pc98/pc98/sio.c
@@ -138,6 +138,7 @@
 
 #ifdef PC98
 #include <pc98/pc98/pc98.h>
+#include <pc98/pc98/pc98_machdep.h>
 #include <i386/isa/icu.h>
 #include <i386/isa/isa_device.h>
 #include <pc98/pc98/sioreg.h>
diff --git a/sys/pc98/pc98/syscons.c b/sys/pc98/pc98/syscons.c
index 37807c9..ee0e426 100644
--- a/sys/pc98/pc98/syscons.c
+++ b/sys/pc98/pc98/syscons.c
@@ -68,6 +68,7 @@
 #ifdef PC98
 #define KANJI
 #include <pc98/pc98/pc98.h>
+#include <pc98/pc98/pc98_machdep.h>
 #include <i386/isa/isa_device.h>
 #include <i386/isa/timerreg.h>
 #include <i386/isa/kbdtables.h>
diff --git a/sys/pc98/pc98/wd.c b/sys/pc98/pc98/wd.c
index 03bd27b..92c5ea1 100644
--- a/sys/pc98/pc98/wd.c
+++ b/sys/pc98/pc98/wd.c
@@ -88,6 +88,7 @@
 #include <machine/md_var.h>
 #ifdef PC98
 #include <pc98/pc98/pc98.h>
+#include <pc98/pc98/pc98_machdep.h>
 #include <pc98/pc98/epsonio.h>
 #else
 #include <i386/isa/isa.h>