[VM][STATE] Apply new framework to some VMs.

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

diff --git a/source/src/vm/pasopia7/pasopia7.h b/source/src/vm/pasopia7/pasopia7.h
index 0197573..ac28962 100644 (file)
--- a/source/src/vm/pasopia7/pasopia7.h
+++ b/source/src/vm/pasopia7/pasopia7.h
@@ -63,6 +63,7 @@
 
 #include "../../common.h"
 #include "../../fileio.h"
+#include "../vm_template.h"
 
 #ifdef USE_SOUND_VOLUME
 static const _TCHAR *sound_device_caption[] = {
@@ -93,17 +94,17 @@ class DISPLAY;
 class IOBUS;
 class IOTRAP;
 class KEYBOARD;
-class MEMORY;
+class PASOPIA7_MEMORY;
 class PAC2;
 
-class VM
+class VM : public VM_TEMPLATE
 {
 protected:
-       EMU* emu;
-       csp_state_utils *state_entry;
+       //EMU* emu;
+       //csp_state_utils *state_entry;
        
        // devices
-       EVENT* event;
+       //EVENT* event;
        
        DATAREC* drec;
        HD46505* crtc;
@@ -126,7 +127,7 @@ protected:
        IOBUS* iobus;
        IOTRAP* iotrap;
        KEYBOARD* key;
-       MEMORY* memory;
+       PASOPIA7_MEMORY* memory;
        PAC2* pac2;
        
 public:
@@ -188,9 +189,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
@@ -198,9 +197,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