[VM][WIP] Use namespace to devices per VMs.

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

diff --git a/source/src/vm/j3100/slmemory.h b/source/src/vm/j3100/slmemory.h
index 45aa9c2..5766f8c 100644 (file)
--- a/source/src/vm/j3100/slmemory.h
+++ b/source/src/vm/j3100/slmemory.h
@@ -1,69 +1,75 @@
-/*\r
-       TOSHIBA J-3100SL Emulator 'eJ-3100SL'\r
-\r
-       Author : Takeda.Toshiya\r
-       Date   : 2011.08.16-\r
-\r
-       [ memory ]\r
-*/\r
-\r
-#ifndef _SL_MEMORY_H_\r
-#define _SL_MEMORY_H_\r
-\r
-#include "../vm.h"\r
-#include "../../emu.h"\r
-#include "../device.h"\r
-\r
-class MEMORY : public DEVICE\r
-{\r
-private:\r
-       uint8* rbank[512];      // 1MB / 2KB\r
-       uint8* wbank[512];\r
-       uint8 wdmy[0x800];\r
-       uint8 rdmy[0x800];\r
-       uint8 ram[0xa0000];     // RAM 640KB\r
-       uint8 vram[0x8000];     // VRAM 32KB\r
-       uint8 ems[0x4000*56];   // EMS 16KB * 56\r
-       uint8 kanji[0x100000];  // KANJI ROM 1MB\r
-#ifdef _J3100SE\r
-       uint8 backup[0x4000];   // Backuped RAM 16KB\r
-       uint8 ipl[0xc000];      // IPL 48KB\r
-#else\r
-       uint8 backup[0x800];    // Backuped RAM 2KB\r
-       uint8 ipl[0x8000];      // IPL 32KB\r
-#endif\r
-       \r
-       int kanji_bank;\r
-       \r
-       int ems_index;\r
-       int ems_regs[2];\r
-       int ems_page[4];\r
-       int ems_bsl;\r
-       \r
-       uint32 ems_crc32;\r
-       uint32 backup_crc32;\r
-       \r
-       void update_ems(int page);\r
-       \r
-public:\r
-       MEMORY(VM* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu) {}\r
-       ~MEMORY() {}\r
-       \r
-       // common functions\r
-       void initialize();\r
-       void release();\r
-       void reset();\r
-       void write_data8(uint32 addr, uint32 data);\r
-       uint32 read_data8(uint32 addr);\r
-       void write_io8(uint32 addr, uint32 data);\r
-       uint32 read_io8(uint32 addr);\r
-       \r
-       // unitque function\r
-       uint8* get_vram()\r
-       {\r
-               return vram;\r
-       }\r
-};\r
-\r
-#endif\r
-\r
+/*
+       TOSHIBA J-3100SL Emulator 'eJ-3100SL'
+
+       Author : Takeda.Toshiya
+       Date   : 2011.08.16-
+
+       [ memory ]
+*/
+
+#ifndef _SL_MEMORY_H_
+#define _SL_MEMORY_H_
+
+#include "../vm.h"
+#include "../../emu.h"
+#include "../device.h"
+
+namespace J3100SL {
+
+class MEMORY : public DEVICE
+{
+private:
+       uint8_t* rbank[512];    // 1MB / 2KB
+       uint8_t* wbank[512];
+       uint8_t wdmy[0x800];
+       uint8_t rdmy[0x800];
+       uint8_t ram[0xa0000];   // RAM 640KB
+       uint8_t vram[0x8000];   // VRAM 32KB
+       uint8_t ems[0x4000*56]; // EMS 16KB * 56
+       uint8_t kanji[0x100000];        // KANJI ROM 1MB
+#ifdef _J3100SE
+       uint8_t backup[0x4000]; // Backuped RAM 16KB
+       uint8_t ipl[0xc000];    // IPL 48KB
+#else
+       uint8_t backup[0x800];  // Backuped RAM 2KB
+       uint8_t ipl[0x8000];    // IPL 32KB
+#endif
+       
+       int kanji_bank;
+       
+       int ems_index;
+       int ems_regs[2];
+       int ems_page[4];
+       int ems_bsl;
+       
+       uint32_t ems_crc32;
+       uint32_t backup_crc32;
+       
+       void update_ems(int page);
+       
+public:
+       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 release();
+       void reset();
+       void write_data8(uint32_t addr, uint32_t data);
+       uint32_t read_data8(uint32_t addr);
+       void write_io8(uint32_t addr, uint32_t data);
+       uint32_t read_io8(uint32_t addr);
+       
+       // unique function
+       uint8_t* get_vram()
+       {
+               return vram;
+       }
+};
+
+}
+#endif
+