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

[csp-qt/common_source_project-fm7.git] / source / src / vm / mz700 / emm.h

diff --git a/source/src/vm/mz700/emm.h b/source/src/vm/mz700/emm.h
index ebf8bc6..4d6f8d0 100644 (file)
--- a/source/src/vm/mz700/emm.h
+++ b/source/src/vm/mz700/emm.h
@@ -19,8 +19,8 @@
 class EMM : public DEVICE
 {
 private:
-       uint8 *data_buffer;
-       uint32 data_addr;
+       uint8_t *data_buffer;
+       uint32_t data_addr;
        
 public:
        EMM(VM* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu) {}
@@ -30,8 +30,8 @@ public:
        void initialize();
        void release();
        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);
 };