[VM] Apply VM_TEMPLATE to all VMs.

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

diff --git a/source/src/vm/phc25/memory.h b/source/src/vm/phc25/memory.h
index 4ec7394..23ba8a7 100644 (file)
--- a/source/src/vm/phc25/memory.h
+++ b/source/src/vm/phc25/memory.h
@@ -20,28 +20,32 @@ class MEMORY : public DEVICE
 private:
        DEVICE *d_kbd;
        
-       uint8 rom[0x6000];
+       uint8_t rom[0x6000];
 #ifdef _MAP1010
-       uint8 ram[0x8000];
+       uint8_t ram[0x8000];
 #else
-       uint8 ram[0x4000];
+       uint8_t ram[0x4000];
 #endif
-       uint8 vram[0x1800];
+       uint8_t vram[0x1800];
        
-       uint8 wdmy[0x800];
-       uint8 rdmy[0x800];
-       uint8* wbank[32];
-       uint8* rbank[32];
+       uint8_t wdmy[0x800];
+       uint8_t rdmy[0x800];
+       uint8_t* wbank[32];
+       uint8_t* rbank[32];
        
 public:
-       MEMORY(VM* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu) {}
+       MEMORY(VM_TEMPLATE* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu)
+       {
+               set_device_name(_T("Memory Bus"));
+       }
        ~MEMORY() {}
        
        // common functions
        void initialize();
        void reset();
-       void write_data8(uint32 addr, uint32 data);
-       uint32 read_data8(uint32 addr);
+       void write_data8(uint32_t addr, uint32_t data);
+       uint32_t read_data8(uint32_t addr);
+       void decl_state();
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
        
@@ -50,7 +54,7 @@ public:
        {
                d_kbd = device;
        }
-       uint8* get_vram()
+       uint8_t* get_vram()
        {
                return vram;
        }