From 4ab50f53c26c1b76b2de1aaca3441833a090a20c Mon Sep 17 00:00:00 2001 From: angelosa Date: Mon, 23 Sep 2024 21:52:57 +0200 Subject: [PATCH] bus/bml3: standardize read/write function names --- src/devices/bus/bml3/kanji.cpp | 6 +++--- src/devices/bus/bml3/kanji.h | 4 ++-- src/devices/bus/bml3/mp1802.cpp | 8 ++++---- src/devices/bus/bml3/mp1802.h | 4 ++-- src/devices/bus/bml3/mp1805.cpp | 6 +++--- src/devices/bus/bml3/mp1805.h | 4 ++-- src/devices/bus/bml3/rtc.cpp | 6 +++--- src/devices/bus/bml3/rtc.h | 4 ++-- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/devices/bus/bml3/kanji.cpp b/src/devices/bus/bml3/kanji.cpp index ecc466b2bda..bfeef207720 100644 --- a/src/devices/bus/bml3/kanji.cpp +++ b/src/devices/bus/bml3/kanji.cpp @@ -41,12 +41,12 @@ const tiny_rom_entry *bml3bus_kanji_device::device_rom_region() const return ROM_NAME( kanji ); } -uint8_t bml3bus_kanji_device::bml3_kanji_r(offs_t offset) +uint8_t bml3bus_kanji_device::read(offs_t offset) { return m_rom[((uint32_t)m_kanji_addr << 1) + offset]; } -void bml3bus_kanji_device::bml3_kanji_w(offs_t offset, uint8_t data) +void bml3bus_kanji_device::write(offs_t offset, uint8_t data) { m_kanji_addr &= (0xff << (offset*8)); m_kanji_addr |= (data << ((offset^1)*8)); @@ -77,7 +77,7 @@ void bml3bus_kanji_device::device_start() void bml3bus_kanji_device::map_io(address_space_installer &space) { // install into memory - space.install_readwrite_handler(0xff75, 0xff76, read8sm_delegate(*this, FUNC(bml3bus_kanji_device::bml3_kanji_r)), write8sm_delegate(*this, FUNC(bml3bus_kanji_device::bml3_kanji_w))); + space.install_readwrite_handler(0xff75, 0xff76, read8sm_delegate(*this, FUNC(bml3bus_kanji_device::read)), write8sm_delegate(*this, FUNC(bml3bus_kanji_device::write))); } void bml3bus_kanji_device::device_reset() diff --git a/src/devices/bus/bml3/kanji.h b/src/devices/bus/bml3/kanji.h index d1e456508ae..57b275843e2 100644 --- a/src/devices/bus/bml3/kanji.h +++ b/src/devices/bus/bml3/kanji.h @@ -27,8 +27,8 @@ public: // construction/destruction bml3bus_kanji_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - uint8_t bml3_kanji_r(offs_t offset); - void bml3_kanji_w(offs_t offset, uint8_t data); + uint8_t read(offs_t offset); + void write(offs_t offset, uint8_t data); protected: virtual void device_start() override; diff --git a/src/devices/bus/bml3/mp1802.cpp b/src/devices/bus/bml3/mp1802.cpp index 30c39ae61d4..562a4711e6c 100644 --- a/src/devices/bus/bml3/mp1802.cpp +++ b/src/devices/bus/bml3/mp1802.cpp @@ -79,12 +79,12 @@ const tiny_rom_entry *bml3bus_mp1802_device::device_rom_region() const return ROM_NAME( mp1802 ); } -uint8_t bml3bus_mp1802_device::bml3_mp1802_r() +uint8_t bml3bus_mp1802_device::read() { return (m_fdc->drq_r() ? 0x00 : 0x80) | (m_fdc->intrq_r() ? 0x00 : 0x40); } -void bml3bus_mp1802_device::bml3_mp1802_w(uint8_t data) +void bml3bus_mp1802_device::write(uint8_t data) { floppy_image_device *floppy = m_floppy[data & 0x03]->get_device(); @@ -126,7 +126,7 @@ void bml3bus_mp1802_device::device_start() void bml3bus_mp1802_device::device_reset() { - bml3_mp1802_w(0); + write(0); } void bml3bus_mp1802_device::map_exrom(address_space_installer &space) @@ -139,5 +139,5 @@ void bml3bus_mp1802_device::map_io(address_space_installer &space) { // install into memory space.install_readwrite_handler(0xff00, 0xff03, read8sm_delegate(*m_fdc, FUNC(mb8866_device::read)), write8sm_delegate(*m_fdc, FUNC(mb8866_device::write))); - space.install_readwrite_handler(0xff04, 0xff04, read8smo_delegate(*this, FUNC(bml3bus_mp1802_device::bml3_mp1802_r)), write8smo_delegate(*this, FUNC(bml3bus_mp1802_device::bml3_mp1802_w))); + space.install_readwrite_handler(0xff04, 0xff04, read8smo_delegate(*this, FUNC(bml3bus_mp1802_device::read)), write8smo_delegate(*this, FUNC(bml3bus_mp1802_device::write))); } diff --git a/src/devices/bus/bml3/mp1802.h b/src/devices/bus/bml3/mp1802.h index ecc379261c6..adbca773f57 100644 --- a/src/devices/bus/bml3/mp1802.h +++ b/src/devices/bus/bml3/mp1802.h @@ -32,8 +32,8 @@ public: // construction/destruction bml3bus_mp1802_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - uint8_t bml3_mp1802_r(); - void bml3_mp1802_w(uint8_t data); + uint8_t read(); + void write(uint8_t data); protected: virtual void device_start() override; diff --git a/src/devices/bus/bml3/mp1805.cpp b/src/devices/bus/bml3/mp1805.cpp index a836243cb98..b360d836044 100644 --- a/src/devices/bus/bml3/mp1805.cpp +++ b/src/devices/bus/bml3/mp1805.cpp @@ -66,14 +66,14 @@ const tiny_rom_entry *bml3bus_mp1805_device::device_rom_region() const return ROM_NAME( mp1805 ); } -uint8_t bml3bus_mp1805_device::bml3_mp1805_r() +uint8_t bml3bus_mp1805_device::read() { // TODO: read supported or not? // return mc6843_drq_r(m_mc6843) ? 0x00 : 0x80; return -1; } -void bml3bus_mp1805_device::bml3_mp1805_w(uint8_t data) +void bml3bus_mp1805_device::write(uint8_t data) { // b7 b6 b5 b4 b3 b2 b1 b0 // MT ? ? ? D3 D2 D1 D0 @@ -159,5 +159,5 @@ void bml3bus_mp1805_device::map_io(address_space_installer &space) { // install into memory space.install_device(0xff18, 0xff1f, *m_mc6843, &mc6843_device::map); - space.install_readwrite_handler(0xff20, 0xff20, read8smo_delegate(*this, FUNC(bml3bus_mp1805_device::bml3_mp1805_r)), write8smo_delegate(*this, FUNC(bml3bus_mp1805_device::bml3_mp1805_w))); + space.install_readwrite_handler(0xff20, 0xff20, read8smo_delegate(*this, FUNC(bml3bus_mp1805_device::read)), write8smo_delegate(*this, FUNC(bml3bus_mp1805_device::write))); } diff --git a/src/devices/bus/bml3/mp1805.h b/src/devices/bus/bml3/mp1805.h index 3dfecc0ec22..a17f6701711 100644 --- a/src/devices/bus/bml3/mp1805.h +++ b/src/devices/bus/bml3/mp1805.h @@ -30,8 +30,8 @@ public: // construction/destruction bml3bus_mp1805_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - uint8_t bml3_mp1805_r(); - void bml3_mp1805_w(uint8_t data); + uint8_t read(); + void write(uint8_t data); protected: virtual void device_start() override; diff --git a/src/devices/bus/bml3/rtc.cpp b/src/devices/bus/bml3/rtc.cpp index 37bf5771878..eb672aaede0 100644 --- a/src/devices/bus/bml3/rtc.cpp +++ b/src/devices/bus/bml3/rtc.cpp @@ -35,7 +35,7 @@ void bml3bus_rtc_device::device_add_mconfig(machine_config &config) } -uint8_t bml3bus_rtc_device::bml3_rtc_r(offs_t offset) +uint8_t bml3bus_rtc_device::read(offs_t offset) { uint8_t data = 0x00; @@ -53,7 +53,7 @@ uint8_t bml3bus_rtc_device::bml3_rtc_r(offs_t offset) return data | 0xf0; // return low nibble only } -void bml3bus_rtc_device::bml3_rtc_w(offs_t offset, uint8_t data) +void bml3bus_rtc_device::write(offs_t offset, uint8_t data) { switch (offset) { @@ -105,5 +105,5 @@ void bml3bus_rtc_device::device_start() void bml3bus_rtc_device::map_io(address_space_installer &space) { // install into memory - space.install_readwrite_handler(0xff38, 0xff3a, read8sm_delegate(*this, FUNC(bml3bus_rtc_device::bml3_rtc_r)), write8sm_delegate(*this, FUNC(bml3bus_rtc_device::bml3_rtc_w))); + space.install_readwrite_handler(0xff38, 0xff3a, read8sm_delegate(*this, FUNC(bml3bus_rtc_device::read)), write8sm_delegate(*this, FUNC(bml3bus_rtc_device::write))); } diff --git a/src/devices/bus/bml3/rtc.h b/src/devices/bus/bml3/rtc.h index 155bce0904c..0b61a51d9b7 100644 --- a/src/devices/bus/bml3/rtc.h +++ b/src/devices/bus/bml3/rtc.h @@ -29,8 +29,8 @@ public: // construction/destruction bml3bus_rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - uint8_t bml3_rtc_r(offs_t offset); - void bml3_rtc_w(offs_t offset, uint8_t data); + uint8_t read(offs_t offset); + void write(offs_t offset, uint8_t data); protected: // device-level overrides