[VM] Fix FTBFSs.

[csp-qt/common_source_project-fm7.git] / source / src / vm / mz5500 / mz5500.h

diff --git a/source/src/vm/mz5500/mz5500.h b/source/src/vm/mz5500/mz5500.h
index 5093b24..9759207 100644 (file)
--- a/source/src/vm/mz5500/mz5500.h
+++ b/source/src/vm/mz5500/mz5500.h
@@ -31,6 +31,7 @@
 #endif
 #define SCREEN_WIDTH           640
 #define SCREEN_HEIGHT          400
+#define WINDOW_HEIGHT_ASPECT   480
 #define MAX_DRIVE              4
 #ifdef _MZ6550
 #define HAS_I286
@@ -43,30 +44,40 @@
 #define SINGLE_MODE_DMA
 #define IO_ADDR_MAX            0x400
 #define HAS_AY_3_8912
+#define PRINTER_STROBE_RISING_EDGE
 #define SUPPORT_VARIABLE_TIMING
 
 // device informations for win32
 #define USE_SPECIAL_RESET
-#define USE_FD1
-#define USE_FD2
-#define USE_FD3
-#define USE_FD4
+#define USE_FLOPPY_DISK                4
 #define NOTIFY_KEY_DOWN
+#define USE_KEY_LOCKED
 #define USE_SHIFT_NUMPAD_KEY
 #define USE_ALT_F10_KEY
 #define USE_AUTO_KEY           5
 #define USE_AUTO_KEY_RELEASE   6
-#define USE_CRT_FILTER
+#define USE_AUTO_KEY_NUMPAD
+#define USE_SCREEN_FILTER
 #define USE_SCANLINE
-#define USE_ACCESS_LAMP
+#define USE_SOUND_VOLUME       2
+#define USE_MOUSE
+#define USE_PRINTER
+#define USE_PRINTER_TYPE       4
 #define USE_DEBUGGER
 #define USE_STATE
-#define USE_MOUSE
-#define USE_JOYSTICK
+#define USE_CPU_I286
 
 #include "../../common.h"
 #include "../../fileio.h"
+#include "../vm_template.h"
+
+#ifdef USE_SOUND_VOLUME
+static const _TCHAR *sound_device_caption[] = {
+       _T("PSG"), _T("Noise (FDD)"),
+};
+#endif
 
+class csp_state_utils;
 class EMU;
 class DEVICE;
 class EVENT;
@@ -74,13 +85,19 @@ class EVENT;
 class I8237;
 class I8255;
 class I8259;
+//#if defined(HAS_I286) || defined(HAS_I186)
 class I286;
+//#else
+//class I86;
+//#endif
 class IO;
 class LS393;
+class NOT;
 class RP5C01;
 class UPD7220;
 class UPD765A;
-class YM2203;
+//class YM2203;
+class AY_3_891X;
 class Z80CTC;
 class Z80SIO;
 
@@ -89,24 +106,40 @@ class KEYBOARD;
 class MEMORY;
 class SYSPORT;
 
-class VM
+class VM : public VM_TEMPLATE
 {
 protected:
-       EMU* emu;
+       //EMU* emu;
+       //csp_state_utils *state_entry;
        
        // devices
-       EVENT* event;
+       //EVENT* event;
        
+       DEVICE* printer;
        I8237* dma;
        I8255* pio;
        I8259* pic;     // includes 2chips
+//#if defined(HAS_I286) || defined(HAS_I186)
        I286* cpu;
+//#else
+//     I86* cpu;
+//#endif
        IO* io;
        LS393* div;
+       NOT* not_data0;
+       NOT* not_data1;
+       NOT* not_data2;
+       NOT* not_data3;
+       NOT* not_data4;
+       NOT* not_data5;
+       NOT* not_data6;
+       NOT* not_data7;
+       NOT* not_busy;
        RP5C01* rtc;
        UPD7220* gdc;
        UPD765A* fdc;
-       YM2203* psg;
+//     YM2203* psg;
+       AY_3_891X* psg;
        Z80CTC* ctc0;
 #if defined(_MZ6500) || defined(_MZ6550)
        Z80CTC* ctc1;
@@ -134,7 +167,7 @@ public:
        void reset();
        void special_reset();
        void run();
-       double frame_rate();
+       double get_frame_rate();
        
 #ifdef USE_DEBUGGER
        // debugger
@@ -143,26 +176,32 @@ public:
        
        // draw screen
        void draw_screen();
-       int access_lamp();
        
        // sound generation
        void initialize_sound(int rate, int samples);
-       uint16* create_sound(int* extra_frames);
-       int sound_buffer_ptr();
+       uint16_t* create_sound(int* extra_frames);
+       int get_sound_buffer_ptr();
+#ifdef USE_SOUND_VOLUME
+       void set_sound_device_volume(int ch, int decibel_l, int decibel_r);
+#endif
        
        // notify key
        void key_down(int code, bool repeat);
        void key_up(int code);
+       bool get_caps_locked();
+       bool get_kana_locked();
        
        // user interface
-       void open_disk(int drv, const _TCHAR* file_path, int bank);
-       void close_disk(int drv);
-       bool disk_inserted(int drv);
-       void set_disk_protected(int drv, bool value);
-       bool get_disk_protected(int drv);
-       bool now_skip();
+       void open_floppy_disk(int drv, const _TCHAR* file_path, int bank);
+       void close_floppy_disk(int drv);
+       bool is_floppy_disk_inserted(int drv);
+       void is_floppy_disk_protected(int drv, bool value);
+       bool is_floppy_disk_protected(int drv);
+       uint32_t is_floppy_disk_accessed();
+       bool is_frame_skippable();
        
        void update_config();
+       void decl_state();
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
        
@@ -172,9 +211,9 @@ public:
        
        // devices
        DEVICE* get_device(int id);
-       DEVICE* dummy;
-       DEVICE* first_device;
-       DEVICE* last_device;
+       //DEVICE* dummy;
+       //DEVICE* first_device;
+       //DEVICE* last_device;
 };
 
 #endif