[VM][General] Track to upstream, 2015-01-21.

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

diff --git a/source/src/vm/pasopia7/memory.h b/source/src/vm/pasopia7/memory.h
index c236e03..b1214a2 100644 (file)
--- a/source/src/vm/pasopia7/memory.h
+++ b/source/src/vm/pasopia7/memory.h
@@ -21,7 +21,7 @@
 class MEMORY : public DEVICE\r
 {\r
 private:\r
-       DEVICE *d_io, *d_pio0, *d_pio2;\r
+       DEVICE *d_iobus, *d_pio0, *d_pio2;\r
        \r
        uint8 bios[0x4000];\r
        uint8 basic[0x8000];\r
@@ -33,9 +33,11 @@ private:
        uint8* wbank[16];\r
        uint8* rbank[16];\r
        \r
-       uint8 plane, attr_data, attr_latch;\r
+       uint8 mem_map, plane, attr_data, attr_latch;\r
        bool vram_sel, pal_sel, attr_wrap;\r
        \r
+       void update_memory_map();\r
+       \r
 public:\r
        MEMORY(VM* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu) {}\r
        ~MEMORY() {}\r
@@ -47,11 +49,13 @@ public:
        uint32 read_data8(uint32 addr);\r
        void write_io8(uint32 addr, uint32 data);\r
        void write_signal(int id, uint32 data, uint32 mask);\r
+       void save_state(FILEIO* state_fio);\r
+       bool load_state(FILEIO* state_fio);\r
        \r
        // unique functions\r
-       void set_context_io(DEVICE* device)\r
+       void set_context_iobus(DEVICE* device)\r
        {\r
-               d_io = device;\r
+               d_iobus = device;\r
        }\r
        void set_context_pio0(DEVICE* device)\r
        {\r