--- xmil/pccore.h 2004/08/01 05:31:29 1.1 +++ xmil/pccore.h 2004/08/05 16:47:26 1.4 @@ -1,8 +1,4 @@ -// #include "z80core.h" -// #include "x1_io.h" - - typedef struct { UINT8 KEY_MODE; UINT8 SOUND_SW; @@ -28,8 +24,6 @@ typedef struct { UINT8 TEXT400L; UINT8 LINETEXT; - UINT8 SOUNDPLY; - UINT8 DISPSYNC; UINT8 MOUSE_SW; } XMILCFG; @@ -37,33 +31,14 @@ typedef struct { typedef struct { UINT16 HSYNC_CLK; UINT8 ROM_TYPE; - UINT8 ROM_SW; UINT8 DIP_SW; UINT8 SOUND_SW; } PCCORE; - -#define GRAM_SIZE 0x10000 -#define GRAM_BANK0 0x00000 -#define GRAM_BANK1 0x10000 - -#define GRAM_BANK0L 0x00000 -#define GRAM_BANK0H 0x08000 -#define GRAM_BANK1L 0x10000 -#define GRAM_BANK1H 0x18000 - -#define GRAM_HALFSTEP 0x08000 - -#define TEXT_ANK 0x0000 -#define TEXT_ATR 0x0800 -#define TEXT_KNJ 0x1000 - -#define PLANE_B 8 -#define PLANE_R 16 -#define PLANE_G 24 - -#define DIP_RESOLUTE 1 -#define DIP_BOOTMEDIA 4 +enum { + DIPSW_RESOLUTE = 0x01, + DIPSW_BOOTMEDIA = 0x04 +}; #ifdef __cplusplus @@ -76,14 +51,11 @@ extern XMILCFG xmilcfg; extern PCCORE pccore; extern BYTE *RAM0r; extern BYTE *RAM0w; -extern BYTE lastmem; extern DWORD h_cntbase; extern BYTE mMAIN[0x10000]; extern BYTE mBIOS[0x8000]; extern BYTE mBANK[16][0x8000]; -extern BYTE GRP_RAM[0x20000]; -extern BYTE TXT_RAM[0x01800]; extern BRESULT soundrenewal;