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

[csp-qt/common_source_project-fm7.git] / source / src / vm / pc100 / ioctrl.h

diff --git a/source/src/vm/pc100/ioctrl.h b/source/src/vm/pc100/ioctrl.h
index c96cc98..859416c 100644 (file)
--- a/source/src/vm/pc100/ioctrl.h
+++ b/source/src/vm/pc100/ioctrl.h
@@ -22,16 +22,16 @@ class IOCTRL : public DEVICE
 {
 private:
        DEVICE *d_pic, *d_fdc, *d_beep, *d_pcm;
-       const uint8* key_stat;
-       const int* mouse_stat;
+       const uint8_t* key_stat;
+       const int32_t* mouse_stat;
        
        bool caps, kana;
        FIFO* key_buf;
-       uint32 key_val, key_mouse;
+       uint32_t key_val, key_mouse;
        int key_prev;
        bool key_res, key_done;
        int register_id;
-       uint8 ts;
+       uint8_t ts;
        
        void update_key();
        
@@ -43,10 +43,10 @@ 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 event_callback(int event_id, int err);
-       void write_signal(int id, uint32 data, uint32 mask);
+       void write_signal(int id, uint32_t data, uint32_t mask);
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);