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

(corresponds to isa.h) to pc98_machdep.h.
This commit is contained in:
KATO Takenori 1997-02-07 19:07:43 +00:00
parent f97a606a78
commit 15466e1892
14 changed files with 50 additions and 76 deletions

View File

@ -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
*/

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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
*/

View File

@ -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;

View File

@ -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__ */

View File

@ -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>

View File

@ -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>

View File

@ -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>