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

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

diff --git a/source/src/vm/fmr30/rtc.h b/source/src/vm/fmr30/rtc.h
index 4373250..6ff9ab3 100644 (file)
--- a/source/src/vm/fmr30/rtc.h
+++ b/source/src/vm/fmr30/rtc.h
@@ -22,8 +22,8 @@ private:
        cur_time_t cur_time;
        int register_id;
        
-       uint16 rtcmr, rtdsr, rtadr, rtobr, rtibr;
-       uint8 regs[40];
+       uint16_t rtcmr, rtdsr, rtadr, rtobr, rtibr;
+       uint8_t regs[40];
        
        void read_from_cur_time();
        void write_to_cur_time();
@@ -36,16 +36,16 @@ public:
        // common functions
        void initialize();
        void release();
-       void write_io8(uint32 addr, uint32 data)
+       void write_io8(uint32_t addr, uint32_t data)
        {
                write_io16(addr, data);
        }
-       uint32 read_io8(uint32 addr)
+       uint32_t read_io8(uint32_t addr)
        {
-               return (uint8)read_io16(addr);
+               return (uint8_t)read_io16(addr);
        }
-       void write_io16(uint32 addr, uint32 data);
-       uint32 read_io16(uint32 addr);
+       void write_io16(uint32_t addr, uint32_t data);
+       uint32_t read_io16(uint32_t addr);
        void event_callback(int event_id, int err);
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);