diff options
Diffstat (limited to 'src/devices/bus/bbc/exp/mertec.cpp')
-rw-r--r-- | src/devices/bus/bbc/exp/mertec.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/devices/bus/bbc/exp/mertec.cpp b/src/devices/bus/bbc/exp/mertec.cpp index ab9dc3c2f6e..8f896da0359 100644 --- a/src/devices/bus/bbc/exp/mertec.cpp +++ b/src/devices/bus/bbc/exp/mertec.cpp @@ -52,7 +52,7 @@ void bbc_mertec_device::device_add_mconfig(machine_config &config) //m_pia->irq_handler().set("irqs", FUNC(input_merger_device::in_w<0>)); /* adc */ - UPD7002(config, m_upd7002, DERIVED_CLOCK(1, 8)); + UPD7002(config, m_upd7002, 0); m_upd7002->set_get_analogue_callback(FUNC(bbc_mertec_device::get_analogue_input), this); m_upd7002->set_eoc_callback(FUNC(bbc_mertec_device::upd7002_eoc), this); @@ -114,52 +114,52 @@ void bbc_mertec_device::upd7002_eoc(int data) //m_via6522_0->write_cb1(data); } -uint8_t bbc_mertec_device::fred_r(offs_t offset) +READ8_MEMBER(bbc_mertec_device::fred_r) { - return m_2mhzbus->fred_r(offset); + return m_2mhzbus->fred_r(space, offset); } -void bbc_mertec_device::fred_w(offs_t offset, uint8_t data) +WRITE8_MEMBER(bbc_mertec_device::fred_w) { - m_2mhzbus->fred_w(offset, data); + m_2mhzbus->fred_w(space, offset, data); } -uint8_t bbc_mertec_device::jim_r(offs_t offset) +READ8_MEMBER(bbc_mertec_device::jim_r) { - return m_2mhzbus->jim_r(offset); + return m_2mhzbus->jim_r(space, offset); } -void bbc_mertec_device::jim_w(offs_t offset, uint8_t data) +WRITE8_MEMBER(bbc_mertec_device::jim_w) { - m_2mhzbus->jim_w(offset, data); + m_2mhzbus->jim_w(space, offset, data); } -uint8_t bbc_mertec_device::sheila_r(offs_t offset) +READ8_MEMBER(bbc_mertec_device::sheila_r) { uint8_t data = 0xfe; if (offset >= 0x18 && offset < 0x20) { - data = m_upd7002->read(offset & 0x03); + data = m_upd7002->read(space, offset & 0x03); } return data; } -void bbc_mertec_device::sheila_w(offs_t offset, uint8_t data) +WRITE8_MEMBER(bbc_mertec_device::sheila_w) { if (offset >= 0x18 && offset < 0x20) { - m_upd7002->write(offset & 0x03, data); + m_upd7002->write(space, offset & 0x03, data); } } -uint8_t bbc_mertec_device::pb_r() +READ8_MEMBER(bbc_mertec_device::pb_r) { - return m_userport->pb_r(); + return m_userport->pb_r(space, 0); } -void bbc_mertec_device::pb_w(uint8_t data) +WRITE8_MEMBER(bbc_mertec_device::pb_w) { - m_userport->pb_w(data); + m_userport->pb_w(space, 0, data); } |