[VM][STATE] Use namespace {VMNAME} to separate per VMs.

[csp-qt/common_source_project-fm7.git] / source / src / vm / pc100 / kanji.cpp

diff --git a/source/src/vm/pc100/kanji.cpp b/source/src/vm/pc100/kanji.cpp
index 922e2f2..ef3cf25 100644 (file)
--- a/source/src/vm/pc100/kanji.cpp
+++ b/source/src/vm/pc100/kanji.cpp
@@ -9,6 +9,8 @@
 
 #include "kanji.h"
 
+namespace PC100 {
+
 void KANJI::initialize()
 {
        // init image
@@ -16,7 +18,7 @@ void KANJI::initialize()
        
        // load kanji image
        FILEIO* fio = new FILEIO();
-       if(fio->Fopen(emu->bios_path(_T("KANJI.ROM")), FILEIO_READ_BINARY)) {
+       if(fio->Fopen(create_local_path(_T("KANJI.ROM")), FILEIO_READ_BINARY)) {
                fio->Fread(kanji, sizeof(kanji), 1);
                fio->Fclose();
        }
@@ -26,7 +28,7 @@ void KANJI::initialize()
        strobe = false;
 }
 
-void KANJI::write_io8(uint32 addr, uint32 data)
+void KANJI::write_io8(uint32_t addr, uint32_t data)
 {
        switch(addr & 0xff) {
        case 0x80:
@@ -44,7 +46,7 @@ void KANJI::write_io8(uint32 addr, uint32 data)
        }
 }
 
-uint32 KANJI::read_io8(uint32 addr)
+uint32_t KANJI::read_io8(uint32_t addr)
 {
        switch(addr & 0xff) {
        case 0x80:
@@ -57,25 +59,17 @@ uint32 KANJI::read_io8(uint32 addr)
 
 #define STATE_VERSION  1
 
-void KANJI::save_state(FILEIO* state_fio)
-{
-       state_fio->FputUint32(STATE_VERSION);
-       state_fio->FputInt32(this_device_id);
-       
-       state_fio->FputUint16(ptr);
-       state_fio->FputBool(strobe);
-}
-
-bool KANJI::load_state(FILEIO* state_fio)
+bool KANJI::process_state(FILEIO* state_fio, bool loading)
 {
-       if(state_fio->FgetUint32() != STATE_VERSION) {
+       if(!state_fio->StateCheckUint32(STATE_VERSION)) {
                return false;
        }
-       if(state_fio->FgetInt32() != this_device_id) {
+       if(!state_fio->StateCheckInt32(this_device_id)) {
                return false;
        }
-       ptr = state_fio->FgetUint16();
-       strobe = state_fio->FgetBool();
+       state_fio->StateUint16(ptr);
+       state_fio->StateBool(strobe);
        return true;
 }
 
+}