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

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

diff --git a/source/src/vm/n5200/n5200.cpp b/source/src/vm/n5200/n5200.cpp
index e95508f..2367d54 100644 (file)
--- a/source/src/vm/n5200/n5200.cpp
+++ b/source/src/vm/n5200/n5200.cpp
@@ -280,9 +280,9 @@ void VM::draw_screen()
        display->draw_screen();
 }
 
-int VM::get_access_lamp_status()
+uint32_t VM::get_access_lamp_status()
 {
-       uint32 status = fdc->read_signal(0);
+       uint32_t status = fdc->read_signal(0);
        return (status & (1 | 4)) ? 1 : (status & (2 | 8)) ? 2 : 0;
 }
 
@@ -299,7 +299,7 @@ void VM::initialize_sound(int rate, int samples)
        beep->initialize_sound(rate, 2400, 8000);
 }
 
-uint16* VM::create_sound(int* extra_frames)
+uint16_t* VM::create_sound(int* extra_frames)
 {
        return event->create_sound(extra_frames);
 }