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

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

diff --git a/source/src/vm/ls244.cpp b/source/src/vm/ls244.cpp
index 470000d..586c70a 100644 (file)
--- a/source/src/vm/ls244.cpp
+++ b/source/src/vm/ls244.cpp
@@ -8,24 +8,23 @@
 */
 
 #include "ls244.h"
-#include "../fileio.h"
 
 void LS244::initialize()
 {
        din = 0xff;
 }
 
-void LS244::write_io8(uint32 addr, uint32 data)
+void LS244::write_io8(uint32_t addr, uint32_t data)
 {
        write_signals(&outputs, data);
 }
 
-uint32 LS244::read_io8(uint32 addr)
+uint32_t LS244::read_io8(uint32_t addr)
 {
        return din;
 }
 
-void LS244::write_signal(int id, uint32 data, uint32 mask)
+void LS244::write_signal(int id, uint32_t data, uint32_t mask)
 {
        din = (din & ~mask) | (data & mask);
 }