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

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

diff --git a/source/src/vm/hc40/hc40.cpp b/source/src/vm/hc40/hc40.cpp
index 977bb3b..5ba7288 100644 (file)
--- a/source/src/vm/hc40/hc40.cpp
+++ b/source/src/vm/hc40/hc40.cpp
@@ -141,9 +141,9 @@ void VM::draw_screen()
        io->draw_screen();
 }
 
-int VM::get_access_lamp_status()
+uint32_t VM::get_access_lamp_status()
 {
-       uint32 status = tf20->read_signal(0);
+       uint32_t status = tf20->read_signal(0);
        return (status & (1 | 4)) ? 1 : (status & (2 | 8)) ? 2 : 0;
 }
 
@@ -160,7 +160,7 @@ void VM::initialize_sound(int rate, int samples)
        beep->initialize_sound(rate, 1000, 8000);
 }
 
-uint16* VM::create_sound(int* extra_frames)
+uint16_t* VM::create_sound(int* extra_frames)
 {
        return event->create_sound(extra_frames);
 }