[VM][General] Apply Upstream 2018-10-07.Still WIP.

[csp-qt/common_source_project-fm7.git] / source / src / vm / pasopia / kanjipac2.h

diff --git a/source/src/vm/pasopia/kanjipac2.h b/source/src/vm/pasopia/kanjipac2.h
index fb24c29..4d8140f 100644 (file)
--- a/source/src/vm/pasopia/kanjipac2.h
+++ b/source/src/vm/pasopia/kanjipac2.h
@@ -15,16 +15,17 @@
 #include "../../emu.h"
 #include "pac2dev.h"
 
+namespace PASOPIA {
+
 class KANJIPAC2 : public PAC2DEV
 {
 private:
        uint8_t rom[0x20000];
        uint32_t ptr;
 public:
-       KANJIPAC2(VM* parent_vm, EMU* parent_emu) : PAC2DEV(parent_vm, parent_emu) {
-#if defined(_USE_QT)
-               set_device_name(_T("KANJI PAC2"));
-#endif
+       KANJIPAC2(VM_TEMPLATE* parent_vm, EMU* parent_emu) : PAC2DEV(parent_vm, parent_emu)
+       {
+               set_device_name(_T("Kanji ROM PAC2"));
        }
        ~KANJIPAC2() {}
        
@@ -32,9 +33,9 @@ public:
        void initialize(int id);
        void write_io8(uint32_t addr, uint32_t data);
        uint32_t read_io8(uint32_t addr);
-       void save_state(FILEIO* state_fio);
-       bool load_state(FILEIO* state_fio);
+       bool process_state(FILEIO* state_fio, bool loading);
 };
 
+}
 #endif