diff options
Diffstat (limited to 'src/devices/bus/ql')
30 files changed, 86 insertions, 103 deletions
diff --git a/src/devices/bus/ql/cst_q_plus4.cpp b/src/devices/bus/ql/cst_q_plus4.cpp index 52f1602ba5b..96269dc6ef5 100644 --- a/src/devices/bus/ql/cst_q_plus4.cpp +++ b/src/devices/bus/ql/cst_q_plus4.cpp @@ -50,21 +50,22 @@ const tiny_rom_entry *cst_q_plus4_device::device_rom_region() const // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_START(cst_q_plus4_device::device_add_mconfig) - MCFG_DEVICE_ADD(MC6821_TAG, PIA6821, 0) +void cst_q_plus4_device::device_add_mconfig(machine_config &config) +{ + PIA6821(config, MC6821_TAG, 0); - MCFG_DEVICE_ADD("exp1", QL_EXPANSION_SLOT, DERIVED_CLOCK(1, 1), ql_expansion_cards, nullptr) - MCFG_QL_EXPANSION_SLOT_EXTINTL_CALLBACK(WRITELINE(*this, cst_q_plus4_device, exp1_extintl_w)) + QL_EXPANSION_SLOT(config, m_exp1, DERIVED_CLOCK(1, 1), ql_expansion_cards, nullptr); + m_exp1->extintl_wr_callback().set(FUNC(cst_q_plus4_device::exp1_extintl_w)); - MCFG_DEVICE_ADD("exp2", QL_EXPANSION_SLOT, DERIVED_CLOCK(1, 1), ql_expansion_cards, nullptr) - MCFG_QL_EXPANSION_SLOT_EXTINTL_CALLBACK(WRITELINE(*this, cst_q_plus4_device, exp2_extintl_w)) + QL_EXPANSION_SLOT(config, m_exp2, DERIVED_CLOCK(1, 1), ql_expansion_cards, nullptr); + m_exp2->extintl_wr_callback().set(FUNC(cst_q_plus4_device::exp2_extintl_w)); - MCFG_DEVICE_ADD("exp3", QL_EXPANSION_SLOT, DERIVED_CLOCK(1, 1), ql_expansion_cards, nullptr) - MCFG_QL_EXPANSION_SLOT_EXTINTL_CALLBACK(WRITELINE(*this, cst_q_plus4_device, exp3_extintl_w)) + QL_EXPANSION_SLOT(config, m_exp3, DERIVED_CLOCK(1, 1), ql_expansion_cards, nullptr); + m_exp3->extintl_wr_callback().set(FUNC(cst_q_plus4_device::exp3_extintl_w)); - MCFG_DEVICE_ADD("exp4", QL_EXPANSION_SLOT, DERIVED_CLOCK(1, 1), ql_expansion_cards, nullptr) - MCFG_QL_EXPANSION_SLOT_EXTINTL_CALLBACK(WRITELINE(*this, cst_q_plus4_device, exp4_extintl_w)) -MACHINE_CONFIG_END + QL_EXPANSION_SLOT(config, m_exp4, DERIVED_CLOCK(1, 1), ql_expansion_cards, nullptr); + m_exp4->extintl_wr_callback().set(FUNC(cst_q_plus4_device::exp4_extintl_w)); +} @@ -105,17 +106,17 @@ void cst_q_plus4_device::device_start() // read - //------------------------------------------------- -uint8_t cst_q_plus4_device::read(address_space &space, offs_t offset, uint8_t data) +uint8_t cst_q_plus4_device::read(offs_t offset, uint8_t data) { if (offset >= 0xc000 && offset < 0xc200) { data = m_rom->base()[offset & 0x1fff]; } - data = m_exp1->read(space, offset, data); - data = m_exp2->read(space, offset, data); - data = m_exp3->read(space, offset, data); - data = m_exp4->read(space, offset, data); + data = m_exp1->read(offset, data); + data = m_exp2->read(offset, data); + data = m_exp3->read(offset, data); + data = m_exp4->read(offset, data); return data; } @@ -125,10 +126,10 @@ uint8_t cst_q_plus4_device::read(address_space &space, offs_t offset, uint8_t da // write - //------------------------------------------------- -void cst_q_plus4_device::write(address_space &space, offs_t offset, uint8_t data) +void cst_q_plus4_device::write(offs_t offset, uint8_t data) { - m_exp1->write(space, offset, data); - m_exp2->write(space, offset, data); - m_exp3->write(space, offset, data); - m_exp4->write(space, offset, data); + m_exp1->write(offset, data); + m_exp2->write(offset, data); + m_exp3->write(offset, data); + m_exp4->write(offset, data); } diff --git a/src/devices/bus/ql/cst_q_plus4.h b/src/devices/bus/ql/cst_q_plus4.h index 0eff45e3840..4c8ea616f51 100644 --- a/src/devices/bus/ql/cst_q_plus4.h +++ b/src/devices/bus/ql/cst_q_plus4.h @@ -37,8 +37,8 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // device_ql_expansion_card_interface overrides - virtual uint8_t read(address_space &space, offs_t offset, uint8_t data) override; - virtual void write(address_space &space, offs_t offset, uint8_t data) override; + virtual uint8_t read(offs_t offset, uint8_t data) override; + virtual void write(offs_t offset, uint8_t data) override; private: DECLARE_WRITE_LINE_MEMBER( exp1_extintl_w ) { m_exp1_extinl = state; update_extintl(); } diff --git a/src/devices/bus/ql/cst_qdisc.cpp b/src/devices/bus/ql/cst_qdisc.cpp index a3940d41b1a..2fe46dc4f5e 100644 --- a/src/devices/bus/ql/cst_qdisc.cpp +++ b/src/devices/bus/ql/cst_qdisc.cpp @@ -71,7 +71,7 @@ void cst_ql_disc_interface_device::device_start() // read - //------------------------------------------------- -uint8_t cst_ql_disc_interface_device::read(address_space &space, offs_t offset, uint8_t data) +uint8_t cst_ql_disc_interface_device::read(offs_t offset, uint8_t data) { return data; } @@ -81,6 +81,6 @@ uint8_t cst_ql_disc_interface_device::read(address_space &space, offs_t offset, // write - //------------------------------------------------- -void cst_ql_disc_interface_device::write(address_space &space, offs_t offset, uint8_t data) +void cst_ql_disc_interface_device::write(offs_t offset, uint8_t data) { } diff --git a/src/devices/bus/ql/cst_qdisc.h b/src/devices/bus/ql/cst_qdisc.h index 4bbcbd0913f..fdd492f1230 100644 --- a/src/devices/bus/ql/cst_qdisc.h +++ b/src/devices/bus/ql/cst_qdisc.h @@ -36,8 +36,8 @@ protected: virtual void device_start() override; // device_ql_expansion_card_interface overrides - virtual uint8_t read(address_space &space, offs_t offset, uint8_t data) override; - virtual void write(address_space &space, offs_t offset, uint8_t data) override; + virtual uint8_t read(offs_t offset, uint8_t data) override; + virtual void write(offs_t offset, uint8_t data) override; }; diff --git a/src/devices/bus/ql/cumana_fdi.cpp b/src/devices/bus/ql/cumana_fdi.cpp index a8d1b7c376b..204dea12608 100644 --- a/src/devices/bus/ql/cumana_fdi.cpp +++ b/src/devices/bus/ql/cumana_fdi.cpp @@ -71,7 +71,7 @@ void cumana_floppy_disk_interface_device::device_start() // read - //------------------------------------------------- -uint8_t cumana_floppy_disk_interface_device::read(address_space &space, offs_t offset, uint8_t data) +uint8_t cumana_floppy_disk_interface_device::read(offs_t offset, uint8_t data) { return data; } @@ -81,6 +81,6 @@ uint8_t cumana_floppy_disk_interface_device::read(address_space &space, offs_t o // write - //------------------------------------------------- -void cumana_floppy_disk_interface_device::write(address_space &space, offs_t offset, uint8_t data) +void cumana_floppy_disk_interface_device::write(offs_t offset, uint8_t data) { } diff --git a/src/devices/bus/ql/cumana_fdi.h b/src/devices/bus/ql/cumana_fdi.h index a0da6952cab..2080251fcf3 100644 --- a/src/devices/bus/ql/cumana_fdi.h +++ b/src/devices/bus/ql/cumana_fdi.h @@ -35,8 +35,8 @@ protected: virtual void device_start() override; // device_ql_expansion_card_interface overrides - virtual uint8_t read(address_space &space, offs_t offset, uint8_t data) override; - virtual void write(address_space &space, offs_t offset, uint8_t data) override; + virtual uint8_t read(offs_t offset, uint8_t data) override; + virtual void write(offs_t offset, uint8_t data) override; }; diff --git a/src/devices/bus/ql/exp.h b/src/devices/bus/ql/exp.h index ed5febc4854..43e8a7b77d5 100644 --- a/src/devices/bus/ql/exp.h +++ b/src/devices/bus/ql/exp.h @@ -49,24 +49,6 @@ //************************************************************************** -// INTERFACE CONFIGURATION MACROS -//************************************************************************** - -#define MCFG_QL_EXPANSION_SLOT_IPL0L_CALLBACK(_write) \ - downcast<ql_expansion_slot_device &>(*device).set_ipl0l_wr_callback(DEVCB_##_write); - -#define MCFG_QL_EXPANSION_SLOT_IPL1L_CALLBACK(_write) \ - downcast<ql_expansion_slot_device &>(*device).set_ipl1l_wr_callback(DEVCB_##_write); - -#define MCFG_QL_EXPANSION_SLOT_BERRL_CALLBACK(_write) \ - downcast<ql_expansion_slot_device &>(*device).set_berrl_wr_callback(DEVCB_##_write); - -#define MCFG_QL_EXPANSION_SLOT_EXTINTL_CALLBACK(_write) \ - downcast<ql_expansion_slot_device &>(*device).set_extintl_wr_callback(DEVCB_##_write); - - - -//************************************************************************** // TYPE DEFINITIONS //************************************************************************** @@ -80,8 +62,8 @@ class device_ql_expansion_card_interface : public device_slot_card_interface public: virtual void romoeh_w(int state) { m_romoeh = state; } - virtual uint8_t read(address_space &space, offs_t offset, uint8_t data) { return data; } - virtual void write(address_space &space, offs_t offset, uint8_t data) { } + virtual uint8_t read(offs_t offset, uint8_t data) { return data; } + virtual void write(offs_t offset, uint8_t data) { } protected: // construction/destruction @@ -112,14 +94,14 @@ public: } ql_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - template <class Object> devcb_base &set_ipl0l_wr_callback(Object &&cb) { return m_write_ipl0l.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_ipl1l_wr_callback(Object &&cb) { return m_write_ipl1l.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_berrl_wr_callback(Object &&cb) { return m_write_berrl.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_extintl_wr_callback(Object &&cb) { return m_write_extintl.set_callback(std::forward<Object>(cb)); } + auto ipl0l_wr_callback() { return m_write_ipl0l.bind(); } + auto ipl1l_wr_callback() { return m_write_ipl1l.bind(); } + auto berrl_wr_callback() { return m_write_berrl.bind(); } + auto extintl_wr_callback() { return m_write_extintl.bind(); } // computer interface - uint8_t read(address_space &space, offs_t offset, uint8_t data) { if (m_card) data = m_card->read(space, offset, data); return data; } - void write(address_space &space, offs_t offset, uint8_t data) { if (m_card) m_card->write(space, offset, data); } + uint8_t read(offs_t offset, uint8_t data) { if (m_card) data = m_card->read(offset, data); return data; } + void write(offs_t offset, uint8_t data) { if (m_card) m_card->write(offset, data); } DECLARE_WRITE_LINE_MEMBER( romoeh_w ) { if (m_card) m_card->romoeh_w(state); } // card interface diff --git a/src/devices/bus/ql/kempston_di.cpp b/src/devices/bus/ql/kempston_di.cpp index 599e9bebcc7..1535f171ff6 100644 --- a/src/devices/bus/ql/kempston_di.cpp +++ b/src/devices/bus/ql/kempston_di.cpp @@ -69,7 +69,7 @@ void kempston_disk_interface_device::device_start() // read - //------------------------------------------------- -uint8_t kempston_disk_interface_device::read(address_space &space, offs_t offset, uint8_t data) +uint8_t kempston_disk_interface_device::read(offs_t offset, uint8_t data) { return data; } @@ -79,6 +79,6 @@ uint8_t kempston_disk_interface_device::read(address_space &space, offs_t offset // write - //------------------------------------------------- -void kempston_disk_interface_device::write(address_space &space, offs_t offset, uint8_t data) +void kempston_disk_interface_device::write(offs_t offset, uint8_t data) { } diff --git a/src/devices/bus/ql/kempston_di.h b/src/devices/bus/ql/kempston_di.h index e37c3d7f6b7..cc75a5fe0fc 100644 --- a/src/devices/bus/ql/kempston_di.h +++ b/src/devices/bus/ql/kempston_di.h @@ -35,8 +35,8 @@ protected: virtual void device_start() override; // device_ql_expansion_card_interface overrides - virtual uint8_t read(address_space &space, offs_t offset, uint8_t data) override; - virtual void write(address_space &space, offs_t offset, uint8_t data) override; + virtual uint8_t read(offs_t offset, uint8_t data) override; + virtual void write(offs_t offset, uint8_t data) override; }; diff --git a/src/devices/bus/ql/miracle_gold_card.cpp b/src/devices/bus/ql/miracle_gold_card.cpp index a7acd24e2d7..bf6be7fe136 100644 --- a/src/devices/bus/ql/miracle_gold_card.cpp +++ b/src/devices/bus/ql/miracle_gold_card.cpp @@ -71,7 +71,7 @@ void miracle_gold_card_device::device_start() // read - //------------------------------------------------- -uint8_t miracle_gold_card_device::read(address_space &space, offs_t offset, uint8_t data) +uint8_t miracle_gold_card_device::read(offs_t offset, uint8_t data) { return data; } @@ -81,6 +81,6 @@ uint8_t miracle_gold_card_device::read(address_space &space, offs_t offset, uint // write - //------------------------------------------------- -void miracle_gold_card_device::write(address_space &space, offs_t offset, uint8_t data) +void miracle_gold_card_device::write(offs_t offset, uint8_t data) { } diff --git a/src/devices/bus/ql/miracle_gold_card.h b/src/devices/bus/ql/miracle_gold_card.h index feea55de78c..7ed9d0e2eb8 100644 --- a/src/devices/bus/ql/miracle_gold_card.h +++ b/src/devices/bus/ql/miracle_gold_card.h @@ -35,8 +35,8 @@ protected: virtual void device_start() override; // device_ql_expansion_card_interface overrides - virtual uint8_t read(address_space &space, offs_t offset, uint8_t data) override; - virtual void write(address_space &space, offs_t offset, uint8_t data) override; + virtual uint8_t read(offs_t offset, uint8_t data) override; + virtual void write(offs_t offset, uint8_t data) override; }; diff --git a/src/devices/bus/ql/miracle_hd.cpp b/src/devices/bus/ql/miracle_hd.cpp index 146945737a2..f2f16715c72 100644 --- a/src/devices/bus/ql/miracle_hd.cpp +++ b/src/devices/bus/ql/miracle_hd.cpp @@ -69,7 +69,7 @@ void miracle_hard_disk_device::device_start() // read - //------------------------------------------------- -uint8_t miracle_hard_disk_device::read(address_space &space, offs_t offset, uint8_t data) +uint8_t miracle_hard_disk_device::read(offs_t offset, uint8_t data) { return data; } @@ -79,6 +79,6 @@ uint8_t miracle_hard_disk_device::read(address_space &space, offs_t offset, uint // write - //------------------------------------------------- -void miracle_hard_disk_device::write(address_space &space, offs_t offset, uint8_t data) +void miracle_hard_disk_device::write(offs_t offset, uint8_t data) { } diff --git a/src/devices/bus/ql/miracle_hd.h b/src/devices/bus/ql/miracle_hd.h index 0bcd260bb87..983dce66f8b 100644 --- a/src/devices/bus/ql/miracle_hd.h +++ b/src/devices/bus/ql/miracle_hd.h @@ -36,8 +36,8 @@ protected: virtual void device_start() override; // device_ql_rom_cartridge_card_interface overrides - virtual uint8_t read(address_space &space, offs_t offset, uint8_t data) override; - virtual void write(address_space &space, offs_t offset, uint8_t data) override; + virtual uint8_t read(offs_t offset, uint8_t data) override; + virtual void write(offs_t offset, uint8_t data) override; }; diff --git a/src/devices/bus/ql/mp_fdi.cpp b/src/devices/bus/ql/mp_fdi.cpp index 06324a4be67..4e2a90ce52d 100644 --- a/src/devices/bus/ql/mp_fdi.cpp +++ b/src/devices/bus/ql/mp_fdi.cpp @@ -69,7 +69,7 @@ void micro_peripherals_floppy_disk_interface_device::device_start() // read - //------------------------------------------------- -uint8_t micro_peripherals_floppy_disk_interface_device::read(address_space &space, offs_t offset, uint8_t data) +uint8_t micro_peripherals_floppy_disk_interface_device::read(offs_t offset, uint8_t data) { return data; } @@ -79,6 +79,6 @@ uint8_t micro_peripherals_floppy_disk_interface_device::read(address_space &spac // write - //------------------------------------------------- -void micro_peripherals_floppy_disk_interface_device::write(address_space &space, offs_t offset, uint8_t data) +void micro_peripherals_floppy_disk_interface_device::write(offs_t offset, uint8_t data) { } diff --git a/src/devices/bus/ql/mp_fdi.h b/src/devices/bus/ql/mp_fdi.h index 9939e540ba7..3fc9d9d8c83 100644 --- a/src/devices/bus/ql/mp_fdi.h +++ b/src/devices/bus/ql/mp_fdi.h @@ -34,8 +34,8 @@ protected: virtual void device_start() override; // device_ql_expansion_card_interface overrides - virtual uint8_t read(address_space &space, offs_t offset, uint8_t data) override; - virtual void write(address_space &space, offs_t offset, uint8_t data) override; + virtual uint8_t read(offs_t offset, uint8_t data) override; + virtual void write(offs_t offset, uint8_t data) override; }; diff --git a/src/devices/bus/ql/opd_basic_master.cpp b/src/devices/bus/ql/opd_basic_master.cpp index 015fca91a37..b3b6f18dc19 100644 --- a/src/devices/bus/ql/opd_basic_master.cpp +++ b/src/devices/bus/ql/opd_basic_master.cpp @@ -67,7 +67,7 @@ void opd_basic_master_device::device_start() // read - //------------------------------------------------- -uint8_t opd_basic_master_device::read(address_space &space, offs_t offset, uint8_t data) +uint8_t opd_basic_master_device::read(offs_t offset, uint8_t data) { return data; } @@ -77,6 +77,6 @@ uint8_t opd_basic_master_device::read(address_space &space, offs_t offset, uint8 // write - //------------------------------------------------- -void opd_basic_master_device::write(address_space &space, offs_t offset, uint8_t data) +void opd_basic_master_device::write(offs_t offset, uint8_t data) { } diff --git a/src/devices/bus/ql/opd_basic_master.h b/src/devices/bus/ql/opd_basic_master.h index d22b50eff8c..3592823dd2b 100644 --- a/src/devices/bus/ql/opd_basic_master.h +++ b/src/devices/bus/ql/opd_basic_master.h @@ -35,8 +35,8 @@ protected: virtual void device_start() override; // device_ql_expansion_card_interface overrides - virtual uint8_t read(address_space &space, offs_t offset, uint8_t data) override; - virtual void write(address_space &space, offs_t offset, uint8_t data) override; + virtual uint8_t read(offs_t offset, uint8_t data) override; + virtual void write(offs_t offset, uint8_t data) override; }; diff --git a/src/devices/bus/ql/pcml_qdisk.cpp b/src/devices/bus/ql/pcml_qdisk.cpp index 7b3d7b25e6c..ed92c569509 100644 --- a/src/devices/bus/ql/pcml_qdisk.cpp +++ b/src/devices/bus/ql/pcml_qdisk.cpp @@ -69,7 +69,7 @@ void pcml_q_disk_interface_device::device_start() // read - //------------------------------------------------- -uint8_t pcml_q_disk_interface_device::read(address_space &space, offs_t offset, uint8_t data) +uint8_t pcml_q_disk_interface_device::read(offs_t offset, uint8_t data) { return data; } @@ -79,6 +79,6 @@ uint8_t pcml_q_disk_interface_device::read(address_space &space, offs_t offset, // write - //------------------------------------------------- -void pcml_q_disk_interface_device::write(address_space &space, offs_t offset, uint8_t data) +void pcml_q_disk_interface_device::write(offs_t offset, uint8_t data) { } diff --git a/src/devices/bus/ql/pcml_qdisk.h b/src/devices/bus/ql/pcml_qdisk.h index e9904df6eb0..cedd3f953f7 100644 --- a/src/devices/bus/ql/pcml_qdisk.h +++ b/src/devices/bus/ql/pcml_qdisk.h @@ -35,8 +35,8 @@ protected: virtual void device_start() override; // device_ql_expansion_card_interface overrides - virtual uint8_t read(address_space &space, offs_t offset, uint8_t data) override; - virtual void write(address_space &space, offs_t offset, uint8_t data) override; + virtual uint8_t read(offs_t offset, uint8_t data) override; + virtual void write(offs_t offset, uint8_t data) override; }; diff --git a/src/devices/bus/ql/qubide.cpp b/src/devices/bus/ql/qubide.cpp index e88493048d9..10583d28023 100644 --- a/src/devices/bus/ql/qubide.cpp +++ b/src/devices/bus/ql/qubide.cpp @@ -202,7 +202,7 @@ void qubide_device::device_reset() // read - //------------------------------------------------- -uint8_t qubide_device::read(address_space &space, offs_t offset, uint8_t data) +uint8_t qubide_device::read(offs_t offset, uint8_t data) { if ((offset & 0xfc000) == m_base) { @@ -247,7 +247,7 @@ uint8_t qubide_device::read(address_space &space, offs_t offset, uint8_t data) // write - //------------------------------------------------- -void qubide_device::write(address_space &space, offs_t offset, uint8_t data) +void qubide_device::write(offs_t offset, uint8_t data) { if ((offset & 0xfc000) == m_base) { diff --git a/src/devices/bus/ql/qubide.h b/src/devices/bus/ql/qubide.h index 680e5e6b655..5e1ac6d1860 100644 --- a/src/devices/bus/ql/qubide.h +++ b/src/devices/bus/ql/qubide.h @@ -39,8 +39,8 @@ protected: virtual ioport_constructor device_input_ports() const override; // device_ql_expansion_card_interface overrides - virtual uint8_t read(address_space &space, offs_t offset, uint8_t data) override; - virtual void write(address_space &space, offs_t offset, uint8_t data) override; + virtual uint8_t read(offs_t offset, uint8_t data) override; + virtual void write(offs_t offset, uint8_t data) override; private: required_device<ata_interface_device> m_ata; diff --git a/src/devices/bus/ql/rom.h b/src/devices/bus/ql/rom.h index e337fb9f096..0c8ec4a6bca 100644 --- a/src/devices/bus/ql/rom.h +++ b/src/devices/bus/ql/rom.h @@ -50,8 +50,8 @@ public: virtual ~device_ql_rom_cartridge_card_interface(); virtual void romoeh_w(int state) { m_romoeh = state; } - virtual uint8_t read(address_space &space, offs_t offset, uint8_t data) { return data; } - virtual void write(address_space &space, offs_t offset, uint8_t data) { } + virtual uint8_t read(offs_t offset, uint8_t data) { return data; } + virtual void write(offs_t offset, uint8_t data) { } protected: device_ql_rom_cartridge_card_interface(const machine_config &mconfig, device_t &device); @@ -86,8 +86,8 @@ public: ql_rom_cartridge_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); // computer interface - uint8_t read(address_space &space, offs_t offset, uint8_t data) { if (m_card) data = m_card->read(space, offset, data); return data; } - void write(address_space &space, offs_t offset, uint8_t data) { if (m_card) m_card->write(space, offset, data); } + uint8_t read(offs_t offset, uint8_t data) { if (m_card) data = m_card->read(offset, data); return data; } + void write(offs_t offset, uint8_t data) { if (m_card) m_card->write(offset, data); } DECLARE_WRITE_LINE_MEMBER( romoeh_w ) { if (m_card) m_card->romoeh_w(state); } protected: diff --git a/src/devices/bus/ql/sandy_superdisk.cpp b/src/devices/bus/ql/sandy_superdisk.cpp index 19ee4ebbc9c..1af96f2de81 100644 --- a/src/devices/bus/ql/sandy_superdisk.cpp +++ b/src/devices/bus/ql/sandy_superdisk.cpp @@ -149,7 +149,7 @@ void sandy_super_disk_device::device_reset() // read - //------------------------------------------------- -uint8_t sandy_super_disk_device::read(address_space &space, offs_t offset, uint8_t data) +uint8_t sandy_super_disk_device::read(offs_t offset, uint8_t data) { if ((offset & 0xf0000) == 0xc0000) { @@ -195,7 +195,7 @@ uint8_t sandy_super_disk_device::read(address_space &space, offs_t offset, uint8 // write - //------------------------------------------------- -void sandy_super_disk_device::write(address_space &space, offs_t offset, uint8_t data) +void sandy_super_disk_device::write(offs_t offset, uint8_t data) { if ((offset & 0xf0000) == 0xc0000) { diff --git a/src/devices/bus/ql/sandy_superdisk.h b/src/devices/bus/ql/sandy_superdisk.h index 1bc7192aad5..5a264272e12 100644 --- a/src/devices/bus/ql/sandy_superdisk.h +++ b/src/devices/bus/ql/sandy_superdisk.h @@ -41,8 +41,8 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // device_ql_expansion_card_interface overrides - virtual uint8_t read(address_space &space, offs_t offset, uint8_t data) override; - virtual void write(address_space &space, offs_t offset, uint8_t data) override; + virtual uint8_t read(offs_t offset, uint8_t data) override; + virtual void write(offs_t offset, uint8_t data) override; private: WRITE_LINE_MEMBER( busy_w ); diff --git a/src/devices/bus/ql/sandy_superqboard.cpp b/src/devices/bus/ql/sandy_superqboard.cpp index 05ff550c47d..bc8f4c78478 100644 --- a/src/devices/bus/ql/sandy_superqboard.cpp +++ b/src/devices/bus/ql/sandy_superqboard.cpp @@ -285,7 +285,7 @@ void sandy_superqboard_device::device_reset() // read - //------------------------------------------------- -uint8_t sandy_superqboard_device::read(address_space &space, offs_t offset, uint8_t data) +uint8_t sandy_superqboard_device::read(offs_t offset, uint8_t data) { if ((offset & 0xf0000) == 0xc0000) { @@ -345,7 +345,7 @@ uint8_t sandy_superqboard_device::read(address_space &space, offs_t offset, uint // write - //------------------------------------------------- -void sandy_superqboard_device::write(address_space &space, offs_t offset, uint8_t data) +void sandy_superqboard_device::write(offs_t offset, uint8_t data) { if ((offset & 0xf0000) == 0xc0000) { diff --git a/src/devices/bus/ql/sandy_superqboard.h b/src/devices/bus/ql/sandy_superqboard.h index 94d2066020b..94bfe0c7dad 100644 --- a/src/devices/bus/ql/sandy_superqboard.h +++ b/src/devices/bus/ql/sandy_superqboard.h @@ -46,8 +46,8 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // device_ql_expansion_card_interface overrides - virtual uint8_t read(address_space &space, offs_t offset, uint8_t data) override; - virtual void write(address_space &space, offs_t offset, uint8_t data) override; + virtual uint8_t read(offs_t offset, uint8_t data) override; + virtual void write(offs_t offset, uint8_t data) override; private: WRITE_LINE_MEMBER( busy_w ); diff --git a/src/devices/bus/ql/std.cpp b/src/devices/bus/ql/std.cpp index 5e13a0ff32f..b1171c46336 100644 --- a/src/devices/bus/ql/std.cpp +++ b/src/devices/bus/ql/std.cpp @@ -47,7 +47,7 @@ void ql_standard_rom_cartridge_device::device_start() // read - cartridge data read //------------------------------------------------- -uint8_t ql_standard_rom_cartridge_device::read(address_space &space, offs_t offset, uint8_t data) +uint8_t ql_standard_rom_cartridge_device::read(offs_t offset, uint8_t data) { if (m_romoeh && m_rom.bytes()) { diff --git a/src/devices/bus/ql/std.h b/src/devices/bus/ql/std.h index b1b4e404c4c..823c3a70008 100644 --- a/src/devices/bus/ql/std.h +++ b/src/devices/bus/ql/std.h @@ -32,7 +32,7 @@ protected: virtual void device_start() override; // device_ql_rom_cartridge_card_interface overrides - virtual uint8_t read(address_space &space, offs_t offset, uint8_t data) override; + virtual uint8_t read(offs_t offset, uint8_t data) override; }; diff --git a/src/devices/bus/ql/trumpcard.cpp b/src/devices/bus/ql/trumpcard.cpp index bc515b7da9c..473fc9bb78e 100644 --- a/src/devices/bus/ql/trumpcard.cpp +++ b/src/devices/bus/ql/trumpcard.cpp @@ -167,7 +167,7 @@ void ql_trump_card_device::device_reset() // read - //------------------------------------------------- -uint8_t ql_trump_card_device::read(address_space &space, offs_t offset, uint8_t data) +uint8_t ql_trump_card_device::read(offs_t offset, uint8_t data) { if (offset >= 0xc000 && offset < 0x10000) { @@ -220,7 +220,7 @@ uint8_t ql_trump_card_device::read(address_space &space, offs_t offset, uint8_t // write - //------------------------------------------------- -void ql_trump_card_device::write(address_space &space, offs_t offset, uint8_t data) +void ql_trump_card_device::write(offs_t offset, uint8_t data) { if (offset >= 0x1c000 && offset <= 0x1c003) { diff --git a/src/devices/bus/ql/trumpcard.h b/src/devices/bus/ql/trumpcard.h index 4dc18ceccd4..d9926160928 100644 --- a/src/devices/bus/ql/trumpcard.h +++ b/src/devices/bus/ql/trumpcard.h @@ -42,8 +42,8 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // device_ql_expansion_card_interface overrides - virtual uint8_t read(address_space &space, offs_t offset, uint8_t data) override; - virtual void write(address_space &space, offs_t offset, uint8_t data) override; + virtual uint8_t read(offs_t offset, uint8_t data) override; + virtual void write(offs_t offset, uint8_t data) override; private: |