[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 cede5f4..9759207 100644 (file)
--- a/source/src/vm/mz5500/mz5500.h
+++ b/source/src/vm/mz5500/mz5500.h
@@ -49,16 +49,15 @@
 
 // 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_SOUND_VOLUME       2
 #define USE_MOUSE
@@ -66,9 +65,11 @@
 #define USE_PRINTER_TYPE       4
 #define USE_DEBUGGER
 #define USE_STATE
+#define USE_CPU_I286
 
 #include "../../common.h"
 #include "../../fileio.h"
+#include "../vm_template.h"
 
 #ifdef USE_SOUND_VOLUME
 static const _TCHAR *sound_device_caption[] = {
@@ -76,6 +77,7 @@ static const _TCHAR *sound_device_caption[] = {
 };
 #endif
 
+class csp_state_utils;
 class EMU;
 class DEVICE;
 class EVENT;
@@ -83,11 +85,11 @@ class EVENT;
 class I8237;
 class I8255;
 class I8259;
-#if defined(HAS_I286) || defined(HAS_I186)
+//#if defined(HAS_I286) || defined(HAS_I186)
 class I286;
-#else
-class I86;
-#endif
+//#else
+//class I86;
+//#endif
 class IO;
 class LS393;
 class NOT;
@@ -104,23 +106,24 @@ 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)
+//#if defined(HAS_I286) || defined(HAS_I186)
        I286* cpu;
-#else
-       I86* cpu;
-#endif
+//#else
+//     I86* cpu;
+//#endif
        IO* io;
        LS393* div;
        NOT* not_data0;
@@ -185,6 +188,8 @@ public:
        // 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_floppy_disk(int drv, const _TCHAR* file_path, int bank);
@@ -196,6 +201,7 @@ public:
        bool is_frame_skippable();
        
        void update_config();
+       void decl_state();
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
        
@@ -205,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