[VM][DEVICE][WIP] Updating State functions.Still cause FTBFS.

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

diff --git a/source/src/vm/upd7220.cpp b/source/src/vm/upd7220.cpp
index 95a8295..7e05b15 100644 (file)
--- a/source/src/vm/upd7220.cpp
+++ b/source/src/vm/upd7220.cpp
@@ -724,76 +724,73 @@ bool UPD7220::process_state(FILEIO* state_fio, bool loading)
        if(!state_fio->StateCheckInt32(this_device_id)) {
                return false;
        }
-       state_fio->StateInt32(cmdreg);
-       state_fio->StateUint8(statreg);
-       state_fio->StateBuffer(sync, sizeof(sync), 1);
-       state_fio->StateInt32(vtotal);
-       state_fio->StateInt32(vfp);
-       state_fio->StateInt32(vs);
-       state_fio->StateInt32(vbp);
-       state_fio->StateInt32(v1);
-       state_fio->StateInt32(v2);
-       state_fio->StateInt32(v3);
-       state_fio->StateInt32(v4);
-       state_fio->StateInt32(hfp);
-       state_fio->StateInt32(hs);
-       state_fio->StateInt32(hbp);
-       state_fio->StateInt32(h1);
-       state_fio->StateInt32(h2);
-       state_fio->StateInt32(h3);
-       state_fio->StateInt32(h4);
-       state_fio->StateBool(sync_changed);
-       state_fio->StateBool(master);
-       state_fio->StateUint8(zoom);
-       state_fio->StateUint8(zr);
-       state_fio->StateUint8(zw);
-       state_fio->StateBuffer(ra, sizeof(ra), 1);
-       state_fio->StateBuffer(cs, sizeof(cs), 1);
-       state_fio->StateUint8(pitch);
-       state_fio->StateUint32(lad);
-       state_fio->StateBuffer(vect, sizeof(vect), 1);
-       state_fio->StateInt32(ead);
-       state_fio->StateInt32(dad);
-       state_fio->StateUint8(maskl);
-       state_fio->StateUint8(maskh);
-       state_fio->StateUint8(mod);
-       state_fio->StateBool(hsync);
-       state_fio->StateBool(hblank);
-       state_fio->StateBool(vsync);
-       state_fio->StateBool(vblank);
-       state_fio->StateBool(start);
-       state_fio->StateInt32(blink_cursor);
-       state_fio->StateInt32(blink_attr);
-       state_fio->StateInt32(blink_rate);
-       state_fio->StateBool(low_high);
-       state_fio->StateBool(cmd_write_done);
-       state_fio->StateInt32(cpu_clocks);
+       state_fio->StateValue(cmdreg);
+       state_fio->StateValue(statreg);
+       state_fio->StateArray(sync, sizeof(sync), 1);
+       state_fio->StateValue(vtotal);
+       state_fio->StateValue(vfp);
+       state_fio->StateValue(vs);
+       state_fio->StateValue(vbp);
+       state_fio->StateValue(v1);
+       state_fio->StateValue(v2);
+       state_fio->StateValue(v3);
+       state_fio->StateValue(v4);
+       state_fio->StateValue(hfp);
+       state_fio->StateValue(hs);
+       state_fio->StateValue(hbp);
+       state_fio->StateValue(h1);
+       state_fio->StateValue(h2);
+       state_fio->StateValue(h3);
+       state_fio->StateValue(h4);
+       state_fio->StateValue(sync_changed);
+       state_fio->StateValue(master);
+       state_fio->StateValue(zoom);
+       state_fio->StateValue(zr);
+       state_fio->StateValue(zw);
+       state_fio->StateArray(ra, sizeof(ra), 1);
+       state_fio->StateArray(cs, sizeof(cs), 1);
+       state_fio->StateValue(pitch);
+       state_fio->StateValue(lad);
+       state_fio->StateArray(vect, sizeof(vect), 1);
+       state_fio->StateValue(ead);
+       state_fio->StateValue(dad);
+       state_fio->StateValue(maskl);
+       state_fio->StateValue(maskh);
+       state_fio->StateValue(mod);
+       state_fio->StateValue(hsync);
+       state_fio->StateValue(hblank);
+       state_fio->StateValue(vsync);
+       state_fio->StateValue(vblank);
+       state_fio->StateValue(start);
+       state_fio->StateValue(blink_cursor);
+       state_fio->StateValue(blink_attr);
+       state_fio->StateValue(blink_rate);
+       state_fio->StateValue(low_high);
+       state_fio->StateValue(cmd_write_done);
+       state_fio->StateValue(cpu_clocks);
 #ifdef UPD7220_HORIZ_FREQ
-       state_fio->StateInt32(horiz_freq);
-       state_fio->StateInt32(next_horiz_freq);
+       state_fio->StateValue(horiz_freq);
+       state_fio->StateValue(next_horiz_freq);
 #endif
-       state_fio->StateDouble(frames_per_sec);
-       state_fio->StateInt32(lines_per_frame);
-       state_fio->StateBuffer(params, sizeof(params), 1);
-       state_fio->StateInt32(params_count);
+       state_fio->StateValue(frames_per_sec);
+       state_fio->StateValue(lines_per_frame);
+       state_fio->StateArray(params, sizeof(params), 1);
+       state_fio->StateValue(params_count);
        if(!fo->process_state((void *)state_fio, loading)) {
                return false;
        }
-       //state_fio->StateBuffer(rt, sizeof(rt), 1);
-       for(int i = 0; i < (sizeof(rt) / sizeof(int)) ; i++) {
-               state_fio->StateInt32(rt[i]);
-       }
-       state_fio->StateInt32(dx);
-       state_fio->StateInt32(dy);
-       state_fio->StateInt32(dir);
-       state_fio->StateInt32(dif);
-       state_fio->StateInt32(sl);
-       state_fio->StateInt32(dc);
-       state_fio->StateInt32(d);
-       state_fio->StateInt32(d2);
-       state_fio->StateInt32(d1);
-       state_fio->StateInt32(dm);
-       state_fio->StateUint16(pattern);
+       state_fio->StateArray(rt, sizeof(rt), 1);
+       state_fio->StateValue(dx);
+       state_fio->StateValue(dy);
+       state_fio->StateValue(dir);
+       state_fio->StateValue(dif);
+       state_fio->StateValue(sl);
+       state_fio->StateValue(dc);
+       state_fio->StateValue(d);
+       state_fio->StateValue(d2);
+       state_fio->StateValue(d1);
+       state_fio->StateValue(dm);
+       state_fio->StateValue(pattern);
        
        // post process
        if(loading && master) {