[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 2476d1a..4d8140f 100644 (file)
--- a/source/src/vm/pasopia/kanjipac2.h
+++ b/source/src/vm/pasopia/kanjipac2.h
@@ -1,36 +1,41 @@
-/*\r
-       TOSHIBA PASOPIA Emulator 'EmuPIA'\r
-       TOSHIBA PASOPIA 7 Emulator 'EmuPIA7'\r
-\r
-       Author : Takeda.Toshiya\r
-       Date   : 2006.09.20 -\r
-\r
-       [ kanji rom pac 2 ]\r
-*/\r
-\r
-#ifndef _KANJIPAC2_H_\r
-#define _KANJIPAC2_H_\r
-\r
-#include "../vm.h"\r
-#include "../../emu.h"\r
-#include "pac2dev.h"\r
-\r
-class KANJIPAC2 : public PAC2DEV\r
-{\r
-private:\r
-       uint8 rom[0x20000];\r
-       uint32 ptr;\r
-public:\r
-       KANJIPAC2(VM* parent_vm, EMU* parent_emu) : PAC2DEV(parent_vm, parent_emu) {}\r
-       ~KANJIPAC2() {}\r
-       \r
-       // common functions\r
-       void initialize(int id);\r
-       void write_io8(uint32 addr, uint32 data);\r
-       uint32 read_io8(uint32 addr);\r
-       void save_state(FILEIO* state_fio);\r
-       bool load_state(FILEIO* state_fio);\r
-};\r
-\r
-#endif\r
-\r
+/*
+       TOSHIBA PASOPIA Emulator 'EmuPIA'
+       TOSHIBA PASOPIA 7 Emulator 'EmuPIA7'
+
+       Author : Takeda.Toshiya
+       Date   : 2006.09.20 -
+
+       [ kanji rom pac 2 ]
+*/
+
+#ifndef _KANJIPAC2_H_
+#define _KANJIPAC2_H_
+
+#include "../vm.h"
+#include "../../emu.h"
+#include "pac2dev.h"
+
+namespace PASOPIA {
+
+class KANJIPAC2 : public PAC2DEV
+{
+private:
+       uint8_t rom[0x20000];
+       uint32_t ptr;
+public:
+       KANJIPAC2(VM_TEMPLATE* parent_vm, EMU* parent_emu) : PAC2DEV(parent_vm, parent_emu)
+       {
+               set_device_name(_T("Kanji ROM PAC2"));
+       }
+       ~KANJIPAC2() {}
+       
+       // common functions
+       void initialize(int id);
+       void write_io8(uint32_t addr, uint32_t data);
+       uint32_t read_io8(uint32_t addr);
+       bool process_state(FILEIO* state_fio, bool loading);
+};
+
+}
+#endif
+