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

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

diff --git a/source/src/vm/tk80bs/tk80bs.h b/source/src/vm/tk80bs/tk80bs.h
index 5824163..ac2e399 100644 (file)
--- a/source/src/vm/tk80bs/tk80bs.h
+++ b/source/src/vm/tk80bs/tk80bs.h
@@ -84,6 +84,7 @@
 
 #include "../../common.h"
 #include "../../fileio.h"
+#include "../vm_template.h"
 
 #ifdef USE_SOUND_VOLUME
 static const _TCHAR *sound_device_caption[] = {
@@ -181,8 +182,6 @@ const struct {
 #endif
 };
 
-class csp_state_utils;
-
 class EMU;
 class DEVICE;
 class EVENT;
@@ -194,24 +193,25 @@ class I8251;
 class IO;
 #endif
 class I8255;
-//class MEMORY;
 class PCM1BIT;
 
+namespace TK80 {
 #if defined(_TK80BS)
-class CMT;
+       class CMT;
 #endif
-class DISPLAY;
-class KEYBOARD;
-class MEMBUS;
+       //class MEMORY;
+       class DISPLAY;
+       class KEYBOARD;
+       class MEMBUS;
+}
 
-class VM
+class VM : public VM_TEMPLATE
 {
 protected:
-       EMU* emu;
-       csp_state_utils* state_entry;
+       //EMU* emu;
        
        // devices
-       EVENT* event;
+       //EVENT* event;
        
        DATAREC* drec;
        I8080* cpu;
@@ -221,16 +221,16 @@ protected:
        IO* memio;
 #endif
        I8255* pio_t;
-//     MEMORY* memory;
+//     TK80::MEMORY* memory;
        PCM1BIT* pcm0;
        PCM1BIT* pcm1;
        
 #if defined(_TK80BS)
-       CMT* cmt;
+       TK80::CMT* cmt;
 #endif
-       DISPLAY* display;
-       KEYBOARD* keyboard;
-       MEMBUS* memory;
+       TK80::DISPLAY* display;
+       TK80::KEYBOARD* keyboard;
+       TK80::MEMBUS* memory;
        
        // memory
        uint8_t mon[0x800];
@@ -305,9 +305,7 @@ public:
        bool is_frame_skippable();
        
        void update_config();
-       void decl_state();
-       void save_state(FILEIO* state_fio);
-       bool load_state(FILEIO* state_fio);
+       bool process_state(FILEIO* state_fio, bool loading);
        
        // ----------------------------------------
        // for each device
@@ -315,9 +313,9 @@ public:
        
        // devices
        DEVICE* get_device(int id);
-       DEVICE* dummy;
-       DEVICE* first_device;
-       DEVICE* last_device;
+       //DEVICE* dummy;
+       //DEVICE* first_device;
+       //DEVICE* last_device;
        
 #if defined(_TK80BS)
        int draw_ranges;