[VM][PC9801][I286] Fix FTBFS.

[VM][PCENGINE][SCSI_CDROM] Fix FTBFS.
[VM][YM2203] Enable OPNA.

diff --git a/source/src/vm/i286.cpp b/source/src/vm/i286.cpp
index 65f467e..82ad6bf 100644 (file)
--- a/source/src/vm/i286.cpp
+++ b/source/src/vm/i286.cpp
@@ -535,7 +535,7 @@ void I286::decl_state_cpustate()
        for(int i = 0; i < 8; i++) {
                DECL_STATE_ENTRY_UINT16_MEMBER((state->regs.w[i]), i);
        }
-       DECL_STATE_ENTRY_UINT32((state->amask));
+
        DECL_STATE_ENTRY_UINT32((state->pc));
        DECL_STATE_ENTRY_UINT32((state->prevpc));
        DECL_STATE_ENTRY_1D_ARRAY((state->base), 4);

diff --git a/source/src/vm/scsi_cdrom.cpp b/source/src/vm/scsi_cdrom.cpp
index 02c256e..e9cb7f2 100644 (file)
--- a/source/src/vm/scsi_cdrom.cpp
+++ b/source/src/vm/scsi_cdrom.cpp
@@ -787,6 +787,7 @@ bool SCSI_CDROM::load_state(FILEIO* state_fio)
           mb = state_entry->load_state(state_fio, &crc_value);
        }
        if(!mb) return false;
+       csp_state_data_saver saver(state_fio);
 //     if(state_fio->FgetUint32() != STATE_VERSION) {
 //             return false;
 //     }

diff --git a/source/src/vm/ym2203.cpp b/source/src/vm/ym2203.cpp
index 79267f4..28fe96e 100644 (file)
--- a/source/src/vm/ym2203.cpp
+++ b/source/src/vm/ym2203.cpp
@@ -24,11 +24,11 @@ void YM2203::initialize()
 {
        DEVICE::initialize();
        _HAS_YM2608 = osd->check_feature(_T("HAS_YM2608"));
-//     if(_HAS_YM2608) {
-//             is_ym2608 = true;
-//     } else {
-//             is_ym2608 = false;
-//     }
+       if(_HAS_YM2608) {
+               is_ym2608 = true;
+       } else {
+               is_ym2608 = false;
+       }
        _HAS_AY_3_8910 = osd->check_feature(_T("HAS_AY_3_8910"));
        _HAS_AY_3_8912 = osd->check_feature(_T("HAS_AY_3_8912"));
        _HAS_AY_3_8913 = osd->check_feature(_T("HAS_AY_3_8913"));