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

[csp-qt/common_source_project-fm7.git] / source / src / vm / fmr30 / timer.h

diff --git a/source/src/vm/fmr30/timer.h b/source/src/vm/fmr30/timer.h
index ddc00e2..2125877 100644 (file)
--- a/source/src/vm/fmr30/timer.h
+++ b/source/src/vm/fmr30/timer.h
@@ -22,7 +22,7 @@ class TIMER : public DEVICE
 private:
        DEVICE *d_pic;
        
-       uint8 ctrl, status;
+       uint8_t ctrl, status;
        void update_intr();
        
 public:
@@ -31,9 +31,9 @@ public:
        
        // common functions
        void initialize();
-       void write_io8(uint32 addr, uint32 data);
-       uint32 read_io8(uint32 addr);
-       void write_signal(int id, uint32 data, uint32 mask);
+       void write_io8(uint32_t addr, uint32_t data);
+       uint32_t read_io8(uint32_t addr);
+       void write_signal(int id, uint32_t data, uint32_t mask);
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);