[VM] Fix FTBFSs.

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

diff --git a/source/src/vm/x07/x07.h b/source/src/vm/x07/x07.h
index 75c2a04..6f87b7a 100644 (file)
--- a/source/src/vm/x07/x07.h
+++ b/source/src/vm/x07/x07.h
@@ -27,14 +27,14 @@
 #define MEMORY_BANK_SIZE       0x800
 
 // device informations for win32
-#define WINDOW_WIDTH           (SCREEN_WIDTH * 2)
-#define WINDOW_HEIGHT          (SCREEN_HEIGHT * 2)
 #define TV_WINDOW_WIDTH                TV_SCREEN_WIDTH
 #define TV_WINDOW_HEIGHT       TV_SCREEN_HEIGHT
 
-#define USE_TAPE
+#define WINDOW_MODE_BASE       2
+#define USE_TAPE               1
 #define TAPE_BINARY_ONLY
 #define NOTIFY_KEY_DOWN
+#define USE_KEY_LOCKED
 #define USE_ALT_F10_KEY
 #define USE_AUTO_KEY           6
 #define USE_AUTO_KEY_RELEASE   10
@@ -42,18 +42,20 @@
 #define USE_SOUND_VOLUME       1
 #define USE_DEBUGGER
 #define USE_STATE
+#define USE_CPU_Z80
 
 #include "../../common.h"
+#include "../../fileio.h"
+#include "../vm_template.h"
 
 #ifdef USE_SOUND_VOLUME
 static const _TCHAR *sound_device_caption[] = {
        _T("Beep"),
 };
-static const bool sound_device_monophonic[] = {
-       false,
-};
 #endif
 
+class csp_state_utils;
+
 class EMU;
 class DEVICE;
 class EVENT;
@@ -63,16 +65,14 @@ class MEMORY;
 class Z80;
 
 class IO;
-
-#include "../../fileio.h"
-
-class VM
+class VM : public VM_TEMPLATE
 {
 protected:
-       EMU* emu;
+       //EMU* emu;
+       //csp_state_utils* state_entry;
        
        // devices
-       EVENT* event;
+       //EVENT* event;
        
        BEEP* beep;
        MEMORY* memory;
@@ -81,12 +81,12 @@ protected:
        IO* io;
        
        // memory
-//     uint8 c3[0x2000];
-       uint8 ram[0x6000];
-       uint8 app[0x2000];
-       uint8 vram[0x1800];
-       uint8 tv[0x1000];
-       uint8 bas[0x5000];
+//     uint8_t c3[0x2000];
+       uint8_t ram[0x6000];
+       uint8_t app[0x2000];
+       uint8_t vram[0x1800];
+       uint8_t tv[0x1000];
+       uint8_t bas[0x5000];
        
 public:
        // ----------------------------------------
@@ -114,8 +114,8 @@ public:
        
        // 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
@@ -123,15 +123,18 @@ 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 play_tape(const _TCHAR* file_path);
-       void rec_tape(const _TCHAR* file_path);
-       void close_tape();
-       bool tape_inserted();
-       bool now_skip();
+       void play_tape(int drv, const _TCHAR* file_path);
+       void rec_tape(int drv, const _TCHAR* file_path);
+       void close_tape(int drv);
+       bool is_tape_inserted(int drv);
+       bool is_frame_skippable();
        
        void update_config();
+       void decl_state();
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
        
@@ -141,9 +144,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