[VM][UPD71070] Change mean of TC bus bits (per channel).See mz2800.cpp.

[VM][FMTOWNS][CDROM] DMAC driven DMA_IRQ.

diff --git a/source/src/vm/fmtowns/fmtowns.cpp b/source/src/vm/fmtowns/fmtowns.cpp
index 4327111..8e4e11d 100644 (file)
--- a/source/src/vm/fmtowns/fmtowns.cpp
+++ b/source/src/vm/fmtowns/fmtowns.cpp
@@ -306,6 +306,7 @@ VM::VM(EMU* parent_emu) : VM_TEMPLATE(parent_emu)
        dma->set_context_ch1(scsi_host);
        //dma->set_context_ch2(printer);
        dma->set_context_ch3(cdrom);
+       dma->set_context_tc(cdrom, SIG_TOWNS_CDROM_DMAINT, 1 << 3);
        dma->set_context_ube1(scsi_host, SIG_SCSI_16BIT_BUS, 0x02);
 
        dma->set_context_child_dma(extra_dma);

diff --git a/source/src/vm/fmtowns/towns_cdrom.cpp b/source/src/vm/fmtowns/towns_cdrom.cpp
index a2836b9..4b46b01 100644 (file)
--- a/source/src/vm/fmtowns/towns_cdrom.cpp
+++ b/source/src/vm/fmtowns/towns_cdrom.cpp
@@ -608,6 +608,11 @@ void TOWNS_CDROM::write_signal(int id, uint32_t data, uint32_t mask)
                        reset();
                }
                break;
+       case SIG_TOWNS_CDROM_DMAINT:
+               if((data & mask) != 0) {
+                       set_dma_intr(true);
+               }
+               break;
        default:
 //             SCSI_DEV::write_signal(id, data, mask);
                // ToDo: Implement master devices.
@@ -1211,7 +1216,7 @@ void TOWNS_CDROM::event_callback(int event_id, int err)
                        if(read_length > 0) {
                                out_debug_log(_T("READ NEXT SECTOR"));
                                set_status(true, 0, TOWNS_CD_STATUS_DATA_READY, 0x00, 0x00, 0x00);
-                               set_dma_intr(true);
+                               set_mcu_intr(true);
                                register_event(this, EVENT_CDROM_SEEK_COMPLETED,
                                                           (1.0e6 / ((double)transfer_speed * 150.0e3)) * 16.0, // OK?
                                                           false, NULL);

diff --git a/source/src/vm/fmtowns/towns_cdrom.h b/source/src/vm/fmtowns/towns_cdrom.h
index e26501f..1445fda 100644 (file)
--- a/source/src/vm/fmtowns/towns_cdrom.h
+++ b/source/src/vm/fmtowns/towns_cdrom.h
@@ -33,6 +33,7 @@
 #define SIG_TOWNS_CDROM_ABSOLUTE_MSF           0x21
 #define SIG_TOWNS_CDROM_READ_DATA                      0x22
 #define SIG_TOWNS_CDROM_RESET                          0x23
+#define SIG_TOWNS_CDROM_DMAINT                         0x24
 
 class SCSI_HOST;
 class FIFO;

diff --git a/source/src/vm/mz2800/mz2800.cpp b/source/src/vm/mz2800/mz2800.cpp
index 65389ce..1a734ce 100644 (file)
--- a/source/src/vm/mz2800/mz2800.cpp
+++ b/source/src/vm/mz2800/mz2800.cpp
@@ -165,7 +165,7 @@ VM::VM(EMU* parent_emu) : VM_TEMPLATE(parent_emu)
        dma->set_context_memory(memory);
        dma->set_context_ch0(sasi);
        dma->set_context_ch1(fdc);
-       dma->set_context_tc(pic, SIG_I8259_CHIP0 | SIG_I8259_IR3, 1);
+       dma->set_context_tc(pic, SIG_I8259_CHIP0 | SIG_I8259_IR3, 3); // OK?
        dma->set_context_tc(sasi, SIG_SASI_TC, 1);
        opn->set_context_irq(pic, SIG_I8259_CHIP1 | SIG_I8259_IR7, 1);
        opn->set_context_port_a(crtc, SIG_CRTC_PALLETE, 0x04, 0);

diff --git a/source/src/vm/upd71071.cpp b/source/src/vm/upd71071.cpp
index 400cd22..3916620 100644 (file)
--- a/source/src/vm/upd71071.cpp
+++ b/source/src/vm/upd71071.cpp
@@ -415,7 +415,7 @@ bool UPD71071::do_dma_prologue(int c)
                sreq &= ~bit;
                tc |= bit;
                                                
-               write_signals(&outputs_tc, 0xffffffff);
+               write_signals(&outputs_tc, tc);
                return true;
        }
        if(_SINGLE_MODE_DMA) {