[VM][EVENT] Specify CPU per VM.

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

diff --git a/source/src/vm/x1/x1.h b/source/src/vm/x1/x1.h
index 4a27cd4..2cac29f 100644 (file)
--- a/source/src/vm/x1/x1.h
+++ b/source/src/vm/x1/x1.h
@@ -85,10 +85,10 @@
 // device informations for win32
 #define USE_SPECIAL_RESET
 #ifdef _X1TURBO_FEATURE
-#define USE_DEVICE_TYPE                2
+#define USE_KEYBOARD_TYPE      2
 // Keyboard mode B
-#define DEVICE_TYPE_DEFAULT    1
-#define USE_DRIVE_TYPE         2
+#define KEYBOARD_TYPE_DEFAULT  1
+#define USE_DRIVE_TYPE         3
 #endif
 #define USE_FD1
 #define USE_FD2
@@ -99,19 +99,20 @@
 #define USE_CART1
 #endif
 #define NOTIFY_KEY_DOWN
+#define USE_KEY_LOCKED
 #define USE_SHIFT_NUMPAD_KEY
 #define USE_ALT_F10_KEY
 #define USE_AUTO_KEY           8
 #define USE_AUTO_KEY_RELEASE   10
+#define USE_AUTO_KEY_NUMPAD
 #define USE_MONITOR_TYPE       2
-#define USE_CRT_FILTER
+#define USE_SCREEN_FILTER
 #define USE_SCANLINE
-#define USE_SOUND_DEVICE_TYPE          3
+#define USE_SOUND_TYPE         3
 // ToDo
-#define DATAREC_SOUND
-#define SUPPORT_ROMA_KANA_CONVERSION
+//#define DATAREC_SOUND
 // CZ-8BS1 x1
-#define SOUND_DEVICE_TYPE_DEFAULT      1
+#define SOUND_TYPE_DEFAULT     1
 # if defined(_X1TWIN)
 # define USE_SOUND_VOLUME      7
 # else
@@ -119,12 +120,18 @@
 # endif
 #define SUPPORT_TV_RENDER
 #define USE_JOYSTICK
+#ifdef _X1TWIN
+#define USE_JOYSTICK_TYPE      4
+#define JOYSTICK_TYPE_DEFAULT  0
+#endif
 #define USE_JOY_BUTTON_CAPTIONS
 #define USE_MOUSE
 #define USE_PRINTER
 #define USE_PRINTER_TYPE       4
 #define USE_DEBUGGER
 #define USE_STATE
+#define USE_CPU_Z80
+#define USE_CPU_MCS48
 
 #include "../../common.h"
 #include "../../fileio.h"
@@ -277,6 +284,7 @@ class KEYBOARD;
 #ifdef _X1TWIN
 class HUC6280;
 class PCE;
+#define USE_CPU_HUC6280
 #endif
 class VM
 {
@@ -294,7 +302,7 @@ protected:
        MB8877* fdc;
        YM2151* opm1;
        YM2151* opm2;
-       //YM2203* psg;
+//     YM2203* psg;
        AY_3_891X* psg;
        Z80* cpu;
        Z80CTC* ctc;
@@ -322,7 +330,7 @@ protected:
        KEYBOARD* kbd;
        
        bool pseudo_sub_cpu;
-       int sound_device_type;
+       int sound_type;
        
 #ifdef _X1TWIN
        // device for pce
@@ -369,6 +377,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);