--- xmil/pccore.h 2004/08/09 02:47:01 1.8 +++ xmil/pccore.h 2009/03/23 15:02:25 1.21 @@ -1,19 +1,27 @@ typedef struct { UINT8 ROM_TYPE; - UINT8 CPU8MHz; UINT8 DIP_SW; + UINT8 fddequip; UINT8 DISPSYNC; UINT8 RASTER; UINT8 skipline; UINT16 skiplight; +#if !defined(DISABLE_SOUND) UINT16 samplingrate; UINT16 delayms; - UINT8 SOUND_SW; +#if defined(SUPPORT_TURBOZ) || defined(SUPPORT_OPM) + UINT8 vol_fm; +#endif + UINT8 vol_ssg; UINT8 MOTOR; UINT8 MOTORVOL; +#endif +#if defined(SUPPORT_TURBOZ) || defined(SUPPORT_OPM) + UINT8 SOUND_SW; +#endif UINT8 MOUSE_SW; UINT8 KEY_MODE; @@ -22,13 +30,20 @@ typedef struct { } XMILCFG; typedef struct { - UINT HSYNC_CLK; +#if !defined(FIX_Z80A) + UINT32 baseclock; + UINT multiple; + UINT32 realclock; +#endif UINT8 ROM_TYPE; UINT8 DIP_SW; UINT8 SOUND_SW; } PCCORE; typedef struct { + SINT32 syncclock; + SINT32 framebaseclock; /* by 4MHz */ + UINT8 vsync; UINT8 drawframe; UINT8 soundrenewal; } CORESTAT; @@ -48,22 +63,14 @@ extern const OEMCHAR xmilversion[]; extern XMILCFG xmilcfg; extern PCCORE pccore; extern CORESTAT corestat; -extern BYTE *RAM0r; -extern BYTE *RAM0w; -extern DWORD h_cntbase; -extern BYTE mMAIN[0x10000]; -extern BYTE mBIOS[0x8000]; -#if defined(SUPPORT_BANKMEM) -extern BYTE mBANK[16][0x8000]; +#if !defined(MAINFRAMES_OLD) +void neitem_mainframes(UINT id); +#else +void neitem_disp(UINT id); +void neitem_vsync(UINT id); #endif -#define h_cnt Z80_ICOUNT -extern UINT v_cnt; - -// BYTE reset_x1(BYTE ROM_TYPE, BYTE SOUND_SW, BYTE DIP_SW); -// void x1r_exec(void); - void pccore_initialize(void); void pccore_reset(void); void pccore_deinitialize(void);