[VM][STATE] Use namespace {VMNAME} to separate per VMs.

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

diff --git a/source/src/vm/pasopia/pasopia.h b/source/src/vm/pasopia/pasopia.h
index a913973..4c6bda1 100644 (file)
--- a/source/src/vm/pasopia/pasopia.h
+++ b/source/src/vm/pasopia/pasopia.h
@@ -56,26 +56,26 @@
 // device informations for win32
 #define USE_BOOT_MODE          5
 #define USE_DEVICE_TYPE                3
-#define USE_TAPE1
-#define USE_FD1
-#define USE_FD2
-//#define USE_FD3
-//#define USE_FD4
-#define USE_BINARY_FILE1
+#define USE_TAPE               1
+#define USE_TAPE_BUTTON
+#define USE_FLOPPY_DISK                2
+#define USE_BINARY_FILE                1
 #define USE_SHIFT_NUMPAD_KEY
 #define USE_ALT_F10_KEY
 #define USE_AUTO_KEY           5
 #define USE_AUTO_KEY_RELEASE   6
+#define USE_AUTO_KEY_NUMPAD
 #define USE_SCREEN_FILTER
 #define USE_SCANLINE
-#define SUPPORT_ROMA_KANA_CONVERSION
 #define USE_SOUND_VOLUME       4
 #define USE_JOYSTICK
 #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[] = {
@@ -99,16 +99,19 @@ class Z80;
 class Z80CTC;
 class Z80PIO;
 
-class FLOPPY;
-class DISPLAY;
-class KEYBOARD;
-class MEMORY;
-class PAC2;
+namespace PASOPIA {
+       class FLOPPY;
+       class DISPLAY;
+       class KEYBOARD;
+       class MEMORY;
+       class PAC2;
+}
 
-class VM
+class VM : public VM_TEMPLATE
 {
 protected:
-       EMU* emu;
+       //EMU* emu;
+       //csp_state_utils *state_entry;
        
        // devices
        EVENT* event;
@@ -127,11 +130,11 @@ protected:
        Z80CTC* ctc;
        Z80PIO* pio;
        
-       FLOPPY* floppy;
-       DISPLAY* display;
-       KEYBOARD* key;
-       MEMORY* memory;
-       PAC2* pac2;
+       PASOPIA::FLOPPY* floppy;
+       PASOPIA::DISPLAY* display;
+       PASOPIA::KEYBOARD* key;
+       PASOPIA::MEMORY* memory;
+       PASOPIA::PAC2* pac2;
        
        int boot_mode;
        
@@ -183,13 +186,18 @@ public:
        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) {}
        void load_binary(int drv, const _TCHAR* file_path);
        void save_binary(int drv, const _TCHAR* file_path) {}
        bool is_frame_skippable();
        
        void update_config();
-       void save_state(FILEIO* state_fio);
-       bool load_state(FILEIO* state_fio);
+       bool process_state(FILEIO* state_fio, bool loading);
        
        // ----------------------------------------
        // for each device
@@ -197,9 +205,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