[VM][STATE] Use namespace {VMNAME} to separate per VMs.

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

diff --git a/source/src/vm/pasopia7/floppy.cpp b/source/src/vm/pasopia7/floppy.cpp
index 14682a3..97bb945 100644 (file)
--- a/source/src/vm/pasopia7/floppy.cpp
+++ b/source/src/vm/pasopia7/floppy.cpp
@@ -10,12 +10,14 @@
 #include "floppy.h"
 #include "../upd765a.h"
 
+namespace PASOPIA7 {
+
 void FLOPPY::initialize()
 {
        intr = false;
 }
 
-void FLOPPY::write_io8(uint32 addr, uint32 data)
+void FLOPPY::write_io8(uint32_t addr, uint32_t data)
 {
        switch(addr & 0xff) {
        case 0xe0:
@@ -37,7 +39,7 @@ void FLOPPY::write_io8(uint32 addr, uint32 data)
        }
 }
 
-uint32 FLOPPY::read_io8(uint32 addr)
+uint32_t FLOPPY::read_io8(uint32_t addr)
 {
        switch(addr & 0xff) {
        case 0xe6:
@@ -47,7 +49,7 @@ uint32 FLOPPY::read_io8(uint32 addr)
        return 0xff;
 }
 
-void FLOPPY::write_signal(int id, uint32 data, uint32 mask)
+void FLOPPY::write_signal(int id, uint32_t data, uint32_t mask)
 {
        if(id == SIG_FLOPPY_INTR) {
                intr = ((data & mask) != 0);
@@ -56,23 +58,16 @@ void FLOPPY::write_signal(int id, uint32 data, uint32 mask)
 
 #define STATE_VERSION  1
 
-void FLOPPY::save_state(FILEIO* state_fio)
+bool FLOPPY::process_state(FILEIO* state_fio, bool loading)
 {
-       state_fio->FputUint32(STATE_VERSION);
-       state_fio->FputInt32(this_device_id);
-       
-       state_fio->FputBool(intr);
-}
-
-bool FLOPPY::load_state(FILEIO* state_fio)
-{
-       if(state_fio->FgetUint32() != STATE_VERSION) {
+       if(!state_fio->StateCheckUint32(STATE_VERSION)) {
                return false;
        }
-       if(state_fio->FgetInt32() != this_device_id) {
+       if(!state_fio->StateCheckInt32(this_device_id)) {
                return false;
        }
-       intr = state_fio->FgetBool();
+       state_fio->StateBool(intr);
        return true;
 }
 
+}