[VM] Fix FTBFSs.

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

diff --git a/source/src/vm/pc2001/pc2001.h b/source/src/vm/pc2001/pc2001.h
index b7f51cb..2b93621 100644 (file)
--- a/source/src/vm/pc2001/pc2001.h
+++ b/source/src/vm/pc2001/pc2001.h
@@ -17,7 +17,7 @@
 // device informations for virtual machine
 #define FRAMES_PER_SEC         60
 #define LINES_PER_FRAME                24
-#define CPU_CLOCKS             4000000
+#define CPU_CLOCKS             (4000000 / 4)
 #define SCREEN_WIDTH           240
 #define SCREEN_HEIGHT          24
 #define HAS_UPD7907
@@ -26,48 +26,54 @@
 
 // device informations for win32
 #define WINDOW_MODE_BASE       2
-#define USE_TAPE
-#define NOTIFY_KEY_DOWN
+#define USE_TAPE               1
+#define USE_TAPE_BUTTON
 #define USE_ALT_F10_KEY
 #define USE_AUTO_KEY           6
 #define USE_AUTO_KEY_RELEASE   10
-//#define USE_AUTO_KEY_CAPS
-//#define USE_SOUND_VOLUME     1
-//#define USE_DEBUGGER
+#define USE_AUTO_KEY_CAPS_LOCK (0xf2 | 0x100)
+#define USE_AUTO_KEY_NUMPAD
+#define DONT_KEEEP_KEY_PRESSED
+#define USE_SOUND_VOLUME       3
+#define USE_DEBUGGER
 #define USE_STATE
+#define USE_CPU_UPD7810
 
 #include "../../common.h"
+#include "../../fileio.h"
+#include "../vm_template.h"
 
-//#ifdef USE_SOUND_VOLUME
-//static const _TCHAR *sound_device_caption[] = {
-//     _T("Beep"),
-//};
-//#endif
+#ifdef USE_SOUND_VOLUME
+static const _TCHAR *sound_device_caption[] = {
+       _T("Beep"), _T("CMT (Signal)"), _T("Noise (CMT)"),
+};
+#endif
 
+//class csp_state_utils;
 class EMU;
 class DEVICE;
 class EVENT;
 
 class DATAREC;
 class MEMORY;
+class PCM1BIT;
 class UPD16434;
 class UPD1990A;
 class UPD7810;
 
 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;
        
        DATAREC* drec;
        MEMORY* memory;
+       PCM1BIT* pcm;
        UPD16434* lcd[4];
        UPD1990A* rtc;
        UPD7810* cpu;
@@ -75,7 +81,7 @@ protected:
        IO* io;
        
        // memory
-       uint8_t ram[0xa000];
+       uint8_t ram[0x5000];
        uint8_t rom1[0x1000];
        uint8_t rom2[0x4000];
        
@@ -111,21 +117,25 @@ public:
        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);
-       
        // user interface
-       void play_tape(const _TCHAR* file_path);
-       void rec_tape(const _TCHAR* file_path);
-       void close_tape();
-       bool is_tape_inserted();
-       bool is_tape_playing();
-       bool is_tape_recording();
-       int get_tape_position();
+       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_tape_playing(int drv);
+       bool is_tape_recording(int drv);
+       int get_tape_position(int drv);
+       const _TCHAR* get_tape_message(int drv);
+       void push_play(int drv);
+       void push_stop(int drv);
+       void push_fast_forward(int drv);
+       void push_fast_rewind(int drv);
+       void push_apss_forward(int drv) {}
+       void push_apss_rewind(int drv) {}
        bool is_frame_skippable();
        
        void update_config();
+       void decl_state();
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
        
@@ -135,9 +145,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