diff options
author | 2020-06-10 20:25:15 +0200 | |
---|---|---|
committer | 2020-06-10 20:25:15 +0200 | |
commit | 56861bc5bf050f0acffa7e0d907d91ebab6c1799 (patch) | |
tree | 99482228b1de56fe10f2f9d8419110e82c1562b4 /src/devices | |
parent | 736a740322ad3f056c5741fef8e1f737821944f9 (diff) |
drivers starting with g, h and i: removed read* and write* macros (nw)
Diffstat (limited to 'src/devices')
-rw-r--r-- | src/devices/bus/isa/xtide.cpp | 8 | ||||
-rw-r--r-- | src/devices/bus/isa/xtide.h | 1 | ||||
-rw-r--r-- | src/devices/machine/eeprompar.cpp | 10 | ||||
-rw-r--r-- | src/devices/machine/eeprompar.h | 10 |
4 files changed, 18 insertions, 11 deletions
diff --git a/src/devices/bus/isa/xtide.cpp b/src/devices/bus/isa/xtide.cpp index 92e7408b8ba..8de92f89f7d 100644 --- a/src/devices/bus/isa/xtide.cpp +++ b/src/devices/bus/isa/xtide.cpp @@ -109,6 +109,12 @@ void xtide_device::write(offs_t offset, uint8_t data) } } +uint8_t xtide_device::eeprom_read(offs_t offset) +{ + address_space &space = m_isa->memspace(); + + return m_eeprom->read(space, offset); +} WRITE_LINE_MEMBER(xtide_device::ide_interrupt) { @@ -323,7 +329,7 @@ void xtide_device::device_reset() int io_address = ((ioport("IO_ADDRESS")->read() & 0x0F) * 0x20) + 0x200; m_irq_number = (ioport("IRQ")->read() & 0x07); - m_isa->install_memory(base_address, base_address + 0x1fff, read8_delegate(*m_eeprom, FUNC(eeprom_parallel_28xx_device::read)), write8_delegate(*m_eeprom, FUNC(eeprom_parallel_28xx_device::write))); + m_isa->install_memory(base_address, base_address + 0x1fff, read8sm_delegate(*this, FUNC(xtide_device::eeprom_read)), write8sm_delegate(*m_eeprom, FUNC(eeprom_parallel_28xx_device::write))); m_isa->install_device(io_address, io_address + 0xf, read8sm_delegate(*this, FUNC(xtide_device::read)), write8sm_delegate(*this, FUNC(xtide_device::write))); //logerror("xtide_device::device_reset(), bios_base=0x%5X to 0x%5X, I/O=0x%3X, IRQ=%d\n",base_address,base_address + (16*1024) -1 ,io_address,irq); diff --git a/src/devices/bus/isa/xtide.h b/src/devices/bus/isa/xtide.h index b06d39d5dbb..0e713e74aaa 100644 --- a/src/devices/bus/isa/xtide.h +++ b/src/devices/bus/isa/xtide.h @@ -34,6 +34,7 @@ protected: private: DECLARE_WRITE_LINE_MEMBER(ide_interrupt); + uint8_t eeprom_read(offs_t offset); required_device<ata_interface_device> m_ata; required_device<eeprom_parallel_28xx_device> m_eeprom; diff --git a/src/devices/machine/eeprompar.cpp b/src/devices/machine/eeprompar.cpp index f0b4f595a25..3393ae91a2c 100644 --- a/src/devices/machine/eeprompar.cpp +++ b/src/devices/machine/eeprompar.cpp @@ -140,7 +140,7 @@ void eeprom_parallel_28xx_device::device_reset() // read/write - read/write handlers //------------------------------------------------- -WRITE8_MEMBER(eeprom_parallel_28xx_device::write) +void eeprom_parallel_28xx_device::write(offs_t offset, uint8_t data) { if (m_oe == 0) { @@ -157,7 +157,7 @@ WRITE8_MEMBER(eeprom_parallel_28xx_device::write) } } -READ8_MEMBER(eeprom_parallel_28xx_device::read) +uint8_t eeprom_parallel_28xx_device::read(address_space &space, offs_t offset) { if (m_oe == 1) { @@ -192,9 +192,9 @@ WRITE_LINE_MEMBER(eeprom_parallel_28xx_device::oe_w) // /OE line through external flip-flop //------------------------------------------------- -WRITE8_MEMBER(eeprom_parallel_28xx_device::unlock_write8) { oe_w(1); } -WRITE16_MEMBER(eeprom_parallel_28xx_device::unlock_write16) { oe_w(1); } -WRITE32_MEMBER(eeprom_parallel_28xx_device::unlock_write32) { oe_w(1); } +void eeprom_parallel_28xx_device::unlock_write8(uint8_t data) { oe_w(1); } +void eeprom_parallel_28xx_device::unlock_write16(uint16_t data) { oe_w(1); } +void eeprom_parallel_28xx_device::unlock_write32(uint32_t data) { oe_w(1); } //************************************************************************** diff --git a/src/devices/machine/eeprompar.h b/src/devices/machine/eeprompar.h index efee449e1b8..9399e32a349 100644 --- a/src/devices/machine/eeprompar.h +++ b/src/devices/machine/eeprompar.h @@ -33,14 +33,14 @@ public: void lock_after_write(bool lock) { m_lock_after_write = lock; } // read/write data lines - DECLARE_WRITE8_MEMBER(write); - DECLARE_READ8_MEMBER(read); + void write(offs_t offset, uint8_t data); + uint8_t read(address_space &space, offs_t offset); // control lines DECLARE_WRITE_LINE_MEMBER(oe_w); - DECLARE_WRITE8_MEMBER(unlock_write8); - DECLARE_WRITE16_MEMBER(unlock_write16); - DECLARE_WRITE32_MEMBER(unlock_write32); + void unlock_write8(uint8_t data); + void unlock_write16(uint16_t data); + void unlock_write32(uint32_t data); protected: // construction/destruction |