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

[csp-qt/common_source_project-fm7.git] / source / src / vm / phc25 / keyboard.h

diff --git a/source/src/vm/phc25/keyboard.h b/source/src/vm/phc25/keyboard.h
index bf34214..bd2cfe7 100644 (file)
--- a/source/src/vm/phc25/keyboard.h
+++ b/source/src/vm/phc25/keyboard.h
@@ -18,12 +18,12 @@
 class KEYBOARD : public DEVICE
 {
 private:
-       const uint8* key_stat;
+       const uint8_t* key_stat;
        
 #ifdef _MAP1010
        int kana_pressed;
 #else
-       uint8 status[16];
+       uint8_t status[16];
 #endif
        
 public:
@@ -33,7 +33,7 @@ public:
        // common functions
        void initialize();
        void reset();
-       uint32 read_io8(uint32 addr);
+       uint32_t read_io8(uint32_t addr);
        void event_frame();
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);