[VM][STATE] Apply New framework to some VMs.

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

diff --git a/source/src/vm/phc25/system.cpp b/source/src/vm/phc25/system.cpp
index 79d2569..2a6e473 100644 (file)
--- a/source/src/vm/phc25/system.cpp
+++ b/source/src/vm/phc25/system.cpp
@@ -8,21 +8,21 @@
        [ system port ]
 */
 
-#include "system.h"
+#include "./system.h"
 #include "../datarec.h"
 #include "../mc6847.h"
 
-void SYSTEM::initialize()
+void PHC25_SYSTEM::initialize()
 {
        sysport = 0;
 }
 
-void SYSTEM::reset()
+void PHC25_SYSTEM::reset()
 {
        d_vdp->write_signal(SIG_MC6847_INTEXT, 1, 1);
 }
 
-void SYSTEM::write_io8(uint32_t addr, uint32_t data)
+void PHC25_SYSTEM::write_io8(uint32_t addr, uint32_t data)
 {
        d_drec->write_signal(SIG_DATAREC_MIC, data, 0x01);
        d_drec->write_signal(SIG_DATAREC_REMOTE, ~data, 0x02);
@@ -33,12 +33,12 @@ void SYSTEM::write_io8(uint32_t addr, uint32_t data)
        d_vdp->write_signal(SIG_MC6847_AG, data, 0x80);
 }
 
-uint32_t SYSTEM::read_io8(uint32_t addr)
+uint32_t PHC25_SYSTEM::read_io8(uint32_t addr)
 {
        return sysport;
 }
 
-void SYSTEM::write_signal(int id, uint32_t data, uint32_t mask)
+void PHC25_SYSTEM::write_signal(int id, uint32_t data, uint32_t mask)
 {
        sysport = (sysport & ~mask) | (data & mask);
 }
@@ -47,7 +47,7 @@ void SYSTEM::write_signal(int id, uint32_t data, uint32_t mask)
 
 #include "../../statesub.h"
 
-void SYSTEM::decl_state()
+void PHC25_SYSTEM::decl_state()
 {
        enter_decl_state(STATE_VERSION);
 
@@ -56,7 +56,7 @@ void SYSTEM::decl_state()
        leave_decl_state();
 }
 
-void SYSTEM::save_state(FILEIO* state_fio)
+void PHC25_SYSTEM::save_state(FILEIO* state_fio)
 {
        if(state_entry != NULL) {
                state_entry->save_state(state_fio);
@@ -67,7 +67,7 @@ void SYSTEM::save_state(FILEIO* state_fio)
 //     state_fio->FputUint8(sysport);
 }
 
-bool SYSTEM::load_state(FILEIO* state_fio)
+bool PHC25_SYSTEM::load_state(FILEIO* state_fio)
 {
        bool mb = false;
        if(state_entry != NULL) {
@@ -86,7 +86,7 @@ bool SYSTEM::load_state(FILEIO* state_fio)
        return true;
 }
 
-bool SYSTEM::process_state(FILEIO* state_fio, bool loading)
+bool PHC25_SYSTEM::process_state(FILEIO* state_fio, bool loading)
 {
        if(!state_fio->StateCheckUint32(STATE_VERSION)) {
                return false;