From 7bb325c78f39c8bcf74889b41705346667fbce7b Mon Sep 17 00:00:00 2001 From: Michael Zapf Date: Thu, 18 Jun 2020 22:43:51 +0200 Subject: ti99: Retire custom READ8Z/SETADDRESS macro. --- src/devices/bus/ti99/gromport/cartridges.cpp | 36 ++++++++++++++-------------- src/devices/bus/ti99/gromport/cartridges.h | 36 ++++++++++++++-------------- src/devices/bus/ti99/gromport/gkracker.cpp | 4 ++-- src/devices/bus/ti99/gromport/gkracker.h | 4 ++-- src/devices/bus/ti99/gromport/gromport.cpp | 4 ++-- src/devices/bus/ti99/gromport/gromport.h | 10 ++++---- src/devices/bus/ti99/gromport/multiconn.cpp | 4 ++-- src/devices/bus/ti99/gromport/multiconn.h | 4 ++-- src/devices/bus/ti99/gromport/singleconn.cpp | 4 ++-- src/devices/bus/ti99/gromport/singleconn.h | 4 ++-- src/devices/bus/ti99/internal/998board.cpp | 6 ++--- src/devices/bus/ti99/internal/998board.h | 6 ++--- src/devices/bus/ti99/internal/ioport.cpp | 6 ++--- src/devices/bus/ti99/internal/ioport.h | 12 +++++----- src/devices/bus/ti99/peb/bwg.cpp | 6 ++--- src/devices/bus/ti99/peb/bwg.h | 6 ++--- src/devices/bus/ti99/peb/cc_fdc.cpp | 6 ++--- src/devices/bus/ti99/peb/cc_fdc.h | 6 ++--- src/devices/bus/ti99/peb/evpc.cpp | 6 ++--- src/devices/bus/ti99/peb/evpc.h | 6 ++--- src/devices/bus/ti99/peb/forti.cpp | 2 +- src/devices/bus/ti99/peb/forti.h | 4 ++-- src/devices/bus/ti99/peb/hfdc.cpp | 6 ++--- src/devices/bus/ti99/peb/hfdc.h | 6 ++--- src/devices/bus/ti99/peb/horizon.cpp | 4 ++-- src/devices/bus/ti99/peb/horizon.h | 4 ++-- src/devices/bus/ti99/peb/hsgpl.cpp | 4 ++-- src/devices/bus/ti99/peb/hsgpl.h | 4 ++-- src/devices/bus/ti99/peb/memex.cpp | 2 +- src/devices/bus/ti99/peb/memex.h | 4 ++-- src/devices/bus/ti99/peb/myarcfdc.cpp | 6 ++--- src/devices/bus/ti99/peb/myarcfdc.h | 6 ++--- src/devices/bus/ti99/peb/myarcmem.cpp | 4 ++-- src/devices/bus/ti99/peb/myarcmem.h | 4 ++-- src/devices/bus/ti99/peb/pcode.cpp | 6 ++--- src/devices/bus/ti99/peb/pcode.h | 6 ++--- src/devices/bus/ti99/peb/peribox.cpp | 12 +++++----- src/devices/bus/ti99/peb/peribox.h | 18 +++++++------- src/devices/bus/ti99/peb/pgram.cpp | 6 ++--- src/devices/bus/ti99/peb/pgram.h | 8 +++---- src/devices/bus/ti99/peb/samsmem.cpp | 4 ++-- src/devices/bus/ti99/peb/samsmem.h | 4 ++-- src/devices/bus/ti99/peb/spchsyn.cpp | 4 ++-- src/devices/bus/ti99/peb/spchsyn.h | 6 ++--- src/devices/bus/ti99/peb/ti_32kmem.cpp | 2 +- src/devices/bus/ti99/peb/ti_32kmem.h | 4 ++-- src/devices/bus/ti99/peb/ti_fdc.cpp | 6 ++--- src/devices/bus/ti99/peb/ti_fdc.h | 6 ++--- src/devices/bus/ti99/peb/ti_rs232.cpp | 4 ++-- src/devices/bus/ti99/peb/ti_rs232.h | 4 ++-- src/devices/bus/ti99/peb/tn_ide.cpp | 4 ++-- src/devices/bus/ti99/peb/tn_ide.h | 4 ++-- src/devices/bus/ti99/peb/tn_usbsm.cpp | 4 ++-- src/devices/bus/ti99/peb/tn_usbsm.h | 4 ++-- src/devices/bus/ti99/ti99defs.h | 20 ---------------- 55 files changed, 176 insertions(+), 196 deletions(-) diff --git a/src/devices/bus/ti99/gromport/cartridges.cpp b/src/devices/bus/ti99/gromport/cartridges.cpp index 397522ea07f..aeb2e3e96e6 100644 --- a/src/devices/bus/ti99/gromport/cartridges.cpp +++ b/src/devices/bus/ti99/gromport/cartridges.cpp @@ -338,7 +338,7 @@ void ti99_cartridge_device::set_slot(int i) m_slot = i; } -READ8Z_MEMBER(ti99_cartridge_device::readz) +void ti99_cartridge_device::readz(offs_t offset, uint8_t *value) { if (m_pcb != nullptr) m_pcb->readz(offset, value); @@ -350,7 +350,7 @@ void ti99_cartridge_device::write(offs_t offset, uint8_t data) m_pcb->write(offset, data); } -READ8Z_MEMBER(ti99_cartridge_device::crureadz) +void ti99_cartridge_device::crureadz(offs_t offset, uint8_t *value) { if (m_pcb != nullptr) m_pcb->crureadz(offset, value); } @@ -493,7 +493,7 @@ void ti99_cartridge_pcb::gromwrite(uint8_t data) cartridges with up to 16 KiB we need a new PCB type. Unfortunately, such cartridges were never developed. */ -READ8Z_MEMBER(ti99_cartridge_pcb::readz) +void ti99_cartridge_pcb::readz(offs_t offset, uint8_t *value) { if (m_romspace_selected) { @@ -536,7 +536,7 @@ void ti99_cartridge_pcb::write(offs_t offset, uint8_t data) } } -READ8Z_MEMBER(ti99_cartridge_pcb::crureadz) +void ti99_cartridge_pcb::crureadz(offs_t offset, uint8_t *value) { } @@ -609,7 +609,7 @@ WRITE_LINE_MEMBER(ti99_cartridge_pcb::gclock_in) ******************************************************************************/ -READ8Z_MEMBER(ti99_paged12k_cartridge::readz) +void ti99_paged12k_cartridge::readz(offs_t offset, uint8_t *value) { if (m_romspace_selected) { @@ -664,7 +664,7 @@ void ti99_paged12k_cartridge::write(offs_t offset, uint8_t data) 6002 = bank 1). ******************************************************************************/ -READ8Z_MEMBER(ti99_paged16k_cartridge::readz) +void ti99_paged16k_cartridge::readz(offs_t offset, uint8_t *value) { if (m_romspace_selected) { @@ -711,7 +711,7 @@ void ti99_paged16k_cartridge::write(offs_t offset, uint8_t data) ******************************************************************************/ /* Read function for the minimem cartridge. */ -READ8Z_MEMBER(ti99_minimem_cartridge::readz) +void ti99_minimem_cartridge::readz(offs_t offset, uint8_t *value) { if (m_romspace_selected) { @@ -786,7 +786,7 @@ void ti99_minimem_cartridge::write(offs_t offset, uint8_t data) ******************************************************************************/ /* Read function for the super cartridge. */ -READ8Z_MEMBER(ti99_super_cartridge::readz) +void ti99_super_cartridge::readz(offs_t offset, uint8_t *value) { if (m_romspace_selected) { @@ -814,7 +814,7 @@ void ti99_super_cartridge::write(offs_t offset, uint8_t data) } } -READ8Z_MEMBER(ti99_super_cartridge::crureadz) +void ti99_super_cartridge::crureadz(offs_t offset, uint8_t *value) { // offset is the bit number. The CRU base address is already divided by 2. @@ -903,7 +903,7 @@ void ti99_super_cartridge::cruwrite(offs_t offset, uint8_t data) ******************************************************************************/ /* Read function for the mbx cartridge. */ -READ8Z_MEMBER(ti99_mbx_cartridge::readz) +void ti99_mbx_cartridge::readz(offs_t offset, uint8_t *value) { if (m_romspace_selected) { @@ -988,7 +988,7 @@ void ti99_mbx_cartridge::write(offs_t offset, uint8_t data) ******************************************************************************/ /* Read function for the paged7 cartridge. */ -READ8Z_MEMBER(ti99_paged7_cartridge::readz) +void ti99_paged7_cartridge::readz(offs_t offset, uint8_t *value) { if (m_romspace_selected) { @@ -1074,7 +1074,7 @@ void ti99_paged7_cartridge::write(offs_t offset, uint8_t data) ******************************************************************************/ /* Read function for the paged379i cartridge. */ -READ8Z_MEMBER(ti99_paged379i_cartridge::readz) +void ti99_paged379i_cartridge::readz(offs_t offset, uint8_t *value) { if (m_romspace_selected) *value = m_rom_ptr[(m_rom_page<<13) | (offset & 0x1fff)]; @@ -1125,7 +1125,7 @@ void ti99_paged379i_cartridge::write(offs_t offset, uint8_t data) ******************************************************************************/ /* Read function for the paged378 cartridge. */ -READ8Z_MEMBER(ti99_paged378_cartridge::readz) +void ti99_paged378_cartridge::readz(offs_t offset, uint8_t *value) { if (m_romspace_selected) *value = m_rom_ptr[(m_rom_page<<13) | (offset & 0x1fff)]; @@ -1165,7 +1165,7 @@ void ti99_paged378_cartridge::write(offs_t offset, uint8_t data) ******************************************************************************/ /* Read function for the paged377 cartridge. */ -READ8Z_MEMBER(ti99_paged377_cartridge::readz) +void ti99_paged377_cartridge::readz(offs_t offset, uint8_t *value) { if (m_romspace_selected) *value = m_rom_ptr[(m_rom_page<<13) | (offset & 0x1fff)]; @@ -1219,7 +1219,7 @@ void ti99_paged377_cartridge::write(offs_t offset, uint8_t data) ******************************************************************************/ /* Read function for the pagedcru cartridge. */ -READ8Z_MEMBER(ti99_pagedcru_cartridge::readz) +void ti99_pagedcru_cartridge::readz(offs_t offset, uint8_t *value) { if (m_romspace_selected) *value = m_rom_ptr[(m_rom_page<<13) | (offset & 0x1fff)]; @@ -1231,7 +1231,7 @@ void ti99_pagedcru_cartridge::write(offs_t offset, uint8_t data) return; } -READ8Z_MEMBER(ti99_pagedcru_cartridge::crureadz) +void ti99_pagedcru_cartridge::crureadz(offs_t offset, uint8_t *value) { int page = m_rom_page; if ((offset & 0xf800)==0x0800) @@ -1313,7 +1313,7 @@ void ti99_gromemu_cartridge::set_gromlines(line_state mline, line_state moline, } } -READ8Z_MEMBER(ti99_gromemu_cartridge::readz) +void ti99_gromemu_cartridge::readz(offs_t offset, uint8_t *value) { if (m_grom_selected) { @@ -1363,7 +1363,7 @@ void ti99_gromemu_cartridge::write(offs_t offset, uint8_t data) } } -READ8Z_MEMBER(ti99_gromemu_cartridge::gromemureadz) +void ti99_gromemu_cartridge::gromemureadz(offs_t offset, uint8_t *value) { // Similar to the GKracker implemented above, we do not have a readable // GROM address counter but use the one from the console GROMs. diff --git a/src/devices/bus/ti99/gromport/cartridges.h b/src/devices/bus/ti99/gromport/cartridges.h index 3fc3afebf26..3ba843de550 100644 --- a/src/devices/bus/ti99/gromport/cartridges.h +++ b/src/devices/bus/ti99/gromport/cartridges.h @@ -65,9 +65,9 @@ class ti99_cartridge_device : public device_t, public device_image_interface public: ti99_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8Z_MEMBER(readz); + void readz(offs_t offset, uint8_t *value); void write(offs_t offset, uint8_t data); - DECLARE_READ8Z_MEMBER(crureadz); + void crureadz(offs_t offset, uint8_t *value); void cruwrite(offs_t offset, uint8_t data); DECLARE_WRITE_LINE_MEMBER(ready_line); @@ -212,9 +212,9 @@ public: virtual ~ti99_cartridge_pcb() { } protected: - virtual DECLARE_READ8Z_MEMBER(readz); + virtual void readz(offs_t offset, uint8_t *value); virtual void write(offs_t offset, uint8_t data); - virtual DECLARE_READ8Z_MEMBER(crureadz); + virtual void crureadz(offs_t offset, uint8_t *value); virtual void cruwrite(offs_t offset, uint8_t data); DECLARE_WRITE_LINE_MEMBER(romgq_line); @@ -262,7 +262,7 @@ public: class ti99_paged12k_cartridge : public ti99_cartridge_pcb { public: - DECLARE_READ8Z_MEMBER(readz) override; + void readz(offs_t offset, uint8_t *value) override; void write(offs_t offset, uint8_t data) override; }; @@ -271,7 +271,7 @@ public: class ti99_paged16k_cartridge : public ti99_cartridge_pcb { public: - DECLARE_READ8Z_MEMBER(readz) override; + void readz(offs_t offset, uint8_t *value) override; void write(offs_t offset, uint8_t data) override; }; @@ -280,7 +280,7 @@ public: class ti99_paged7_cartridge : public ti99_cartridge_pcb { public: - DECLARE_READ8Z_MEMBER(readz) override; + void readz(offs_t offset, uint8_t *value) override; void write(offs_t offset, uint8_t data) override; }; @@ -289,7 +289,7 @@ public: class ti99_minimem_cartridge : public ti99_cartridge_pcb { public: - DECLARE_READ8Z_MEMBER(readz) override; + void readz(offs_t offset, uint8_t *value) override; void write(offs_t offset, uint8_t data) override; }; @@ -298,9 +298,9 @@ public: class ti99_super_cartridge : public ti99_cartridge_pcb { public: - DECLARE_READ8Z_MEMBER(readz) override; + void readz(offs_t offset, uint8_t *value) override; void write(offs_t offset, uint8_t data) override; - DECLARE_READ8Z_MEMBER(crureadz) override; + void crureadz(offs_t offset, uint8_t *value) override; void cruwrite(offs_t offset, uint8_t data) override; }; @@ -309,7 +309,7 @@ public: class ti99_mbx_cartridge : public ti99_cartridge_pcb { public: - DECLARE_READ8Z_MEMBER(readz) override; + void readz(offs_t offset, uint8_t *value) override; void write(offs_t offset, uint8_t data) override; }; @@ -318,7 +318,7 @@ public: class ti99_paged379i_cartridge : public ti99_cartridge_pcb { public: - DECLARE_READ8Z_MEMBER(readz) override; + void readz(offs_t offset, uint8_t *value) override; void write(offs_t offset, uint8_t data) override; private: int get_paged379i_bank(int rompage); @@ -329,7 +329,7 @@ private: class ti99_paged378_cartridge : public ti99_cartridge_pcb { public: - DECLARE_READ8Z_MEMBER(readz) override; + void readz(offs_t offset, uint8_t *value) override; void write(offs_t offset, uint8_t data) override; }; @@ -338,7 +338,7 @@ public: class ti99_paged377_cartridge : public ti99_cartridge_pcb { public: - DECLARE_READ8Z_MEMBER(readz) override; + void readz(offs_t offset, uint8_t *value) override; void write(offs_t offset, uint8_t data) override; }; @@ -347,9 +347,9 @@ public: class ti99_pagedcru_cartridge : public ti99_cartridge_pcb { public: - DECLARE_READ8Z_MEMBER(readz) override; + void readz(offs_t offset, uint8_t *value) override; void write(offs_t offset, uint8_t data) override; - DECLARE_READ8Z_MEMBER(crureadz) override; + void crureadz(offs_t offset, uint8_t *value) override; void cruwrite(offs_t offset, uint8_t data) override; }; @@ -360,9 +360,9 @@ class ti99_gromemu_cartridge : public ti99_cartridge_pcb public: ti99_gromemu_cartridge(): m_waddr_LSB(false), m_grom_selected(false), m_grom_read_mode(false), m_grom_address_mode(false) { m_grom_address = 0; } - DECLARE_READ8Z_MEMBER(readz) override; + void readz(offs_t offset, uint8_t *value) override; void write(offs_t offset, uint8_t data) override; - DECLARE_READ8Z_MEMBER(gromemureadz); + void gromemureadz(offs_t offset, uint8_t *value); void gromemuwrite(offs_t offset, uint8_t data); void set_gromlines(line_state mline, line_state moline, line_state gsq) override; diff --git a/src/devices/bus/ti99/gromport/gkracker.cpp b/src/devices/bus/ti99/gromport/gkracker.cpp index 7010b1f34ec..65125f247db 100644 --- a/src/devices/bus/ti99/gromport/gkracker.cpp +++ b/src/devices/bus/ti99/gromport/gkracker.cpp @@ -174,7 +174,7 @@ bool ti99_gkracker_device::is_grom_idle() return (m_cartridge != nullptr)? m_cartridge->is_grom_idle() : false; } -READ8Z_MEMBER(ti99_gkracker_device::readz) +void ti99_gkracker_device::readz(offs_t offset, uint8_t *value) { if (m_grom_selected) { @@ -305,7 +305,7 @@ void ti99_gkracker_device::write(offs_t offset, uint8_t data) } } -READ8Z_MEMBER( ti99_gkracker_device::crureadz ) +void ti99_gkracker_device::crureadz(offs_t offset, uint8_t *value) { if (m_cartridge != nullptr) m_cartridge->crureadz(offset, value); } diff --git a/src/devices/bus/ti99/gromport/gkracker.h b/src/devices/bus/ti99/gromport/gkracker.h index 34b267bf640..042ea978bd7 100644 --- a/src/devices/bus/ti99/gromport/gkracker.h +++ b/src/devices/bus/ti99/gromport/gkracker.h @@ -18,9 +18,9 @@ class ti99_gkracker_device : public cartridge_connector_device, public device_nv public: ti99_gkracker_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8Z_MEMBER(readz) override; + void readz(offs_t offset, uint8_t *value) override; void write(offs_t offset, uint8_t data) override; - DECLARE_READ8Z_MEMBER(crureadz) override; + void crureadz(offs_t offset, uint8_t *value) override; void cruwrite(offs_t offset, uint8_t data) override; DECLARE_WRITE_LINE_MEMBER(romgq_line) override; diff --git a/src/devices/bus/ti99/gromport/gromport.cpp b/src/devices/bus/ti99/gromport/gromport.cpp index 5f893aa4423..65c6f15d284 100644 --- a/src/devices/bus/ti99/gromport/gromport.cpp +++ b/src/devices/bus/ti99/gromport/gromport.cpp @@ -139,7 +139,7 @@ gromport_device::gromport_device(const machine_config &mconfig, const char *tag, Reading via the GROM port. Only 13 address lines are passed through on the TI-99/4A, and 14 lines on the TI-99/8. */ -READ8Z_MEMBER(gromport_device::readz) +void gromport_device::readz(offs_t offset, uint8_t *value) { if (m_connector != nullptr) { @@ -161,7 +161,7 @@ void gromport_device::write(offs_t offset, uint8_t data) } } -READ8Z_MEMBER(gromport_device::crureadz) +void gromport_device::crureadz(offs_t offset, uint8_t *value) { if (m_connector != nullptr) m_connector->crureadz(offset, value); diff --git a/src/devices/bus/ti99/gromport/gromport.h b/src/devices/bus/ti99/gromport/gromport.h index 9c04ef5a8b8..e74c7e16e29 100644 --- a/src/devices/bus/ti99/gromport/gromport.h +++ b/src/devices/bus/ti99/gromport/gromport.h @@ -40,9 +40,9 @@ public: gromport_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8Z_MEMBER(readz); + void readz(offs_t offset, uint8_t *value); void write(offs_t offset, uint8_t data); - DECLARE_READ8Z_MEMBER(crureadz); + void crureadz(offs_t offset, uint8_t *value); void cruwrite(offs_t offset, uint8_t data); DECLARE_WRITE_LINE_MEMBER(ready_line); DECLARE_WRITE_LINE_MEMBER(romgq_line); @@ -76,11 +76,11 @@ private: class cartridge_connector_device : public device_t { public: - virtual DECLARE_READ8Z_MEMBER(readz) = 0; + virtual void readz(offs_t offset, uint8_t *value) = 0; virtual void write(offs_t offset, uint8_t data) = 0; - virtual DECLARE_SETADDRESS_DBIN_MEMBER( setaddress_dbin ) { } + virtual void setaddress_dbin(offs_t offset, int state) { } - virtual DECLARE_READ8Z_MEMBER(crureadz) = 0; + virtual void crureadz(offs_t offset, uint8_t *value) = 0; virtual void cruwrite(offs_t offset, uint8_t data) = 0; virtual DECLARE_WRITE_LINE_MEMBER(romgq_line) = 0; diff --git a/src/devices/bus/ti99/gromport/multiconn.cpp b/src/devices/bus/ti99/gromport/multiconn.cpp index ad7e3e2311f..0ccd432a62a 100644 --- a/src/devices/bus/ti99/gromport/multiconn.cpp +++ b/src/devices/bus/ti99/gromport/multiconn.cpp @@ -181,7 +181,7 @@ WRITE_LINE_MEMBER(ti99_multi_cart_conn_device::gclock_in) } } -READ8Z_MEMBER(ti99_multi_cart_conn_device::readz) +void ti99_multi_cart_conn_device::readz(offs_t offset, uint8_t *value) { int slot = get_active_slot(true, offset); @@ -237,7 +237,7 @@ void ti99_multi_cart_conn_device::write(offs_t offset, uint8_t data) } } -READ8Z_MEMBER(ti99_multi_cart_conn_device::crureadz) +void ti99_multi_cart_conn_device::crureadz(offs_t offset, uint8_t *value) { int slot = get_active_slot(false, offset); /* Sanity check. Higher slots are always empty. */ diff --git a/src/devices/bus/ti99/gromport/multiconn.h b/src/devices/bus/ti99/gromport/multiconn.h index 56a5915cfb2..0f32367eacf 100644 --- a/src/devices/bus/ti99/gromport/multiconn.h +++ b/src/devices/bus/ti99/gromport/multiconn.h @@ -23,9 +23,9 @@ class ti99_multi_cart_conn_device : public cartridge_connector_device public: ti99_multi_cart_conn_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8Z_MEMBER(readz) override; + void readz(offs_t offset, uint8_t *value) override; void write(offs_t offset, uint8_t data) override; - DECLARE_READ8Z_MEMBER(crureadz) override; + void crureadz(offs_t offset, uint8_t *value) override; void cruwrite(offs_t offset, uint8_t data) override; DECLARE_WRITE_LINE_MEMBER(romgq_line) override; void set_gromlines(line_state mline, line_state moline, line_state gsq) override; diff --git a/src/devices/bus/ti99/gromport/singleconn.cpp b/src/devices/bus/ti99/gromport/singleconn.cpp index 9a0b905a9e7..c2b04558c3a 100644 --- a/src/devices/bus/ti99/gromport/singleconn.cpp +++ b/src/devices/bus/ti99/gromport/singleconn.cpp @@ -19,7 +19,7 @@ ti99_single_cart_conn_device::ti99_single_cart_conn_device(const machine_config { } -READ8Z_MEMBER(ti99_single_cart_conn_device::readz) +void ti99_single_cart_conn_device::readz(offs_t offset, uint8_t *value) { // Pass through m_cartridge->readz(offset, value); @@ -31,7 +31,7 @@ void ti99_single_cart_conn_device::write(offs_t offset, uint8_t data) m_cartridge->write(offset, data); } -READ8Z_MEMBER(ti99_single_cart_conn_device::crureadz) +void ti99_single_cart_conn_device::crureadz(offs_t offset, uint8_t *value) { // Pass through m_cartridge->crureadz(offset, value); diff --git a/src/devices/bus/ti99/gromport/singleconn.h b/src/devices/bus/ti99/gromport/singleconn.h index 831d70ffb18..2c29a10291e 100644 --- a/src/devices/bus/ti99/gromport/singleconn.h +++ b/src/devices/bus/ti99/gromport/singleconn.h @@ -19,9 +19,9 @@ class ti99_single_cart_conn_device : public cartridge_connector_device public: ti99_single_cart_conn_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8Z_MEMBER(readz) override; + void readz(offs_t offset, uint8_t *value) override; void write(offs_t offset, uint8_t data) override; - DECLARE_READ8Z_MEMBER(crureadz) override; + void crureadz(offs_t offset, uint8_t *value) override; void cruwrite(offs_t offset, uint8_t data) override; DECLARE_WRITE_LINE_MEMBER(romgq_line) override; void set_gromlines(line_state mline, line_state moline, line_state gsq) override; diff --git a/src/devices/bus/ti99/internal/998board.cpp b/src/devices/bus/ti99/internal/998board.cpp index 0199742329a..9c368367962 100644 --- a/src/devices/bus/ti99/internal/998board.cpp +++ b/src/devices/bus/ti99/internal/998board.cpp @@ -351,7 +351,7 @@ void mainboard8_device::debugger_write(offs_t offset, uint8_t data) // =============== CRU bus access ================== -READ8Z_MEMBER(mainboard8_device::crureadz) +void mainboard8_device::crureadz(offs_t offset, uint8_t *value) { m_ioport->crureadz(offset, value); } @@ -1153,7 +1153,7 @@ vaquerro_device::vaquerro_device(const machine_config &mconfig, const char *tag, { } -SETADDRESS_DBIN_MEMBER( vaquerro_device::set_address ) +void vaquerro_device::set_address(offs_t offset, int state) { // Do the decoding // state = dbin, offset = address @@ -1602,7 +1602,7 @@ mofetta_device::mofetta_device(const machine_config &mconfig, const char *tag, d { } -SETADDRESS_DBIN_MEMBER( mofetta_device::set_address ) +void mofetta_device::set_address(offs_t offset, int state) { if (!m_gotfirstword) { diff --git a/src/devices/bus/ti99/internal/998board.h b/src/devices/bus/ti99/internal/998board.h index b443275c3f7..45b975c19cf 100644 --- a/src/devices/bus/ti99/internal/998board.h +++ b/src/devices/bus/ti99/internal/998board.h @@ -101,7 +101,7 @@ public: line_state ready(); void treset(); - DECLARE_SETADDRESS_DBIN_MEMBER( set_address ); + void set_address(offs_t offset, int state); DECLARE_READ_LINE_MEMBER( sprd_out ); DECLARE_READ_LINE_MEMBER( spwt_out ); @@ -248,7 +248,7 @@ public: void device_reset() override; void cruwrite(offs_t offset, uint8_t data); - DECLARE_SETADDRESS_DBIN_MEMBER( set_address ); + void set_address(offs_t offset, int state); // Debugger support bool hexbus_access_debug(); @@ -548,7 +548,7 @@ public: void debugger_write(offs_t offset, uint8_t data); // I/O space - DECLARE_READ8Z_MEMBER( crureadz ); + void crureadz(offs_t offset, uint8_t *value); void cruwrite(offs_t offset, uint8_t data); // Control lines diff --git a/src/devices/bus/ti99/internal/ioport.cpp b/src/devices/bus/ti99/internal/ioport.cpp index 5faaee0a9a6..db72623116a 100644 --- a/src/devices/bus/ti99/internal/ioport.cpp +++ b/src/devices/bus/ti99/internal/ioport.cpp @@ -93,7 +93,7 @@ ioport_device::ioport_device(const machine_config &mconfig, const char *tag, dev { } -READ8Z_MEMBER(ioport_device::readz) +void ioport_device::readz(offs_t offset, uint8_t *value) { if (m_connected != nullptr) m_connected->readz(offset, value); @@ -105,13 +105,13 @@ void ioport_device::write(offs_t offset, uint8_t data) m_connected->write(offset, data); } -SETADDRESS_DBIN_MEMBER(ioport_device::setaddress_dbin) +void ioport_device::setaddress_dbin(offs_t offset, int state) { if (m_connected != nullptr) m_connected->setaddress_dbin(offset, state); } -READ8Z_MEMBER(ioport_device::crureadz) +void ioport_device::crureadz(offs_t offset, uint8_t *value) { if (m_connected != nullptr) m_connected->crureadz(offset, value); diff --git a/src/devices/bus/ti99/internal/ioport.h b/src/devices/bus/ti99/internal/ioport.h index 75033c467bb..33964971c5c 100644 --- a/src/devices/bus/ti99/internal/ioport.h +++ b/src/devices/bus/ti99/internal/ioport.h @@ -29,10 +29,10 @@ public: { } // Methods called from the console / ioport - virtual DECLARE_READ8Z_MEMBER( readz ) { } + virtual void readz(offs_t offset, uint8_t *value) { } virtual void write(offs_t offset, uint8_t data) { } - virtual DECLARE_SETADDRESS_DBIN_MEMBER( setaddress_dbin ) { } - virtual DECLARE_READ8Z_MEMBER( crureadz ) { } + virtual void setaddress_dbin(offs_t offset, int state) { } + virtual void crureadz(offs_t offset, uint8_t *value) { } virtual void cruwrite(offs_t offset, uint8_t data) { } virtual DECLARE_WRITE_LINE_MEMBER( memen_in ) { } virtual DECLARE_WRITE_LINE_MEMBER( msast_in ) { } @@ -71,10 +71,10 @@ public: ioport_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // Methods called from the console - DECLARE_READ8Z_MEMBER( readz ); + void readz(offs_t offset, uint8_t *value); void write(offs_t offset, uint8_t data); - DECLARE_SETADDRESS_DBIN_MEMBER( setaddress_dbin ); - DECLARE_READ8Z_MEMBER( crureadz ); + void setaddress_dbin(offs_t offset, int state); + void crureadz(offs_t offset, uint8_t *value); void cruwrite(offs_t offset, uint8_t data); DECLARE_WRITE_LINE_MEMBER( memen_in ); DECLARE_WRITE_LINE_MEMBER( msast_in ); diff --git a/src/devices/bus/ti99/peb/bwg.cpp b/src/devices/bus/ti99/peb/bwg.cpp index 1a18ac66918..055e926aec2 100644 --- a/src/devices/bus/ti99/peb/bwg.cpp +++ b/src/devices/bus/ti99/peb/bwg.cpp @@ -141,7 +141,7 @@ WRITE_LINE_MEMBER( snug_bwg_device::fdc_drq_w ) operate_ready_line(); } -SETADDRESS_DBIN_MEMBER( snug_bwg_device::setaddress_dbin ) +void snug_bwg_device::setaddress_dbin(offs_t offset, int state) { // Do not allow setaddress for debugger if (machine().side_effects_disabled()) return; @@ -221,7 +221,7 @@ void snug_bwg_device::debug_write(offs_t offset, uint8_t data) Read a byte from ROM, RAM, FDC, or RTC. See setaddress_dbin for selection logic. */ -READ8Z_MEMBER(snug_bwg_device::readz) +void snug_bwg_device::readz(offs_t offset, uint8_t *value) { if (machine().side_effects_disabled()) { @@ -346,7 +346,7 @@ void snug_bwg_device::write(offs_t offset, uint8_t data) bit 6: Dip 3 bit 7: Dip 4 */ -READ8Z_MEMBER(snug_bwg_device::crureadz) +void snug_bwg_device::crureadz(offs_t offset, uint8_t *value) { uint8_t reply; diff --git a/src/devices/bus/ti99/peb/bwg.h b/src/devices/bus/ti99/peb/bwg.h index 93c484aeb50..10df3695151 100644 --- a/src/devices/bus/ti99/peb/bwg.h +++ b/src/devices/bus/ti99/peb/bwg.h @@ -31,11 +31,11 @@ class snug_bwg_device : public device_t, public device_ti99_peribox_card_interfa public: snug_bwg_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8Z_MEMBER(readz) override; + void readz(offs_t offset, uint8_t *value) override; void write(offs_t offset, uint8_t data) override; - DECLARE_SETADDRESS_DBIN_MEMBER(setaddress_dbin) override; + void setaddress_dbin(offs_t offset, int state) override; - DECLARE_READ8Z_MEMBER(crureadz) override; + void crureadz(offs_t offset, uint8_t *value) override; void cruwrite(offs_t offset, uint8_t data) override; protected: diff --git a/src/devices/bus/ti99/peb/cc_fdc.cpp b/src/devices/bus/ti99/peb/cc_fdc.cpp index e9f663e48aa..9ef1f1531d9 100644 --- a/src/devices/bus/ti99/peb/cc_fdc.cpp +++ b/src/devices/bus/ti99/peb/cc_fdc.cpp @@ -90,7 +90,7 @@ corcomp_fdc_device::corcomp_fdc_device(const machine_config &mconfig, device_typ { } -SETADDRESS_DBIN_MEMBER( corcomp_fdc_device::setaddress_dbin ) +void corcomp_fdc_device::setaddress_dbin(offs_t offset, int state) { // Do not allow setaddress for debugger if (machine().side_effects_disabled()) return; @@ -194,7 +194,7 @@ WRITE_LINE_MEMBER( corcomp_fdc_device::fdc_hld_w ) LOGMASKED(LOG_SIGNALS, "HLD callback = %d\n", state); } -READ8Z_MEMBER(corcomp_fdc_device::readz) +void corcomp_fdc_device::readz(offs_t offset, uint8_t *value) { if (machine().side_effects_disabled()) { @@ -253,7 +253,7 @@ void corcomp_fdc_device::write(offs_t offset, uint8_t data) } } -READ8Z_MEMBER( corcomp_fdc_device::crureadz ) +void corcomp_fdc_device::crureadz(offs_t offset, uint8_t *value) { m_address = offset; // Copy the CRU address on the address variable if (m_decpal->address9901()) diff --git a/src/devices/bus/ti99/peb/cc_fdc.h b/src/devices/bus/ti99/peb/cc_fdc.h index 2fb3d806af7..db945a2387e 100644 --- a/src/devices/bus/ti99/peb/cc_fdc.h +++ b/src/devices/bus/ti99/peb/cc_fdc.h @@ -38,11 +38,11 @@ class corcomp_fdc_device : public device_t, public device_ti99_peribox_card_inte friend class ccfdc_palu12_device; public: - DECLARE_READ8Z_MEMBER(readz) override; + void readz(offs_t offset, uint8_t *value) override; void write(offs_t offset, uint8_t data) override; - DECLARE_SETADDRESS_DBIN_MEMBER(setaddress_dbin) override; + void setaddress_dbin(offs_t offset, int state) override; - DECLARE_READ8Z_MEMBER(crureadz) override; + void crureadz(offs_t offset, uint8_t *value) override; void cruwrite(offs_t offset, uint8_t data) override; DECLARE_WRITE_LINE_MEMBER(clock_in) override; diff --git a/src/devices/bus/ti99/peb/evpc.cpp b/src/devices/bus/ti99/peb/evpc.cpp index 298b1c6432c..7bb16f32647 100644 --- a/src/devices/bus/ti99/peb/evpc.cpp +++ b/src/devices/bus/ti99/peb/evpc.cpp @@ -79,7 +79,7 @@ snug_enhanced_video_device::snug_enhanced_video_device(const machine_config &mco { } -SETADDRESS_DBIN_MEMBER( snug_enhanced_video_device::setaddress_dbin ) +void snug_enhanced_video_device::setaddress_dbin(offs_t offset, int state) { // Do not allow setaddress for the debugger. It will mess up the // setaddress/memory access pairs when the CPU enters wait states. @@ -149,7 +149,7 @@ void snug_enhanced_video_device::nvram_write(emu_file &file) 0x5f00 - 0x5fef NOVRAM 0x5ff0 - 0x5fff Palette (5ff0, 5ff2, 5ff4, 5ff6) */ -READ8Z_MEMBER(snug_enhanced_video_device::readz) +void snug_enhanced_video_device::readz(offs_t offset, uint8_t *value) { if (m_selected && m_inDsrArea) { @@ -320,7 +320,7 @@ void snug_enhanced_video_device::write(offs_t offset, uint8_t data) 7: DIP or NOVRAM Logic is inverted */ -READ8Z_MEMBER(snug_enhanced_video_device::crureadz) +void snug_enhanced_video_device::crureadz(offs_t offset, uint8_t *value) { if ((offset & 0xff00)==EVPC_CRU_BASE) { diff --git a/src/devices/bus/ti99/peb/evpc.h b/src/devices/bus/ti99/peb/evpc.h index 05925d3c5e8..0181782d704 100644 --- a/src/devices/bus/ti99/peb/evpc.h +++ b/src/devices/bus/ti99/peb/evpc.h @@ -31,11 +31,11 @@ class snug_enhanced_video_device : public device_t, public device_ti99_peribox_c { public: snug_enhanced_video_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8Z_MEMBER(readz) override; + void readz(offs_t offset, uint8_t *value) override; void write(offs_t offset, uint8_t data) override; - DECLARE_SETADDRESS_DBIN_MEMBER(setaddress_dbin) override; + void setaddress_dbin(offs_t offset, int state) override; - DECLARE_READ8Z_MEMBER(crureadz) override; + void crureadz(offs_t offset, uint8_t *value) override; void cruwrite(offs_t offset, uint8_t data) override; TIMER_DEVICE_CALLBACK_MEMBER( hblank_interrupt ); diff --git a/src/devices/bus/ti99/peb/forti.cpp b/src/devices/bus/ti99/peb/forti.cpp index d91cc2b2149..0206e863a94 100644 --- a/src/devices/bus/ti99/peb/forti.cpp +++ b/src/devices/bus/ti99/peb/forti.cpp @@ -58,7 +58,7 @@ forti_device::forti_device(const machine_config &mconfig, const char *tag, devic /* No read access. The FORTi card does not support any reading. */ -READ8Z_MEMBER(forti_device::readz) +void forti_device::readz(offs_t offset, uint8_t *value) { return; } diff --git a/src/devices/bus/ti99/peb/forti.h b/src/devices/bus/ti99/peb/forti.h index 46c812a7c00..5c70bd45117 100644 --- a/src/devices/bus/ti99/peb/forti.h +++ b/src/devices/bus/ti99/peb/forti.h @@ -27,8 +27,8 @@ class forti_device : public device_t, public device_ti99_peribox_card_interface public: forti_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); void write(offs_t offset, uint8_t data) override; - DECLARE_READ8Z_MEMBER(readz) override; - DECLARE_READ8Z_MEMBER(crureadz) override { }; + void readz(offs_t offset, uint8_t *value) override; + void crureadz(offs_t offset, uint8_t *value) override { }; void cruwrite(offs_t offset, uint8_t data) override { }; DECLARE_WRITE_LINE_MEMBER( ready_sound ); diff --git a/src/devices/bus/ti99/peb/hfdc.cpp b/src/devices/bus/ti99/peb/hfdc.cpp index ac418f30256..8659e111d69 100644 --- a/src/devices/bus/ti99/peb/hfdc.cpp +++ b/src/devices/bus/ti99/peb/hfdc.cpp @@ -111,7 +111,7 @@ myarc_hfdc_device::myarc_hfdc_device(const machine_config &mconfig, const char * { } -SETADDRESS_DBIN_MEMBER( myarc_hfdc_device::setaddress_dbin ) +void myarc_hfdc_device::setaddress_dbin(offs_t offset, int state) { // Do not allow setaddress for the debugger. It will mess up the // setaddress/memory access pairs when the CPU enters wait states. @@ -205,7 +205,7 @@ void myarc_hfdc_device::debug_write(offs_t offset, uint8_t data) HFDC manual, p. 44 */ -READ8Z_MEMBER(myarc_hfdc_device::readz) +void myarc_hfdc_device::readz(offs_t offset, uint8_t *value) { if (machine().side_effects_disabled()) { @@ -371,7 +371,7 @@ void myarc_hfdc_device::write(offs_t offset, uint8_t data) --- 0 on all other locations */ -READ8Z_MEMBER(myarc_hfdc_device::crureadz) +void myarc_hfdc_device::crureadz(offs_t offset, uint8_t *value) { uint8_t reply; if ((offset & 0xff00)==m_cru_base) diff --git a/src/devices/bus/ti99/peb/hfdc.h b/src/devices/bus/ti99/peb/hfdc.h index 88648105eb5..84e42a07e05 100644 --- a/src/devices/bus/ti99/peb/hfdc.h +++ b/src/devices/bus/ti99/peb/hfdc.h @@ -37,10 +37,10 @@ class myarc_hfdc_device : public device_t, public device_ti99_peribox_card_inter public: myarc_hfdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8Z_MEMBER(readz) override; + void readz(offs_t offset, uint8_t *value) override; void write(offs_t offset, uint8_t data) override; - DECLARE_SETADDRESS_DBIN_MEMBER(setaddress_dbin) override; - DECLARE_READ8Z_MEMBER(crureadz) override; + void setaddress_dbin(offs_t offset, int state) override; + void crureadz(offs_t offset, uint8_t *value) override; void cruwrite(offs_t offset, uint8_t data) override; protected: diff --git a/src/devices/bus/ti99/peb/horizon.cpp b/src/devices/bus/ti99/peb/horizon.cpp index 0ed6d0fff03..6da8483a046 100644 --- a/src/devices/bus/ti99/peb/horizon.cpp +++ b/src/devices/bus/ti99/peb/horizon.cpp @@ -157,7 +157,7 @@ void horizon_ramdisk_device::nvram_write(emu_file &file) file.write(buffer, nvramsize + ROSSIZE); } -READ8Z_MEMBER(horizon_ramdisk_device::readz) +void horizon_ramdisk_device::readz(offs_t offset, uint8_t *value) { // 32K expansion // According to the manual, "this memory is not affected by the HIDE switch" @@ -289,7 +289,7 @@ void horizon_ramdisk_device::write(offs_t offset, uint8_t data) } } -READ8Z_MEMBER(horizon_ramdisk_device::crureadz) +void horizon_ramdisk_device::crureadz(offs_t offset, uint8_t *value) { // There is no CRU read operation for the Horizon. return; diff --git a/src/devices/bus/ti99/peb/horizon.h b/src/devices/bus/ti99/peb/horizon.h index 234dd68028a..d284e1ffbcb 100644 --- a/src/devices/bus/ti99/peb/horizon.h +++ b/src/devices/bus/ti99/peb/horizon.h @@ -25,10 +25,10 @@ class horizon_ramdisk_device : public device_t, public device_ti99_peribox_card_ { public: horizon_ramdisk_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8Z_MEMBER(readz) override; + void readz(offs_t offset, uint8_t *value) override; void write(offs_t offset, uint8_t data) override; - DECLARE_READ8Z_MEMBER(crureadz) override; + void crureadz(offs_t offset, uint8_t *value) override; void cruwrite(offs_t offset, uint8_t data) override; DECLARE_INPUT_CHANGED_MEMBER( hs_changed ); diff --git a/src/devices/bus/ti99/peb/hsgpl.cpp b/src/devices/bus/ti99/peb/hsgpl.cpp index 11f40c4d1c8..9ac2a30bd83 100644 --- a/src/devices/bus/ti99/peb/hsgpl.cpp +++ b/src/devices/bus/ti99/peb/hsgpl.cpp @@ -183,7 +183,7 @@ snug_high_speed_gpl_device::snug_high_speed_gpl_device(const machine_config &mco /* Read hsgpl CRU interface. None here. */ -READ8Z_MEMBER(snug_high_speed_gpl_device::crureadz) +void snug_high_speed_gpl_device::crureadz(offs_t offset, uint8_t *value) { return; } @@ -268,7 +268,7 @@ void snug_high_speed_gpl_device::cruwrite(offs_t offset, uint8_t data) /* Memory read */ -READ8Z_MEMBER(snug_high_speed_gpl_device::readz) +void snug_high_speed_gpl_device::readz(offs_t offset, uint8_t *value) { if ((offset & 0x7e000)==0x74000) { diff --git a/src/devices/bus/ti99/peb/hsgpl.h b/src/devices/bus/ti99/peb/hsgpl.h index 7248436963f..a27c4a55205 100644 --- a/src/devices/bus/ti99/peb/hsgpl.h +++ b/src/devices/bus/ti99/peb/hsgpl.h @@ -28,10 +28,10 @@ class snug_high_speed_gpl_device : public device_t, public device_ti99_peribox_c { public: snug_high_speed_gpl_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8Z_MEMBER(readz) override; + void readz(offs_t offset, uint8_t *value) override; void write(offs_t offset, uint8_t data) override; - DECLARE_READ8Z_MEMBER(crureadz) override; + void crureadz(offs_t offset, uint8_t *value) override; void cruwrite(offs_t offset, uint8_t data) override; protected: diff --git a/src/devices/bus/ti99/peb/memex.cpp b/src/devices/bus/ti99/peb/memex.cpp index 49d41bba4ec..7206d2ccee3 100644 --- a/src/devices/bus/ti99/peb/memex.cpp +++ b/src/devices/bus/ti99/peb/memex.cpp @@ -99,7 +99,7 @@ bool geneve_memex_device::access_enabled(offs_t offset) Note that the incomplete decoding of the standard Geneve must be considered. */ -READ8Z_MEMBER( geneve_memex_device::readz ) +void geneve_memex_device::readz(offs_t offset, uint8_t *value) { /* If not Genmod, add the upper two address bits 10 */ // if (!m_genmod) offset |= 0x100000; diff --git a/src/devices/bus/ti99/peb/memex.h b/src/devices/bus/ti99/peb/memex.h index fb7ca27a1ad..7e13895f476 100644 --- a/src/devices/bus/ti99/peb/memex.h +++ b/src/devices/bus/ti99/peb/memex.h @@ -25,10 +25,10 @@ class geneve_memex_device : public device_t, public device_ti99_peribox_card_int { public: geneve_memex_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8Z_MEMBER(readz) override; + void readz(offs_t offset, uint8_t *value) override; void write(offs_t offset, uint8_t data) override; - DECLARE_READ8Z_MEMBER(crureadz) override { } + void crureadz(offs_t offset, uint8_t *value) override { } void cruwrite(offs_t offset, uint8_t data) override { } protected: diff --git a/src/devices/bus/ti99/peb/myarcfdc.cpp b/src/devices/bus/ti99/peb/myarcfdc.cpp index 2ded1740439..dde010e99a3 100644 --- a/src/devices/bus/ti99/peb/myarcfdc.cpp +++ b/src/devices/bus/ti99/peb/myarcfdc.cpp @@ -70,7 +70,7 @@ myarc_fdc_device::myarc_fdc_device(const machine_config &mconfig, const char *ta m_address(0) { } -SETADDRESS_DBIN_MEMBER( myarc_fdc_device::setaddress_dbin ) +void myarc_fdc_device::setaddress_dbin(offs_t offset, int state) { // Do not allow setaddress for debugger if (machine().side_effects_disabled()) return; @@ -127,7 +127,7 @@ void myarc_fdc_device::debug_write(offs_t offset, uint8_t data) /* Read access to the RAM, EPROM, and controller chip. */ -READ8Z_MEMBER(myarc_fdc_device::readz) +void myarc_fdc_device::readz(offs_t offset, uint8_t *value) { if (machine().side_effects_disabled()) { @@ -193,7 +193,7 @@ void myarc_fdc_device::write(offs_t offset, uint8_t data) /* CRU read access to the LS251 multiplexer. */ -READ8Z_MEMBER( myarc_fdc_device::crureadz ) +void myarc_fdc_device::crureadz(offs_t offset, uint8_t *value) { const uint8_t dipswitch[] = { 0x00, 0x01, 0x02, 0x04, 0x08 }; uint16_t addrcopy = m_address; diff --git a/src/devices/bus/ti99/peb/myarcfdc.h b/src/devices/bus/ti99/peb/myarcfdc.h index 3a3c324d128..4a0293c8b24 100644 --- a/src/devices/bus/ti99/peb/myarcfdc.h +++ b/src/devices/bus/ti99/peb/myarcfdc.h @@ -31,11 +31,11 @@ class myarc_fdc_device : public device_t, public device_ti99_peribox_card_interf public: myarc_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8Z_MEMBER(readz) override; + void readz(offs_t offset, uint8_t *value) override; void write(offs_t offset, uint8_t data) override; - DECLARE_SETADDRESS_DBIN_MEMBER(setaddress_dbin) override; + void setaddress_dbin(offs_t offset, int state) override; - DECLARE_READ8Z_MEMBER(crureadz) override; + void crureadz(offs_t offset, uint8_t *value) override; void cruwrite(offs_t offset, uint8_t data) override; private: diff --git a/src/devices/bus/ti99/peb/myarcmem.cpp b/src/devices/bus/ti99/peb/myarcmem.cpp index 79add7a6c72..9a825bcccc1 100644 --- a/src/devices/bus/ti99/peb/myarcmem.cpp +++ b/src/devices/bus/ti99/peb/myarcmem.cpp @@ -72,7 +72,7 @@ int myarc_memory_expansion_device::get_base(int offset) RAM is at 2000-3fff, a000-ffff; ROM is at 4000-5fff (if CRU bit 0 is set) */ -READ8Z_MEMBER(myarc_memory_expansion_device::readz) +void myarc_memory_expansion_device::readz(offs_t offset, uint8_t *value) { int base = get_base(offset); @@ -127,7 +127,7 @@ void myarc_memory_expansion_device::write(offs_t offset, uint8_t data) /* CRU read. None here. */ -READ8Z_MEMBER(myarc_memory_expansion_device::crureadz) +void myarc_memory_expansion_device::crureadz(offs_t offset, uint8_t *value) { } diff --git a/src/devices/bus/ti99/peb/myarcmem.h b/src/devices/bus/ti99/peb/myarcmem.h index 175b8d60344..33ccac4c2b5 100644 --- a/src/devices/bus/ti99/peb/myarcmem.h +++ b/src/devices/bus/ti99/peb/myarcmem.h @@ -24,10 +24,10 @@ class myarc_memory_expansion_device : public device_t, public device_ti99_peribo { public: myarc_memory_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8Z_MEMBER(readz) override; + void readz(offs_t offset, uint8_t *value) override; void write(offs_t offset, uint8_t data) override; - DECLARE_READ8Z_MEMBER(crureadz) override; + void crureadz(offs_t offset, uint8_t *value) override; void cruwrite(offs_t offset, uint8_t data) override; protected: diff --git a/src/devices/bus/ti99/peb/pcode.cpp b/src/devices/bus/ti99/peb/pcode.cpp index 3cd03205be7..1fc0c85df47 100644 --- a/src/devices/bus/ti99/peb/pcode.cpp +++ b/src/devices/bus/ti99/peb/pcode.cpp @@ -115,7 +115,7 @@ ti_pcode_card_device::ti_pcode_card_device(const machine_config &mconfig, const { } -SETADDRESS_DBIN_MEMBER( ti_pcode_card_device::setaddress_dbin ) +void ti_pcode_card_device::setaddress_dbin(offs_t offset, int state) { m_address = offset; m_inDsrArea = in_dsr_space(offset, true); @@ -155,7 +155,7 @@ void ti_pcode_card_device::debugger_read(uint16_t offset, uint8_t& value) } } -READ8Z_MEMBER( ti_pcode_card_device::readz ) +void ti_pcode_card_device::readz(offs_t offset, uint8_t *value) { // Care for debugger if (machine().side_effects_disabled()) @@ -240,7 +240,7 @@ WRITE_LINE_MEMBER( ti_pcode_card_device::clock_in) we just ignore any request. (Note that CRU lines are not like memory; you may be able to write to them, but not necessarily read them again.) */ -READ8Z_MEMBER(ti_pcode_card_device::crureadz) +void ti_pcode_card_device::crureadz(offs_t offset, uint8_t *value) { } diff --git a/src/devices/bus/ti99/peb/pcode.h b/src/devices/bus/ti99/peb/pcode.h index 5e7a2cb6ce0..7462c559461 100644 --- a/src/devices/bus/ti99/peb/pcode.h +++ b/src/devices/bus/ti99/peb/pcode.h @@ -27,11 +27,11 @@ class ti_pcode_card_device : public device_t, public device_ti99_peribox_card_in { public: ti_pcode_card_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8Z_MEMBER(readz) override; + void readz(offs_t offset, uint8_t *value) override; void write(offs_t offset, uint8_t data) override; - DECLARE_READ8Z_MEMBER(crureadz) override; + void crureadz(offs_t offset, uint8_t *value) override; void cruwrite(offs_t offset, uint8_t data) override; - DECLARE_SETADDRESS_DBIN_MEMBER(setaddress_dbin) override; + void setaddress_dbin(offs_t offset, int state) override; DECLARE_WRITE_LINE_MEMBER(clock_in) override; diff --git a/src/devices/bus/ti99/peb/peribox.cpp b/src/devices/bus/ti99/peb/peribox.cpp index d716cb10a94..773aa0723f4 100644 --- a/src/devices/bus/ti99/peb/peribox.cpp +++ b/src/devices/bus/ti99/peb/peribox.cpp @@ -274,7 +274,7 @@ peribox_device::peribox_device(const machine_config &mconfig, const char *tag, d m_address_prefix = 0x70000; } -READ8Z_MEMBER(peribox_device::readz) +void peribox_device::readz(offs_t offset, uint8_t *value) { for (int i=2; i <= 8; i++) { @@ -290,7 +290,7 @@ void peribox_device::write(offs_t offset, uint8_t data) } } -SETADDRESS_DBIN_MEMBER(peribox_device::setaddress_dbin) +void peribox_device::setaddress_dbin(offs_t offset, int state) { // Ignore the address when the TI-99/8 transmits the high-order 8 bits if (!m_memen) return; @@ -301,7 +301,7 @@ SETADDRESS_DBIN_MEMBER(peribox_device::setaddress_dbin) } } -READ8Z_MEMBER(peribox_device::crureadz) +void peribox_device::crureadz(offs_t offset, uint8_t *value) { for (int i=2; i <= 8; i++) { @@ -676,7 +676,7 @@ peribox_slot_device::peribox_slot_device(const machine_config &mconfig, const ch { } -READ8Z_MEMBER(peribox_slot_device::readz) +void peribox_slot_device::readz(offs_t offset, uint8_t *value) { m_card->readz(offset, value); } @@ -686,12 +686,12 @@ void peribox_slot_device::write(offs_t offset, uint8_t data) m_card->write(offset, data); } -SETADDRESS_DBIN_MEMBER(peribox_slot_device::setaddress_dbin) +void peribox_slot_device::setaddress_dbin(offs_t offset, int state) { m_card->setaddress_dbin(offset, state); } -READ8Z_MEMBER(peribox_slot_device::crureadz) +void peribox_slot_device::crureadz(offs_t offset, uint8_t *value) { m_card->crureadz(offset, value); } diff --git a/src/devices/bus/ti99/peb/peribox.h b/src/devices/bus/ti99/peb/peribox.h index dc294a8778c..0ea38d227fb 100644 --- a/src/devices/bus/ti99/peb/peribox.h +++ b/src/devices/bus/ti99/peb/peribox.h @@ -35,11 +35,11 @@ public: peribox_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // Next eight methods are called from the console - DECLARE_READ8Z_MEMBER(readz) override; + void readz(offs_t offset, uint8_t *value) override; void write(offs_t offset, uint8_t data) override; - DECLARE_SETADDRESS_DBIN_MEMBER(setaddress_dbin) override; + void setaddress_dbin(offs_t offset, int state) override; - DECLARE_READ8Z_MEMBER(crureadz) override; + void crureadz(offs_t offset, uint8_t *value) override; void cruwrite(offs_t offset, uint8_t data) override; DECLARE_WRITE_LINE_MEMBER(senila); @@ -173,11 +173,11 @@ class device_ti99_peribox_card_interface : public device_interface friend class peribox_slot_device; public: - virtual DECLARE_READ8Z_MEMBER(readz) = 0; + virtual void readz(offs_t offset, uint8_t *value) = 0; virtual void write(offs_t offset, uint8_t data) = 0; - virtual DECLARE_READ8Z_MEMBER(crureadz) = 0; + virtual void crureadz(offs_t offset, uint8_t *value) = 0; virtual void cruwrite(offs_t offset, uint8_t data) = 0; - virtual DECLARE_SETADDRESS_DBIN_MEMBER(setaddress_dbin) { }; + virtual void setaddress_dbin(offs_t offset, int state) { }; virtual DECLARE_WRITE_LINE_MEMBER(clock_in) { } virtual DECLARE_WRITE_LINE_MEMBER(reset_in) { } @@ -227,9 +227,9 @@ public: peribox_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // Called from the box (direction to card) - DECLARE_READ8Z_MEMBER(readz); + void readz(offs_t offset, uint8_t *value); void write(offs_t offset, uint8_t data); - DECLARE_SETADDRESS_DBIN_MEMBER(setaddress_dbin); + void setaddress_dbin(offs_t offset, int state); DECLARE_WRITE_LINE_MEMBER(senila); DECLARE_WRITE_LINE_MEMBER(senilb); @@ -242,7 +242,7 @@ public: DECLARE_WRITE_LINE_MEMBER( lcp_line ); DECLARE_WRITE_LINE_MEMBER( set_ready ); - DECLARE_READ8Z_MEMBER(crureadz); + void crureadz(offs_t offset, uint8_t *value); void cruwrite(offs_t offset, uint8_t data); // called from the box itself diff --git a/src/devices/bus/ti99/peb/pgram.cpp b/src/devices/bus/ti99/peb/pgram.cpp index e0354d0c2d2..ab2226330a9 100644 --- a/src/devices/bus/ti99/peb/pgram.cpp +++ b/src/devices/bus/ti99/peb/pgram.cpp @@ -168,7 +168,7 @@ pgram_device::pgram_device(const machine_config &mconfig, const char *tag, devic Decoding is done by the 74ls138 and 74ls139 circuits on the board. */ -READ8Z_MEMBER(pgram_device::readz) +void pgram_device::readz(offs_t offset, uint8_t *value) { if (!m_active) return; @@ -231,7 +231,7 @@ void pgram_device::write(offs_t offset, uint8_t data) area 6000-7fff. A second bank can be selected for both DSR and RAM using CRU bits 3 and 4. */ -READ8Z_MEMBER(pgram_device::dsr_ram_read) +void pgram_device::dsr_ram_read(offs_t offset, uint8_t *value) { // ..0. .... .... .... = DSR // ..1. .... .... .... = RAM @@ -317,7 +317,7 @@ void pgram_device::dsr_ram_write(offs_t offset, uint8_t data) When the GROM address is outside the area for G3-G7, the access is ignored. GRAM access requires setting CRU bit 1 before. */ -READ8Z_MEMBER(pgram_device::gram_read) +void pgram_device::gram_read(offs_t offset, uint8_t *value) { // Don't let the debugger mess with the GRAM emulation if (machine().side_effects_disabled()) diff --git a/src/devices/bus/ti99/peb/pgram.h b/src/devices/bus/ti99/peb/pgram.h index 12fa98acbb4..74ba37c76fd 100644 --- a/src/devices/bus/ti99/peb/pgram.h +++ b/src/devices/bus/ti99/peb/pgram.h @@ -31,8 +31,8 @@ class pgram_device : public device_t, public device_ti99_peribox_card_interface public: pgram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); void write(offs_t offset, uint8_t data) override; - DECLARE_READ8Z_MEMBER(readz) override; - DECLARE_READ8Z_MEMBER(crureadz) override { }; + void readz(offs_t offset, uint8_t *value) override; + void crureadz(offs_t offset, uint8_t *value) override { }; void cruwrite(offs_t offset, uint8_t data) override; DECLARE_INPUT_CHANGED_MEMBER( sw1_changed ); DECLARE_INPUT_CHANGED_MEMBER( sw2_changed ); @@ -63,8 +63,8 @@ private: required_device m_count3; // Methods - DECLARE_READ8Z_MEMBER(gram_read); - DECLARE_READ8Z_MEMBER(dsr_ram_read); + void gram_read(offs_t offset, uint8_t *value); + void dsr_ram_read(offs_t offset, uint8_t *value); void gram_write(offs_t offset, uint8_t data); void dsr_ram_write(offs_t offset, uint8_t data); diff --git a/src/devices/bus/ti99/peb/samsmem.cpp b/src/devices/bus/ti99/peb/samsmem.cpp index 61b668bb46e..c882887061a 100644 --- a/src/devices/bus/ti99/peb/samsmem.cpp +++ b/src/devices/bus/ti99/peb/samsmem.cpp @@ -48,7 +48,7 @@ sams_memory_expansion_device::sams_memory_expansion_device(const machine_config 0x2000-0x3fff and 0xa000-0xffff, and the mapper area is at 0x4000-0x401e (only even addresses). */ -READ8Z_MEMBER(sams_memory_expansion_device::readz) +void sams_memory_expansion_device::readz(offs_t offset, uint8_t *value) { int base; @@ -99,7 +99,7 @@ void sams_memory_expansion_device::write(offs_t offset, uint8_t data) /* CRU read. None here. */ -READ8Z_MEMBER(sams_memory_expansion_device::crureadz) +void sams_memory_expansion_device::crureadz(offs_t offset, uint8_t *value) { } diff --git a/src/devices/bus/ti99/peb/samsmem.h b/src/devices/bus/ti99/peb/samsmem.h index da05b58438e..bd0dddd2fa8 100644 --- a/src/devices/bus/ti99/peb/samsmem.h +++ b/src/devices/bus/ti99/peb/samsmem.h @@ -27,10 +27,10 @@ class sams_memory_expansion_device : public device_t, public device_ti99_peribox { public: sams_memory_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8Z_MEMBER(readz) override; + void readz(offs_t offset, uint8_t *value) override; void write(offs_t offset, uint8_t data) override; - DECLARE_READ8Z_MEMBER(crureadz) override; + void crureadz(offs_t offset, uint8_t *value) override; void cruwrite(offs_t offset, uint8_t data) override; protected: diff --git a/src/devices/bus/ti99/peb/spchsyn.cpp b/src/devices/bus/ti99/peb/spchsyn.cpp index 4d9f5cbd259..cf7d03add57 100644 --- a/src/devices/bus/ti99/peb/spchsyn.cpp +++ b/src/devices/bus/ti99/peb/spchsyn.cpp @@ -56,7 +56,7 @@ ti_speech_synthesizer_device::ti_speech_synthesizer_device(const machine_config Memory read */ -READ8Z_MEMBER( ti_speech_synthesizer_device::readz ) +void ti_speech_synthesizer_device::readz(offs_t offset, uint8_t *value) { if (machine().side_effects_disabled()) return; @@ -88,7 +88,7 @@ void ti_speech_synthesizer_device::write(offs_t offset, uint8_t data) } } -SETADDRESS_DBIN_MEMBER( ti_speech_synthesizer_device::setaddress_dbin ) +void ti_speech_synthesizer_device::setaddress_dbin(offs_t offset, int state) { // 1001 00xx xxxx xxx0 DBIN=1 // 1001 01xx xxxx xxx0 DBIN=0 diff --git a/src/devices/bus/ti99/peb/spchsyn.h b/src/devices/bus/ti99/peb/spchsyn.h index 9b6a464e519..5a73172dbb3 100644 --- a/src/devices/bus/ti99/peb/spchsyn.h +++ b/src/devices/bus/ti99/peb/spchsyn.h @@ -25,11 +25,11 @@ class ti_speech_synthesizer_device : public device_t, public device_ti99_peribox { public: ti_speech_synthesizer_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8Z_MEMBER(readz) override; + void readz(offs_t offset, uint8_t *value) override; void write(offs_t offset, uint8_t data) override; - DECLARE_SETADDRESS_DBIN_MEMBER(setaddress_dbin) override; + void setaddress_dbin(offs_t offset, int state) override; - DECLARE_READ8Z_MEMBER(crureadz) override { } + void crureadz(offs_t offset, uint8_t *value) override { } void cruwrite(offs_t offset, uint8_t data) override { } protected: diff --git a/src/devices/bus/ti99/peb/ti_32kmem.cpp b/src/devices/bus/ti99/peb/ti_32kmem.cpp index b25c7d65784..eefb6d906fa 100644 --- a/src/devices/bus/ti99/peb/ti_32kmem.cpp +++ b/src/devices/bus/ti99/peb/ti_32kmem.cpp @@ -44,7 +44,7 @@ ti_32k_expcard_device::ti_32k_expcard_device(const machine_config &mconfig, cons { } -READ8Z_MEMBER(ti_32k_expcard_device::readz) +void ti_32k_expcard_device::readz(offs_t offset, uint8_t *value) { uint8_t val = 0; /* diff --git a/src/devices/bus/ti99/peb/ti_32kmem.h b/src/devices/bus/ti99/peb/ti_32kmem.h index 5ed0faac87c..caf4e2cd055 100644 --- a/src/devices/bus/ti99/peb/ti_32kmem.h +++ b/src/devices/bus/ti99/peb/ti_32kmem.h @@ -25,10 +25,10 @@ class ti_32k_expcard_device : public device_t, public device_ti99_peribox_card_i { public: ti_32k_expcard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8Z_MEMBER(readz) override; + void readz(offs_t offset, uint8_t *value) override; void write(offs_t offset, uint8_t data) override; - DECLARE_READ8Z_MEMBER(crureadz) override { } + void crureadz(offs_t offset, uint8_t *value) override { } void cruwrite(offs_t offset, uint8_t data) override { } protected: diff --git a/src/devices/bus/ti99/peb/ti_fdc.cpp b/src/devices/bus/ti99/peb/ti_fdc.cpp index 1ad839ac537..92f450b6627 100644 --- a/src/devices/bus/ti99/peb/ti_fdc.cpp +++ b/src/devices/bus/ti99/peb/ti_fdc.cpp @@ -99,7 +99,7 @@ WRITE_LINE_MEMBER( ti_fdc_device::fdc_hld_w ) LOGMASKED(LOG_SIGNALS, "HLD callback = %d\n", m_HLD); } -SETADDRESS_DBIN_MEMBER( ti_fdc_device::setaddress_dbin ) +void ti_fdc_device::setaddress_dbin(offs_t offset, int state) { // Selection login in the PAL and some circuits on the board @@ -131,7 +131,7 @@ void ti_fdc_device::debug_read(offs_t offset, uint8_t* value) } } -READ8Z_MEMBER(ti_fdc_device::readz) +void ti_fdc_device::readz(offs_t offset, uint8_t *value) { if (machine().side_effects_disabled()) { @@ -201,7 +201,7 @@ void ti_fdc_device::write(offs_t offset, uint8_t data) See schematics for the meaning of the bits. */ -READ8Z_MEMBER(ti_fdc_device::crureadz) +void ti_fdc_device::crureadz(offs_t offset, uint8_t *value) { if ((offset & 0xff00)==m_cru_base) { diff --git a/src/devices/bus/ti99/peb/ti_fdc.h b/src/devices/bus/ti99/peb/ti_fdc.h index 3a54e0e7c7e..8088fdf9010 100644 --- a/src/devices/bus/ti99/peb/ti_fdc.h +++ b/src/devices/bus/ti99/peb/ti_fdc.h @@ -28,11 +28,11 @@ class ti_fdc_device : public device_t, public device_ti99_peribox_card_interface { public: ti_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8Z_MEMBER(readz) override; + void readz(offs_t offset, uint8_t *value) override; void write(offs_t offset, uint8_t data) override; - DECLARE_SETADDRESS_DBIN_MEMBER(setaddress_dbin) override; + void setaddress_dbin(offs_t offset, int state) override; - DECLARE_READ8Z_MEMBER(crureadz) override; + void crureadz(offs_t offset, uint8_t *value) override; void cruwrite(offs_t offset, uint8_t data) override; // bool dvena_r(); diff --git a/src/devices/bus/ti99/peb/ti_rs232.cpp b/src/devices/bus/ti99/peb/ti_rs232.cpp index ffb1d38c980..675a013f483 100644 --- a/src/devices/bus/ti99/peb/ti_rs232.cpp +++ b/src/devices/bus/ti99/peb/ti_rs232.cpp @@ -238,7 +238,7 @@ void ti_pio_attached_device::call_unload() /* CRU read */ -READ8Z_MEMBER(ti_rs232_pio_device::crureadz) +void ti_rs232_pio_device::crureadz(offs_t offset, uint8_t *value) { if ((offset & 0xff00)==m_cru_base) { @@ -374,7 +374,7 @@ WRITE_LINE_MEMBER(ti_rs232_pio_device::led_w) /* Memory read */ -READ8Z_MEMBER( ti_rs232_pio_device::readz ) +void ti_rs232_pio_device::readz(offs_t offset, uint8_t *value) { if (m_senila==ASSERT_LINE) { diff --git a/src/devices/bus/ti99/peb/ti_rs232.h b/src/devices/bus/ti99/peb/ti_rs232.h index dd15c989478..62edd2f8437 100644 --- a/src/devices/bus/ti99/peb/ti_rs232.h +++ b/src/devices/bus/ti99/peb/ti_rs232.h @@ -31,10 +31,10 @@ class ti_rs232_pio_device : public device_t, public device_ti99_peribox_card_int public: ti_rs232_pio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8Z_MEMBER(readz) override; + void readz(offs_t offset, uint8_t *value) override; void write(offs_t offset, uint8_t data) override; - DECLARE_READ8Z_MEMBER(crureadz) override; + void crureadz(offs_t offset, uint8_t *value) override; void cruwrite(offs_t offset, uint8_t data) override; protected: diff --git a/src/devices/bus/ti99/peb/tn_ide.cpp b/src/devices/bus/ti99/peb/tn_ide.cpp index 878f25c1c3f..54e4cdf926a 100644 --- a/src/devices/bus/ti99/peb/tn_ide.cpp +++ b/src/devices/bus/ti99/peb/tn_ide.cpp @@ -182,7 +182,7 @@ nouspikel_ide_card_device::nouspikel_ide_card_device(const machine_config &mconf { } -READ8Z_MEMBER(nouspikel_ide_card_device::readz) +void nouspikel_ide_card_device::readz(offs_t offset, uint8_t *value) { bool mmap = false; bool sramsel = false; @@ -510,7 +510,7 @@ void nouspikel_ide_card_device::decode(offs_t offset, bool& mmap, bool& sramsel, /* CRU read access to the LS251 multiplexer. */ -READ8Z_MEMBER( nouspikel_ide_card_device::crureadz ) +void nouspikel_ide_card_device::crureadz(offs_t offset, uint8_t *value) { uint8_t bit = 0; diff --git a/src/devices/bus/ti99/peb/tn_ide.h b/src/devices/bus/ti99/peb/tn_ide.h index 071793dd7f1..ded43865d74 100644 --- a/src/devices/bus/ti99/peb/tn_ide.h +++ b/src/devices/bus/ti99/peb/tn_ide.h @@ -30,9 +30,9 @@ class nouspikel_ide_card_device : public device_t, public device_ti99_peribox_ca { public: nouspikel_ide_card_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8Z_MEMBER(readz) override; + void readz(offs_t offset, uint8_t *value) override; void write(offs_t offset, uint8_t data) override; - DECLARE_READ8Z_MEMBER( crureadz ) override; + void crureadz(offs_t offset, uint8_t *value) override; void cruwrite(offs_t offset, uint8_t data) override; DECLARE_INPUT_CHANGED_MEMBER( mode_changed ); diff --git a/src/devices/bus/ti99/peb/tn_usbsm.cpp b/src/devices/bus/ti99/peb/tn_usbsm.cpp index 8f6a9064c7e..c37f7ec75b1 100644 --- a/src/devices/bus/ti99/peb/tn_usbsm.cpp +++ b/src/devices/bus/ti99/peb/tn_usbsm.cpp @@ -88,7 +88,7 @@ nouspikel_usb_smartmedia_device::nouspikel_usb_smartmedia_device(const machine_c /* CRU read */ -READ8Z_MEMBER(nouspikel_usb_smartmedia_device::crureadz) +void nouspikel_usb_smartmedia_device::crureadz(offs_t offset, uint8_t *value) { if ((offset & 0xff00)==m_cru_base) { @@ -188,7 +188,7 @@ void nouspikel_usb_smartmedia_device::cruwrite(offs_t offset, uint8_t data) Memory read TODO: Check whether AMA/B/C is actually checked */ -READ8Z_MEMBER(nouspikel_usb_smartmedia_device::readz) +void nouspikel_usb_smartmedia_device::readz(offs_t offset, uint8_t *value) { if (machine().side_effects_disabled()) return; diff --git a/src/devices/bus/ti99/peb/tn_usbsm.h b/src/devices/bus/ti99/peb/tn_usbsm.h index 52c2690f3ed..7ba08addf95 100644 --- a/src/devices/bus/ti99/peb/tn_usbsm.h +++ b/src/devices/bus/ti99/peb/tn_usbsm.h @@ -27,10 +27,10 @@ class nouspikel_usb_smartmedia_device : public device_t, public device_ti99_peri { public: nouspikel_usb_smartmedia_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8Z_MEMBER(readz) override; + void readz(offs_t offset, uint8_t *value) override; void write(offs_t offset, uint8_t data) override; - DECLARE_READ8Z_MEMBER(crureadz) override; + void crureadz(offs_t offset, uint8_t *value) override; void cruwrite(offs_t offset, uint8_t data) override; protected: diff --git a/src/devices/bus/ti99/ti99defs.h b/src/devices/bus/ti99/ti99defs.h index 3a1ed9d00d5..ca196661e51 100644 --- a/src/devices/bus/ti99/ti99defs.h +++ b/src/devices/bus/ti99/ti99defs.h @@ -44,24 +44,4 @@ // v9938 #define COLORBUS_TAG "colorbus" - -/* - Macros for special read methods; these methods differs from the standard - READ8 by allowing for a "high-impedance" state "Z" which means that the - bus lines are not changed. That way, we can built busses with parallel - devices as in the real machine, and only the active device changes the bus lines. -*/ - -#define READ8Z_MEMBER(name) void name(ATTR_UNUSED offs_t offset, ATTR_UNUSED uint8_t *value) -#define DECLARE_READ8Z_MEMBER(name) void name(ATTR_UNUSED offs_t offset, ATTR_UNUSED uint8_t *value) - -/* - For almost all applications of setaddress, we also need the data bus - direction. This line is called DBIN on the TI CPUs, but as we do not assume - that this is a general rule, we use new macros here which contain the - DBIN setting. -*/ -#define SETADDRESS_DBIN_MEMBER(name) void name(ATTR_UNUSED offs_t offset, ATTR_UNUSED int state) -#define DECLARE_SETADDRESS_DBIN_MEMBER(name) void name(ATTR_UNUSED offs_t offset, ATTR_UNUSED int state) - #endif // MAME_BUS_TI99_TI99DEFS_H -- cgit v1.2.3