summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Patrick Mackinlay <pmackinlay@hotmail.com>2020-09-17 19:06:09 +0700
committer Patrick Mackinlay <pmackinlay@hotmail.com>2020-09-17 19:06:09 +0700
commit4b9cef80f2de39c3812fe541ff048eee34a3d4cf (patch)
tree704a770970c29aea4babdfbb5abc018ac287894b
parent245c0b06b22934c69c75e373ef77cec758bcd92d (diff)
news_68k: incorporate dmac changes
* NEWS-OS now boots and runs in serial console mode
-rw-r--r--scripts/src/machine.lua11
-rw-r--r--src/mame/drivers/news_68k.cpp6
2 files changed, 14 insertions, 3 deletions
diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua
index 600c22f2746..8d44ebae464 100644
--- a/scripts/src/machine.lua
+++ b/scripts/src/machine.lua
@@ -4546,3 +4546,14 @@ if (MACHINES["ALPHA_8921"]~=null) then
MAME_DIR .. "src/devices/machine/alpha_8921.h",
}
end
+
+---------------------------------------------------
+--
+--@src/devices/machine/ns32202.h,MACHINES["NS32202"] = true
+---------------------------------------------------
+if (MACHINES["NS32202"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/machine/ns32202.cpp",
+ MAME_DIR .. "src/devices/machine/ns32202.h",
+ }
+end
diff --git a/src/mame/drivers/news_68k.cpp b/src/mame/drivers/news_68k.cpp
index 8c6900ada66..961f9f2beea 100644
--- a/src/mame/drivers/news_68k.cpp
+++ b/src/mame/drivers/news_68k.cpp
@@ -336,7 +336,6 @@ void news_68k_state::common(machine_config &config)
DMAC_0266(config, m_dma, 0);
m_dma->set_bus(m_cpu, 0);
- m_dma->out_int_cb().set(*this, FUNC(news_68k_state::irq_w<SCSI>));
INPUT_MERGER_ANY_HIGH(config, m_irq5);
m_irq5->output_handler().set_inputline(m_cpu, INPUT_LINE_IRQ5);
@@ -402,8 +401,9 @@ void news_68k_state::common(machine_config &config)
{
cxd1180_device &adapter = downcast<cxd1180_device &>(*device);
- adapter.irq_handler().set(m_dma, FUNC(dmac_0266_device::irq_w));
- adapter.drq_handler().set(m_dma, FUNC(dmac_0266_device::drq_w));
+ adapter.irq_handler().set(*this, FUNC(news_68k_state::irq_w<SCSI>));
+ adapter.irq_handler().append(m_dma, FUNC(dmac_0266_device::eop_w));
+ adapter.drq_handler().set(m_dma, FUNC(dmac_0266_device::req_w));
subdevice<dmac_0266_device>(":dma")->dma_r_cb().set(adapter, FUNC(cxd1180_device::dma_r));
subdevice<dmac_0266_device>(":dma")->dma_w_cb().set(adapter, FUNC(cxd1180_device::dma_w));