summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author AJR <ajrhacker@users.noreply.github.com>2017-11-25 13:54:35 -0500
committer AJR <ajrhacker@users.noreply.github.com>2017-11-25 13:55:43 -0500
commit2d0c2b060ece516eb45adf4b7ad3270af6adb70c (patch)
tree4f947e4fe21d4e3048db633fd52d5548ee2c25b9
parent2bb61a25538285924ad3ebceba2e81bbf39b666f (diff)
a2bus: Define 7M clock through constant (nw)
-rw-r--r--src/devices/bus/a2bus/a2bus.h3
-rw-r--r--src/devices/bus/a2bus/pc_xporter.cpp10
-rw-r--r--src/devices/bus/a2bus/transwarp.cpp18
3 files changed, 13 insertions, 18 deletions
diff --git a/src/devices/bus/a2bus/a2bus.h b/src/devices/bus/a2bus/a2bus.h
index f76a5e1166c..9afff242bdf 100644
--- a/src/devices/bus/a2bus/a2bus.h
+++ b/src/devices/bus/a2bus/a2bus.h
@@ -51,6 +51,9 @@
MCFG_DEVICE_INPUT_DEFAULTS(_def_inp) \
device_a2bus_card_interface::static_set_a2bus_tag(*device, _nbtag, _tag);
+// 7M = XTAL_14_31818MHz / 2 or XTAL_28_63636MHz / 4 (for IIgs)
+static constexpr uint32_t A2BUS_7M_CLOCK = 7159090;
+
//**************************************************************************
// TYPE DEFINITIONS
//**************************************************************************
diff --git a/src/devices/bus/a2bus/pc_xporter.cpp b/src/devices/bus/a2bus/pc_xporter.cpp
index 3583781a871..9b3b4c726f3 100644
--- a/src/devices/bus/a2bus/pc_xporter.cpp
+++ b/src/devices/bus/a2bus/pc_xporter.cpp
@@ -114,21 +114,21 @@ ADDRESS_MAP_END
//-------------------------------------------------
MACHINE_CONFIG_MEMBER( a2bus_pcxporter_device::device_add_mconfig )
- MCFG_CPU_ADD("v30", V30, XTAL_14_31818MHz/2) // 7.16 MHz as per manual
+ MCFG_CPU_ADD("v30", V30, A2BUS_7M_CLOCK) // 7.16 MHz as per manual
MCFG_CPU_PROGRAM_MAP(pc_map)
MCFG_CPU_IO_MAP(pc_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb)
MCFG_DEVICE_DISABLE()
MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
- MCFG_PIT8253_CLK0(XTAL_14_31818MHz/12.0) // heartbeat IRQ
+ MCFG_PIT8253_CLK0(A2BUS_7M_CLOCK / 6.0) // heartbeat IRQ
MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic8259", pic8259_device, ir0_w))
- MCFG_PIT8253_CLK1(XTAL_14_31818MHz/12.0) // dram refresh
+ MCFG_PIT8253_CLK1(A2BUS_7M_CLOCK / 6.0) // dram refresh
MCFG_PIT8253_OUT1_HANDLER(WRITELINE(a2bus_pcxporter_device, pc_pit8253_out1_changed))
- MCFG_PIT8253_CLK2(XTAL_14_31818MHz/12.0) // pio port c pin 4, and speaker polling enough
+ MCFG_PIT8253_CLK2(A2BUS_7M_CLOCK / 6.0) // pio port c pin 4, and speaker polling enough
MCFG_PIT8253_OUT2_HANDLER(WRITELINE(a2bus_pcxporter_device, pc_pit8253_out2_changed))
- MCFG_DEVICE_ADD( "dma8237", PCXPORT_DMAC, XTAL_14_31818MHz/2 )
+ MCFG_DEVICE_ADD("dma8237", PCXPORT_DMAC, A2BUS_7M_CLOCK / 2)
MCFG_I8237_OUT_HREQ_CB(WRITELINE(a2bus_pcxporter_device, pc_dma_hrq_changed))
MCFG_I8237_OUT_EOP_CB(WRITELINE(a2bus_pcxporter_device, pc_dma8237_out_eop))
MCFG_I8237_IN_MEMR_CB(READ8(a2bus_pcxporter_device, pc_dma_read_byte))
diff --git a/src/devices/bus/a2bus/transwarp.cpp b/src/devices/bus/a2bus/transwarp.cpp
index ddb12d8ec07..404b847d966 100644
--- a/src/devices/bus/a2bus/transwarp.cpp
+++ b/src/devices/bus/a2bus/transwarp.cpp
@@ -121,7 +121,7 @@ ioport_constructor a2bus_transwarp_device::device_input_ports() const
//-------------------------------------------------
MACHINE_CONFIG_MEMBER( a2bus_transwarp_device::device_add_mconfig )
- MCFG_CPU_ADD(CPU_TAG, M65C02, XTAL_14_31818MHz/4)
+ MCFG_CPU_ADD(CPU_TAG, M65C02, A2BUS_7M_CLOCK / 2)
MCFG_CPU_PROGRAM_MAP(m65c02_mem)
MACHINE_CONFIG_END
@@ -168,13 +168,9 @@ void a2bus_transwarp_device::device_reset()
if (!(m_dsw2->read() & 0x80))
{
if (m_dsw1->read() & 0x80)
- {
- m_ourcpu->set_unscaled_clock(XTAL_14_31818MHz/8);
- }
+ m_ourcpu->set_unscaled_clock(A2BUS_7M_CLOCK / 4);
else
- {
- m_ourcpu->set_unscaled_clock(XTAL_14_31818MHz/4);
- }
+ m_ourcpu->set_unscaled_clock(A2BUS_7M_CLOCK / 2);
}
else
{
@@ -187,13 +183,9 @@ void a2bus_transwarp_device::device_timer(emu_timer &timer, device_timer_id id,
if (!(m_dsw2->read() & 0x80))
{
if (m_dsw1->read() & 0x80)
- {
- m_ourcpu->set_unscaled_clock(XTAL_14_31818MHz/8);
- }
+ m_ourcpu->set_unscaled_clock(A2BUS_7M_CLOCK / 4);
else
- {
- m_ourcpu->set_unscaled_clock(XTAL_14_31818MHz/4);
- }
+ m_ourcpu->set_unscaled_clock(A2BUS_7M_CLOCK / 2);
}
m_timer->adjust(attotime::never);
}