[VM][FMTOWNS] .

diff --git a/source/src/vm/common_vm/CMakeLists.txt b/source/src/vm/common_vm/CMakeLists.txt
index 2923b06..9a51c66 100644 (file)
--- a/source/src/vm/common_vm/CMakeLists.txt
+++ b/source/src/vm/common_vm/CMakeLists.txt
@@ -1,6 +1,6 @@
 message("* vm/common_vm")
 
-SET(THIS_LIB_VERSION 2.24.0)
+SET(THIS_LIB_VERSION 2.24.1)
 
 #include(cotire)
 set(s_vm_common_vm_srcs

diff --git a/source/src/vm/fmtowns/fmtowns.cpp b/source/src/vm/fmtowns/fmtowns.cpp
index f0fa257..d997c07 100644 (file)
--- a/source/src/vm/fmtowns/fmtowns.cpp
+++ b/source/src/vm/fmtowns/fmtowns.cpp
@@ -170,8 +170,8 @@ VM::VM(EMU* parent_emu) : VM_TEMPLATE(parent_emu)
        head_up_sound = new NOISE(this, emu);
        head_down_sound = new NOISE(this, emu);
        
-       scsi_host = new TOWNS_SCSI_HOST(this, emu);
-//     scsi_host = new SCSI_HOST(this, emu);
+//     scsi_host = new TOWNS_SCSI_HOST(this, emu);
+       scsi_host = new SCSI_HOST(this, emu);
        
        for(int i = 0; i < 7; i++) {
                scsi_hdd[i] = NULL;

diff --git a/source/src/vm/fmtowns/fmtowns.h b/source/src/vm/fmtowns/fmtowns.h
index 5393cb6..95cd3ce 100644 (file)
--- a/source/src/vm/fmtowns/fmtowns.h
+++ b/source/src/vm/fmtowns/fmtowns.h
@@ -330,8 +330,8 @@ protected:
        FMTOWNS::TOWNS_CDROM*    cdrom;
        
        FMTOWNS::SCSI* scsi;
-       FMTOWNS::TOWNS_SCSI_HOST* scsi_host;
-       //SCSI_HOST* scsi_host;
+       //FMTOWNS::TOWNS_SCSI_HOST* scsi_host;
+       SCSI_HOST* scsi_host;
        SCSI_HDD*      scsi_hdd[8]; //
 
        int adc_in_ch;

diff --git a/source/src/vm/fmtowns/towns_dmac.cpp b/source/src/vm/fmtowns/towns_dmac.cpp
index 49e8b5f..7651b8a 100644 (file)
--- a/source/src/vm/fmtowns/towns_dmac.cpp
+++ b/source/src/vm/fmtowns/towns_dmac.cpp
@@ -21,12 +21,13 @@ void TOWNS_DMAC::reset()
 void TOWNS_DMAC::write_io8(uint32_t addr, uint32_t data)
 {
 //     if((addr & 0x0f) == 0x0c) out_debug_log("WRITE REG: %08X %08X", addr, data);
-       out_debug_log("WRITE REG: %04X %02X", addr, data);
+//     out_debug_log("WRITE REG: %04X %02X", addr, data);
        uint naddr;
        switch(addr & 0x0f) {
        case 0x00:
                out_debug_log(_T("RESET REG(00h) to %02X"), data);
                break;
+/*             
        case 0x02:
        case 0x03:
                naddr = (addr & 0x0f) - 2;
@@ -96,6 +97,7 @@ void TOWNS_DMAC::write_io8(uint32_t addr, uint32_t data)
                }
                return;
                break;
+*/
        case 0x07:
                dma_high_address = (data & 0xff) << 24;
                return;
@@ -397,6 +399,9 @@ void TOWNS_DMAC::write_signal(int id, uint32_t data, uint32_t mask)
                }
        } else {
                // Fallthrough.
+//             if(id == SIG_UPD71071_CH1) {
+//                     out_debug_log(_T("DRQ from SCSI %02X %02X"), data, mask);
+//             }
                UPD71071::write_signal(id, data, mask);
        }
 }              

diff --git a/source/src/vm/fmtowns/towns_scsi_host.cpp b/source/src/vm/fmtowns/towns_scsi_host.cpp
index 2866065..12b64e7 100644 (file)
--- a/source/src/vm/fmtowns/towns_scsi_host.cpp
+++ b/source/src/vm/fmtowns/towns_scsi_host.cpp
@@ -62,6 +62,7 @@ uint32_t TOWNS_SCSI_HOST::read_signal(int ch)
        
 void TOWNS_SCSI_HOST::write_signal(int id, uint32_t data, uint32_t mask)
 {
+#if 0
        switch(id) {
        case SIG_SCSI_REQ:
                {
@@ -122,7 +123,8 @@ void TOWNS_SCSI_HOST::write_signal(int id, uint32_t data, uint32_t mask)
                break;
 #endif
        }
-       return SCSI_HOST::write_signal(id, data, mask); 
+#endif
+       SCSI_HOST::write_signal(id, data, mask);        
 }
 
 void TOWNS_SCSI_HOST::event_callback(int event_id, int err)