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

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

diff --git a/source/src/vm/hc80/hc80.h b/source/src/vm/hc80/hc80.h
index c0ecf17..b119a81 100644 (file)
--- a/source/src/vm/hc80/hc80.h
+++ b/source/src/vm/hc80/hc80.h
@@ -38,6 +38,7 @@
 
 #include "../../common.h"
 #include "../../fileio.h"
+#include "../vm_template.h"
 
 #ifdef USE_SOUND_VOLUME
 static const _TCHAR *sound_device_caption[] = {
@@ -45,6 +46,7 @@ static const _TCHAR *sound_device_caption[] = {
 };
 #endif
 
+class csp_state_utils;
 class EMU;
 class DEVICE;
 class EVENT;
@@ -54,24 +56,26 @@ class I8251;
 class PTF20;
 class Z80;
 
-class IO;
-class MEMORY;
-
-class VM
+namespace HC80 {
+       class IO;
+       class MEMORY;
+}
+class VM : public VM_TEMPLATE
 {
 protected:
-       EMU* emu;
+       //EMU* emu;
+       //csp_state_utils *state_entry;
        
        // devices
-       EVENT* event;
+       //EVENT* event;
        
        BEEP* beep;
        I8251* sio;
        PTF20* tf20;
        Z80* cpu;
        
-       IO* io;
-       MEMORY* memory;
+       HC80::IO* io;
+       HC80::MEMORY* memory;
        
 public:
        // ----------------------------------------
@@ -120,8 +124,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
@@ -129,9 +132,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