diff options
author | 2020-05-28 18:10:20 +0200 | |
---|---|---|
committer | 2020-05-28 18:10:20 +0200 | |
commit | d4c772bcc7263dd2697a7977d196a96ad2d067a3 (patch) | |
tree | 3fa4d24ee8250f44ec9f7a0cc9df94bf8bd3c5cb /src/mame/drivers/ibm6580.cpp | |
parent | c7d667d41adaa9627a3350e7f984fe7fc431f081 (diff) |
drivers starting with i, j, k, l and m: more macro removal (nw)
Diffstat (limited to 'src/mame/drivers/ibm6580.cpp')
-rw-r--r-- | src/mame/drivers/ibm6580.cpp | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/src/mame/drivers/ibm6580.cpp b/src/mame/drivers/ibm6580.cpp index fcc7dc9bed7..0f2ec3a18d1 100644 --- a/src/mame/drivers/ibm6580.cpp +++ b/src/mame/drivers/ibm6580.cpp @@ -152,14 +152,14 @@ public: void ibm6580(machine_config &config); private: - DECLARE_WRITE16_MEMBER(pic_latch_w); - DECLARE_WRITE16_MEMBER(unk_latch_w); + void pic_latch_w(uint16_t data); + void unk_latch_w(uint16_t data); - DECLARE_WRITE8_MEMBER(p40_w); - DECLARE_READ8_MEMBER(p40_r); + void p40_w(offs_t offset, uint8_t data); + uint8_t p40_r(offs_t offset); - DECLARE_WRITE8_MEMBER(video_w); - DECLARE_READ8_MEMBER(video_r); + void video_w(offs_t offset, uint8_t data); + uint8_t video_r(offs_t offset); DECLARE_WRITE_LINE_MEMBER(vblank_w); uint8_t ppi_a_r(); @@ -171,12 +171,11 @@ private: DECLARE_WRITE_LINE_MEMBER(kb_clock_w); DECLARE_WRITE_LINE_MEMBER(kb_strobe_w); - DECLARE_WRITE8_MEMBER(floppy_w); - DECLARE_READ8_MEMBER(floppy_r); + void floppy_w(offs_t offset, uint8_t data); + uint8_t floppy_r(offs_t offset); DECLARE_FLOPPY_FORMATS(floppy_formats); DECLARE_WRITE_LINE_MEMBER(floppy_intrq); DECLARE_WRITE_LINE_MEMBER(floppy_hdl); - DECLARE_WRITE8_MEMBER(dmapg_w); DECLARE_WRITE_LINE_MEMBER(hrq_w); uint8_t memory_read_byte(offs_t offset); void memory_write_byte(offs_t offset, uint8_t data); @@ -220,7 +219,7 @@ private: }; -WRITE8_MEMBER(ibm6580_state::p40_w) +void ibm6580_state::p40_w(offs_t offset, uint8_t data) { LOG("___ %02x <- %02x\n", 0x40 + (offset << 1), data); @@ -261,7 +260,7 @@ WRITE8_MEMBER(ibm6580_state::p40_w) } } -READ8_MEMBER(ibm6580_state::p40_r) +uint8_t ibm6580_state::p40_r(offs_t offset) { uint8_t data = 0; @@ -283,7 +282,7 @@ READ8_MEMBER(ibm6580_state::p40_r) return data; } -WRITE8_MEMBER(ibm6580_state::video_w) +void ibm6580_state::video_w(offs_t offset, uint8_t data) { LOG("Video %02x <- %02x\n", 0xe000 + (offset << 1), data); @@ -296,7 +295,7 @@ WRITE8_MEMBER(ibm6580_state::video_w) } } -READ8_MEMBER(ibm6580_state::video_r) +uint8_t ibm6580_state::video_r(offs_t offset) { uint8_t data = 0; @@ -331,7 +330,7 @@ WRITE_LINE_MEMBER(ibm6580_state::vblank_w) m_p40 |= 4; } -WRITE16_MEMBER(ibm6580_state::pic_latch_w) +void ibm6580_state::pic_latch_w(uint16_t data) { LOG("PIC latch <- %02x\n", data); @@ -348,7 +347,7 @@ WRITE16_MEMBER(ibm6580_state::pic_latch_w) m_pic8259->ir7_w(data == 2 ? ASSERT_LINE : CLEAR_LINE); } -WRITE16_MEMBER(ibm6580_state::unk_latch_w) +void ibm6580_state::unk_latch_w(uint16_t data) { LOG("UNK latch <- %02x\n", data); @@ -599,7 +598,7 @@ uint8_t ibm6580_state::floppy_mcu_command() return data; } -WRITE8_MEMBER(ibm6580_state::floppy_w) +void ibm6580_state::floppy_w(offs_t offset, uint8_t data) { LOG("Floppy %02x <- %02x\n", 0x8150 + (offset << 1), data); @@ -629,7 +628,7 @@ WRITE8_MEMBER(ibm6580_state::floppy_w) } } -READ8_MEMBER(ibm6580_state::floppy_r) +uint8_t ibm6580_state::floppy_r(offs_t offset) { uint8_t data = 0; |