summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/dmv.cpp
diff options
context:
space:
mode:
author Ivan Vangelista <mesgnet@yahoo.it>2020-05-19 22:12:24 +0200
committer Ivan Vangelista <mesgnet@yahoo.it>2020-05-19 22:12:24 +0200
commitf6c4a6c7074830956cfeca38fc7488c16ce01ce1 (patch)
tree79d57912f91f87728ab397d9fb92974fc80d2f4f /src/mame/drivers/dmv.cpp
parent6e0906445d02195575a07c4ebd03f2f9c26d07ed (diff)
another bunch of macro removals (nw)
Diffstat (limited to 'src/mame/drivers/dmv.cpp')
-rw-r--r--src/mame/drivers/dmv.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/mame/drivers/dmv.cpp b/src/mame/drivers/dmv.cpp
index 64a31db58b6..4c6b877c766 100644
--- a/src/mame/drivers/dmv.cpp
+++ b/src/mame/drivers/dmv.cpp
@@ -96,14 +96,14 @@ private:
DECLARE_READ8_MEMBER(romsel_r);
DECLARE_WRITE8_MEMBER(ramsel_w);
DECLARE_WRITE8_MEMBER(romsel_w);
- DECLARE_READ8_MEMBER(kb_mcu_port1_r);
- DECLARE_WRITE8_MEMBER(kb_mcu_port1_w);
- DECLARE_WRITE8_MEMBER(kb_mcu_port2_w);
+ uint8_t kb_mcu_port1_r();
+ void kb_mcu_port1_w(uint8_t data);
+ void kb_mcu_port2_w(uint8_t data);
DECLARE_WRITE8_MEMBER(rambank_w);
- DECLARE_READ8_MEMBER(program_r);
- DECLARE_WRITE8_MEMBER(program_w);
- DECLARE_READ8_MEMBER(exp_program_r);
- DECLARE_WRITE8_MEMBER(exp_program_w);
+ uint8_t program_r(offs_t offset);
+ void program_w(offs_t offset, uint8_t data);
+ uint8_t exp_program_r(offs_t offset);
+ void exp_program_w(offs_t offset, uint8_t data);
DECLARE_WRITE_LINE_MEMBER(thold7_w);
void update_busint(int slot, int state);
@@ -440,22 +440,22 @@ void dmv_state::ifsel_w(int ifsel, offs_t offset, uint8_t data)
slot->io_write(ifsel, offset, data);
}
-WRITE8_MEMBER(dmv_state::exp_program_w)
+void dmv_state::exp_program_w(offs_t offset, uint8_t data)
{
program_write((offset >> 16) & 0x07, offset, data);
}
-READ8_MEMBER(dmv_state::exp_program_r)
+uint8_t dmv_state::exp_program_r(offs_t offset)
{
return program_read((offset >> 16) & 0x07, offset);
}
-WRITE8_MEMBER(dmv_state::program_w)
+void dmv_state::program_w(offs_t offset, uint8_t data)
{
program_write(m_ram_bank, offset, data);
}
-READ8_MEMBER(dmv_state::program_r)
+uint8_t dmv_state::program_r(offs_t offset)
{
return program_read(m_ram_bank, offset);
}
@@ -592,18 +592,18 @@ void dmv_state::dmv_io(address_map &map)
map(0xc0, 0xcf).rw(FUNC(dmv_state::ifsel4_r), FUNC(dmv_state::ifsel4_w));
}
-READ8_MEMBER(dmv_state::kb_mcu_port1_r)
+uint8_t dmv_state::kb_mcu_port1_r()
{
return !(m_keyboard->sd_poll_r() & !m_sd_poll_state);
}
-WRITE8_MEMBER(dmv_state::kb_mcu_port1_w)
+void dmv_state::kb_mcu_port1_w(uint8_t data)
{
m_sd_poll_state = BIT(data, 1);
m_keyboard->sd_poll_w(!m_sd_poll_state);
}
-WRITE8_MEMBER(dmv_state::kb_mcu_port2_w)
+void dmv_state::kb_mcu_port2_w(uint8_t data)
{
m_speaker->level_w(BIT(data, 0));
m_slot7a->keyint_w(BIT(data, 4));