[VM] MEMORY:: class within some VM will change Foo_MEMORY:: to reduce misundestanding...

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

diff --git a/source/src/vm/colecovision/colecovision.h b/source/src/vm/colecovision/colecovision.h
index 74d4a93..5461009 100644 (file)
--- a/source/src/vm/colecovision/colecovision.h
+++ b/source/src/vm/colecovision/colecovision.h
@@ -23,7 +23,7 @@
 #define TMS9918A_LIMIT_SPRITES
 
 // device informations for win32
-#define USE_CART1
+#define USE_CART               1
 #define USE_SOUND_VOLUME       2
 #define USE_JOYSTICK
 #define USE_DEBUGGER
@@ -32,6 +32,7 @@
 
 #include "../../common.h"
 #include "../../fileio.h"
+#include "../vm_template.h"
 
 #ifdef USE_SOUND_VOLUME
 static const _TCHAR *sound_device_caption[] = {
@@ -39,6 +40,7 @@ static const _TCHAR *sound_device_caption[] = {
 };
 #endif
 
+//class csp_state_utils;
 class EMU;
 class DEVICE;
 class EVENT;
@@ -49,15 +51,16 @@ class TMS9918A;
 class Z80;
 
 class KEYBOARD;
-class MEMORY;
+class COLECOVISION_MEMORY;
 
-class VM
+class VM : public VM_TEMPLATE
 {
 protected:
-       EMU* emu;
+       //EMU* emu;
+       //csp_state_utils *state_entry;
        
        // devices
-       EVENT* event;
+       //EVENT* event;
        
        IO* io;
        SN76489AN* psg;
@@ -65,7 +68,7 @@ protected:
        Z80* cpu;
        
        KEYBOARD* key;
-       MEMORY* memory;
+       COLECOVISION_MEMORY* memory;
        
 public:
        // ----------------------------------------
@@ -106,8 +109,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
@@ -115,9 +117,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