[VM][STATE][WIP] Apply process_state() to some devices.

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

diff --git a/source/src/vm/mc6847_base.cpp b/source/src/vm/mc6847_base.cpp
index 850f70a..fc8abfc 100644 (file)
--- a/source/src/vm/mc6847_base.cpp
+++ b/source/src/vm/mc6847_base.cpp
@@ -256,81 +256,27 @@ void MC6847_BASE::draw_alpha()
 
 #define STATE_VERSION  1
 
-#include "../statesub.h"
-
-void MC6847_BASE::decl_state()
-{
-       enter_decl_state(STATE_VERSION);
-       
-       DECL_STATE_ENTRY_1D_ARRAY(sg4, sizeof(sg4));
-       DECL_STATE_ENTRY_1D_ARRAY(sg6, sizeof(sg6));
-       
-       DECL_STATE_ENTRY_BOOL(ag);
-       DECL_STATE_ENTRY_BOOL(as);
-       DECL_STATE_ENTRY_BOOL(intext);
-       DECL_STATE_ENTRY_UINT8(gm);
-       DECL_STATE_ENTRY_BOOL(css);
-       DECL_STATE_ENTRY_BOOL(inv);
-       DECL_STATE_ENTRY_BOOL(vsync);
-       DECL_STATE_ENTRY_BOOL(hsync);
-       DECL_STATE_ENTRY_BOOL(disp);
-       DECL_STATE_ENTRY_INT32(tWHS);
-       DECL_STATE_ENTRY_BOOL(disabled);
-
-       leave_decl_state();
-}
-void MC6847_BASE::save_state(FILEIO* state_fio)
-{
-       if(state_entry != NULL) {
-               state_entry->save_state(state_fio);
-       }
-       
-//     state_fio->FputUint32(STATE_VERSION);
-//     state_fio->FputInt32(this_device_id);
-       
-//     state_fio->Fwrite(sg4, sizeof(sg4), 1);
-//     state_fio->Fwrite(sg6, sizeof(sg6), 1);
-//     state_fio->FputBool(ag);
-//     state_fio->FputBool(as);
-//     state_fio->FputBool(intext);
-//     state_fio->FputUint8(gm);
-//     state_fio->FputBool(css);
-//     state_fio->FputBool(inv);
-//     state_fio->FputBool(vsync);
-//     state_fio->FputBool(hsync);
-//     state_fio->FputBool(disp);
-//     state_fio->FputInt32(tWHS);
-//     state_fio->FputBool(disabled);
-}
-
-bool MC6847_BASE::load_state(FILEIO* state_fio)
+bool MC6847_BASE::process_state(FILEIO* state_fio, bool loading)
 {
-       bool mb = false;
-       if(state_entry != NULL) {
-               mb = state_entry->load_state(state_fio);
-       }
-       if(!mb) return false;
-       
-
-//     if(state_fio->FgetUint32() != STATE_VERSION) {
-//             return false;
-//     }
-//     if(state_fio->FgetInt32() != this_device_id) {
-//             return false;
-//     }
-//     state_fio->Fread(sg4, sizeof(sg4), 1);
-//     state_fio->Fread(sg6, sizeof(sg6), 1);
-//     ag = state_fio->FgetBool();
-//     as = state_fio->FgetBool();
-//     intext = state_fio->FgetBool();
-//     gm = state_fio->FgetUint8();
-//     css = state_fio->FgetBool();
-//     inv = state_fio->FgetBool();
-//     vsync = state_fio->FgetBool();
-//     hsync = state_fio->FgetBool();
-//     disp = state_fio->FgetBool();
-//     tWHS = state_fio->FgetInt32();
-//     disabled = state_fio->FgetBool();
-       return true;
+       if(!state_fio->StateCheckUint32(STATE_VERSION)) {
+               return false;
+       }
+       if(!state_fio->StateCheckInt32(this_device_id)) {
+               return false;
+       }
+       state_fio->StateBuffer(sg4, sizeof(sg4), 1);
+       state_fio->StateBuffer(sg6, sizeof(sg6), 1);
+       state_fio->StateBool(ag);
+       state_fio->StateBool(as);
+       state_fio->StateBool(intext);
+       state_fio->StateUint8(gm);
+       state_fio->StateBool(css);
+       state_fio->StateBool(inv);
+       state_fio->StateBool(vsync);
+       state_fio->StateBool(hsync);
+       state_fio->StateBool(disp);
+       state_fio->StateInt32(tWHS);
+       state_fio->StateBool(disabled);
+       return true;
 }
-
+