[VM][WIP] Use namespace to devices per VMs.

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

diff --git a/source/src/vm/pc8801/pc8801.h b/source/src/vm/pc8801/pc8801.h
index 19eb344..a7d8479 100644 (file)
--- a/source/src/vm/pc8801/pc8801.h
+++ b/source/src/vm/pc8801/pc8801.h
@@ -75,9 +75,8 @@
 #endif
 #define USE_DIPSWITCH
 #define USE_JOYSTICK_TYPE      2
-#define USE_FD1
-#define USE_FD2
-#define USE_TAPE1
+#define USE_FLOPPY_DISK                2
+#define USE_TAPE               1
 #define TAPE_BINARY_ONLY
 #define NOTIFY_KEY_DOWN
 #define USE_KEY_LOCKED
@@ -122,9 +121,11 @@
 #define USE_PRINTER_TYPE       3
 #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[] = {
@@ -165,12 +166,14 @@ class UPD765A;
 #ifdef SUPPORT_PC88_PCG8100
 class I8253;
 #endif
-class PC88;
-
-class VM
+namespace PC88DEV {
+       class PC88;
+}
+class VM : public VM_TEMPLATE
 {
 protected:
-       EMU* emu;
+       //EMU* emu;
+       //csp_state_utils* state_entry;
        
        // devices
        EVENT* pc88event;
@@ -201,7 +204,7 @@ protected:
        PCM1BIT* pc88pcm2;
 #endif
        
-       PC88* pc88;
+       PC88DEV::PC88* pc88;
        
        int boot_mode;
        
@@ -258,8 +261,7 @@ public:
        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
@@ -267,9 +269,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