[VM][General] Merge upstream 2016-03-01. (Pahse 1).

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

diff --git a/source/src/vm/pasopia7/kanjipac2.h b/source/src/vm/pasopia7/kanjipac2.h
index de9c777..6e2dae0 100644 (file)
--- a/source/src/vm/pasopia7/kanjipac2.h
+++ b/source/src/vm/pasopia7/kanjipac2.h
@@ -18,8 +18,8 @@
 class KANJIPAC2 : public PAC2DEV
 {
 private:
-       uint8 rom[0x20000];
-       uint32 ptr;
+       uint8_t rom[0x20000];
+       uint32_t ptr;
 public:
        KANJIPAC2(VM* parent_vm, EMU* parent_emu) : PAC2DEV(parent_vm, parent_emu) {}
        ~KANJIPAC2() {}
@@ -27,8 +27,8 @@ public:
        // common functions
        void initialize(int id);
        void reset();
-       void write_io8(uint32 addr, uint32 data);
-       uint32 read_io8(uint32 addr);
+       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);
 };