--- xmil/pccore.h 2004/08/12 14:03:14 1.12 +++ xmil/pccore.h 2005/02/04 06:42:07 1.19 @@ -9,11 +9,17 @@ typedef struct { UINT8 skipline; UINT16 skiplight; +#if !defined(DISABLE_SOUND) UINT16 samplingrate; UINT16 delayms; +#if defined(SUPPORT_TURBOZ) || defined(SUPPORT_OPM) UINT8 SOUND_SW; + UINT8 vol_fm; +#endif + UINT8 vol_ssg; UINT8 MOTOR; UINT8 MOTORVOL; +#endif UINT8 MOUSE_SW; UINT8 KEY_MODE; @@ -22,28 +28,26 @@ typedef struct { } XMILCFG; typedef struct { +#if !defined(FIX_Z80A) UINT32 baseclock; UINT multiple; UINT32 realclock; - +#endif UINT8 ROM_TYPE; UINT8 DIP_SW; UINT8 SOUND_SW; } PCCORE; typedef struct { - UINT tl; - UINT vl; +// SINT32 dispclock; + SINT32 syncclock; + SINT32 framebaseclock; // by 4MHz UINT8 vsync; UINT8 drawframe; UINT8 soundrenewal; } CORESTAT; enum { - RASTER_CLOCK = 250 -}; - -enum { DIPSW_RESOLUTE = 0x01, DIPSW_BOOTMEDIA = 0x04 }; @@ -58,20 +62,14 @@ extern const OEMCHAR xmilversion[]; extern XMILCFG xmilcfg; extern PCCORE pccore; extern CORESTAT corestat; -extern BYTE *RAM0r; -extern BYTE *RAM0w; -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 - -UINT pccore_getraster(UINT *h); -void nvitem_vdisp(UINT id); -void nvitem_vsync(UINT id); - void pccore_initialize(void); void pccore_reset(void); void pccore_deinitialize(void);