[GENERAL] Merge upstream 2017-03-04. Still checking FTBFSs.

[csp-qt/common_source_project-fm7.git] / source / src / vm / mc6820.cpp

diff --git a/source/src/vm/mc6820.cpp b/source/src/vm/mc6820.cpp
index bfacafe..834e3f7 100644 (file)
--- a/source/src/vm/mc6820.cpp
+++ b/source/src/vm/mc6820.cpp
@@ -21,7 +21,7 @@ void MC6820::reset()
        }
 }
 
-void MC6820::write_io8(uint32 addr, uint32 data)
+void MC6820::write_io8(uint32_t addr, uint32_t data)
 {
        int ch = (addr & 2) >> 1;
        
@@ -39,7 +39,7 @@ void MC6820::write_io8(uint32 addr, uint32 data)
                }
                break;
        case 1:
-        case 3:
+       case 3:
                if(data & 0x20) {
                        port[ch].ctrl &= ~0x40;
                }
@@ -48,7 +48,7 @@ void MC6820::write_io8(uint32 addr, uint32 data)
        }
 }
 
-uint32 MC6820::read_io8(uint32 addr)
+uint32_t MC6820::read_io8(uint32_t addr)
 {
        int ch = (addr & 2) >> 1;
        
@@ -69,7 +69,7 @@ uint32 MC6820::read_io8(uint32 addr)
        return 0xff;
 }
 
-void MC6820::write_signal(int id, uint32 data, uint32 mask)
+void MC6820::write_signal(int id, uint32_t data, uint32_t mask)
 {
        bool signal = ((data & mask) != 0);
        int ch = id & 1;