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

[csp-qt/common_source_project-fm7.git] / source / src / vm / pc8201 / memory.h

diff --git a/source/src/vm/pc8201/memory.h b/source/src/vm/pc8201/memory.h
index a2e6e75..cb9c36c 100644 (file)
--- a/source/src/vm/pc8201/memory.h
+++ b/source/src/vm/pc8201/memory.h
@@ -19,15 +19,15 @@ class MEMORY : public DEVICE
 private:
        DEVICE *d_cmt, *d_drec, *d_rtc;
        
-       uint8 ipl[0x8000];      // rom #0
-       uint8 ext[0x8000];      // rom #1
-       uint8 ram[0x8000*3];    // standard and optional ram
-       uint8 wdmy[0x1000];
-       uint8 rdmy[0x1000];
-       uint8* wbank[16];
-       uint8* rbank[16];
+       uint8_t ipl[0x8000];    // rom #0
+       uint8_t ext[0x8000];    // rom #1
+       uint8_t ram[0x8000*3];  // standard and optional ram
+       uint8_t wdmy[0x1000];
+       uint8_t rdmy[0x1000];
+       uint8_t* wbank[16];
+       uint8_t* rbank[16];
        
-       uint8 sio, bank;
+       uint8_t sio, bank;
        void update_bank();
        
 public:
@@ -38,10 +38,10 @@ public:
        void initialize();
        void release();
        void reset();
-       void write_data8(uint32 addr, uint32 data);
-       uint32 read_data8(uint32 addr);
-       void write_io8(uint32 addr, uint32 data);
-       uint32 read_io8(uint32 addr);
+       void write_data8(uint32_t addr, uint32_t data);
+       uint32_t read_data8(uint32_t 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);