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

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

diff --git a/source/src/vm/pc6001/pc6001.h b/source/src/vm/pc6001/pc6001.h
index 6808379..a02cc0a 100644 (file)
--- a/source/src/vm/pc6001/pc6001.h
+++ b/source/src/vm/pc6001/pc6001.h
@@ -76,14 +76,14 @@
 #define MC6847_ATTR_INV                0x01
 
 // device informations for win32
-#define USE_CART1
-#define USE_FD1
-#define USE_FD2
+#define USE_CART               1
 #if defined(_PC6601) || defined(_PC6601SR)
-#define USE_FD3
-#define USE_FD4
+#define USE_FLOPPY_DISK                4
+#else
+#define USE_FLOPPY_DISK                2
 #endif
-#define USE_TAPE1
+#define USE_TAPE               1
+#define USE_TAPE_BUTTON
 #define TAPE_PC6001
 #define NOTIFY_KEY_DOWN
 #define USE_SHIFT_NUMPAD_KEY
@@ -105,9 +105,12 @@
 #define USE_PRINTER_TYPE       3
 #define USE_DEBUGGER
 #define USE_STATE
+#define USE_CPU_MCS48
+#define USE_CPU_Z80
 
 #include "../../common.h"
 #include "../../fileio.h"
+#include "../vm_template.h"
 
 #ifdef USE_SOUND_VOLUME
 static const _TCHAR *sound_device_caption[] = {
@@ -118,7 +121,6 @@ static const _TCHAR *sound_device_caption[] = {
        _T("CMT (Signal)"), _T("Noise (FDD)"), _T("Noise (CMT)"),
 };
 #endif
-
 class EMU;
 class DEVICE;
 class EVENT;
@@ -145,25 +147,33 @@ class DATAREC;
 class MCS48;
 
 #ifdef _PC6001
-class DISPLAY;
+namespace PC6001 {
+       class DISPLAY;
+}
 #endif
 #if defined(_PC6601) || defined(_PC6601SR)
-class FLOPPY;
+namespace PC6001 {
+       class FLOPPY;
+}
 #endif
-class JOYSTICK;
-class MEMORY;
-class PSUB;
-class SUB;
-class TIMER;
 
-class VM
+namespace PC6001 {
+       class JOYSTICK;
+       class MEMORY;
+       class PSUB;
+       class SUB;
+       class TIMER;
+}
+
+class VM : public VM_TEMPLATE
 {
 protected:
-       EMU* emu;
+       //EMU* emu;
+
        int vdata;
        
        // devices
-       EVENT* event;
+       //EVENT* event;
        
        DEVICE* printer;
        I8255* pio_sub;
@@ -179,20 +189,20 @@ protected:
        Z80* cpu;
 #ifdef _PC6001
        MC6847* vdp;
-       DISPLAY* display;
+       PC6001::DISPLAY* display;
 #else
        UPD7752* voice;
 #endif
 #if defined(_PC6601) || defined(_PC6601SR)
-       FLOPPY* floppy;
+       PC6001::FLOPPY* floppy;
 #endif
-       JOYSTICK* joystick;
-       MEMORY* memory;
-       PSUB* psub;
-       TIMER* timer;
+       PC6001::JOYSTICK* joystick;
+       PC6001::MEMORY* memory;
+       PC6001::PSUB* psub;
+       PC6001::TIMER* timer;
        
        MCS48* cpu_sub;
-       SUB* sub;
+       PC6001::SUB* sub;
        DATAREC* drec;
        
        PC6031* pc6031;
@@ -259,11 +269,16 @@ 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) {}
        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
@@ -271,9 +286,9 @@ public:
        
        // devices
        DEVICE* get_device(int id);
-       DEVICE* dummy;
-       DEVICE* first_device;
-       DEVICE* last_device;
+       //DEVICE* dummy;
+       //DEVICE* first_device;
+       //DEVICE* last_device;
        
        int sr_mode;
 };