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

[csp-qt/common_source_project-fm7.git] / source / src / vm / hc40 / memory.cpp

diff --git a/source/src/vm/hc40/memory.cpp b/source/src/vm/hc40/memory.cpp
index 4f76eba..a16450d 100644 (file)
--- a/source/src/vm/hc40/memory.cpp
+++ b/source/src/vm/hc40/memory.cpp
@@ -9,6 +9,8 @@
 
 #include "memory.h"
 
+namespace HC40 {
+       
 #define SET_BANK(s, e, w, r) { \
        int sb = (s) >> 13, eb = (e) >> 13; \
        for(int i = sb; i <= eb; i++) { \
@@ -25,7 +27,7 @@
        } \
 }
 
-void HC40_MEMORY::initialize()
+void MEMORY::initialize()
 {
        // initialize memory
        memset(ram, 0, sizeof(ram));
@@ -55,7 +57,7 @@ void HC40_MEMORY::initialize()
        delete fio;
 }
 
-void HC40_MEMORY::release()
+void MEMORY::release()
 {
        // save battery backuped ram
        FILEIO* fio = new FILEIO();
@@ -66,29 +68,29 @@ void HC40_MEMORY::release()
        delete fio;
 }
 
-void HC40_MEMORY::reset()
+void MEMORY::reset()
 {
        set_bank(0);
 }
 
-void HC40_MEMORY::write_data8(uint32_t addr, uint32_t data)
+void MEMORY::write_data8(uint32_t addr, uint32_t data)
 {
        addr &= 0xffff;
        wbank[(addr >> 13) & 7][addr & 0x1fff] = data;
 }
 
-uint32_t HC40_MEMORY::read_data8(uint32_t addr)
+uint32_t MEMORY::read_data8(uint32_t addr)
 {
        addr &= 0xffff;
        return rbank[(addr >> 13) & 7][addr & 0x1fff];
 }
 
-void HC40_MEMORY::write_signal(int id, uint32_t data, uint32_t mask)
+void MEMORY::write_signal(int id, uint32_t data, uint32_t mask)
 {
        set_bank(data);
 }
 
-void HC40_MEMORY::set_bank(uint32_t val)
+void MEMORY::set_bank(uint32_t val)
 {
        SET_BANK(0x0000, 0xffff, ram, ram);
        
@@ -130,7 +132,7 @@ void HC40_MEMORY::set_bank(uint32_t val)
 
 #define STATE_VERSION  1
 
-bool HC40_MEMORY::process_state(FILEIO* state_fio, bool loading)
+bool MEMORY::process_state(FILEIO* state_fio, bool loading)
 {
        if(!state_fio->StateCheckUint32(STATE_VERSION)) {
                return false;
@@ -147,3 +149,5 @@ bool HC40_MEMORY::process_state(FILEIO* state_fio, bool loading)
        }
        return true;
 }
+
+}