diff options
Diffstat (limited to 'src/devices/bus/tiki100')
-rw-r--r-- | src/devices/bus/tiki100/8088.cpp | 17 | ||||
-rw-r--r-- | src/devices/bus/tiki100/8088.h | 4 | ||||
-rw-r--r-- | src/devices/bus/tiki100/exp.cpp | 16 | ||||
-rw-r--r-- | src/devices/bus/tiki100/exp.h | 72 | ||||
-rw-r--r-- | src/devices/bus/tiki100/hdc.cpp | 8 | ||||
-rw-r--r-- | src/devices/bus/tiki100/hdc.h | 4 |
6 files changed, 51 insertions, 70 deletions
diff --git a/src/devices/bus/tiki100/8088.cpp b/src/devices/bus/tiki100/8088.cpp index f3a0e5d0dfd..0a940fcbc2c 100644 --- a/src/devices/bus/tiki100/8088.cpp +++ b/src/devices/bus/tiki100/8088.cpp @@ -64,14 +64,15 @@ void tiki100_8088_device::i8088_io(address_map &map) //------------------------------------------------- -// MACHINE_CONFIG_START( tiki100_8088 ) +// device_add_mconfig() //------------------------------------------------- -MACHINE_CONFIG_START(tiki100_8088_device::device_add_mconfig) - MCFG_DEVICE_ADD(I8088_TAG, I8088, 6000000) - MCFG_DEVICE_PROGRAM_MAP(i8088_mem) - MCFG_DEVICE_IO_MAP(i8088_io) -MACHINE_CONFIG_END +void tiki100_8088_device::device_add_mconfig(machine_config &config) +{ + I8088(config, m_maincpu, 6000000); + m_maincpu->set_addrmap(AS_PROGRAM, &tiki100_8088_device::i8088_mem); + m_maincpu->set_addrmap(AS_IO, &tiki100_8088_device::i8088_io); +} @@ -117,7 +118,7 @@ void tiki100_8088_device::device_reset() // tiki100bus_iorq_r - I/O read //------------------------------------------------- -uint8_t tiki100_8088_device::iorq_r(address_space &space, offs_t offset, uint8_t data) +uint8_t tiki100_8088_device::iorq_r(offs_t offset, uint8_t data) { if ((offset & 0xff) == 0x7f) { @@ -132,7 +133,7 @@ uint8_t tiki100_8088_device::iorq_r(address_space &space, offs_t offset, uint8_t // tiki100bus_iorq_w - I/O write //------------------------------------------------- -void tiki100_8088_device::iorq_w(address_space &space, offs_t offset, uint8_t data) +void tiki100_8088_device::iorq_w(offs_t offset, uint8_t data) { if ((offset & 0xff) == 0x7f) { diff --git a/src/devices/bus/tiki100/8088.h b/src/devices/bus/tiki100/8088.h index c9fcca86807..2e4e6966172 100644 --- a/src/devices/bus/tiki100/8088.h +++ b/src/devices/bus/tiki100/8088.h @@ -37,8 +37,8 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // device_tiki100bus_card_interface overrides - virtual uint8_t iorq_r(address_space &space, offs_t offset, uint8_t data) override; - virtual void iorq_w(address_space &space, offs_t offset, uint8_t data) override; + virtual uint8_t iorq_r(offs_t offset, uint8_t data) override; + virtual void iorq_w(offs_t offset, uint8_t data) override; private: required_device<i8088_cpu_device> m_maincpu; diff --git a/src/devices/bus/tiki100/exp.cpp b/src/devices/bus/tiki100/exp.cpp index 95aff70d106..2d3dfc22031 100644 --- a/src/devices/bus/tiki100/exp.cpp +++ b/src/devices/bus/tiki100/exp.cpp @@ -99,13 +99,13 @@ void tiki100_bus_device::add_card(device_tiki100bus_card_interface *card) // mrq_r - memory read //------------------------------------------------- -uint8_t tiki100_bus_device::mrq_r(address_space &space, offs_t offset, uint8_t data, bool &mdis) +uint8_t tiki100_bus_device::mrq_r(offs_t offset, uint8_t data, bool &mdis) { device_tiki100bus_card_interface *entry = m_device_list.first(); while (entry) { - data &= entry->mrq_r(space, offset, data, mdis); + data &= entry->mrq_r(offset, data, mdis); entry = entry->next(); } @@ -117,13 +117,13 @@ uint8_t tiki100_bus_device::mrq_r(address_space &space, offs_t offset, uint8_t d // mrq_w - memory write //------------------------------------------------- -WRITE8_MEMBER( tiki100_bus_device::mrq_w ) +void tiki100_bus_device::mrq_w(offs_t offset, uint8_t data) { device_tiki100bus_card_interface *entry = m_device_list.first(); while (entry) { - entry->mrq_w(space, offset, data); + entry->mrq_w(offset, data); entry = entry->next(); } } @@ -133,13 +133,13 @@ WRITE8_MEMBER( tiki100_bus_device::mrq_w ) // iorq_r - I/O read //------------------------------------------------- -uint8_t tiki100_bus_device::iorq_r(address_space &space, offs_t offset, uint8_t data) +uint8_t tiki100_bus_device::iorq_r(offs_t offset, uint8_t data) { device_tiki100bus_card_interface *entry = m_device_list.first(); while (entry) { - data &= entry->iorq_r(space, offset, data); + data &= entry->iorq_r(offset, data); entry = entry->next(); } @@ -151,13 +151,13 @@ uint8_t tiki100_bus_device::iorq_r(address_space &space, offs_t offset, uint8_t // iorq_w - I/O write //------------------------------------------------- -WRITE8_MEMBER( tiki100_bus_device::iorq_w ) +void tiki100_bus_device::iorq_w(offs_t offset, uint8_t data) { device_tiki100bus_card_interface *entry = m_device_list.first(); while (entry) { - entry->iorq_w(space, offset, data); + entry->iorq_w(offset, data); entry = entry->next(); } } diff --git a/src/devices/bus/tiki100/exp.h b/src/devices/bus/tiki100/exp.h index fb82a62fdce..9b0375daaa9 100644 --- a/src/devices/bus/tiki100/exp.h +++ b/src/devices/bus/tiki100/exp.h @@ -25,36 +25,6 @@ #define TIKI100_BUS_TAG "tiki100bus" - -//************************************************************************** -// INTERFACE CONFIGURATION MACROS -//************************************************************************** - -#define MCFG_TIKI100_BUS_ADD() \ - MCFG_DEVICE_ADD(TIKI100_BUS_TAG, TIKI100_BUS, 0) - -#define MCFG_TIKI100_BUS_SLOT_ADD(_tag, _def_slot) \ - MCFG_DEVICE_ADD(_tag, TIKI100_BUS_SLOT, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(tiki100_cards, _def_slot, false) - - -#define MCFG_TIKI100_BUS_IRQ_CALLBACK(_write) \ - downcast<tiki100_bus_device &>(*device).set_irq_wr_callback(DEVCB_##_write); - -#define MCFG_TIKI100_BUS_NMI_CALLBACK(_write) \ - downcast<tiki100_bus_device &>(*device).set_nmi_wr_callback(DEVCB_##_write); - -#define MCFG_TIKI100_BUS_BUSRQ_CALLBACK(_write) \ - downcast<tiki100_bus_device &>(*device).set_busrq_wr_callback(DEVCB_##_write); - -#define MCFG_TIKI100_BUS_IN_MREQ_CALLBACK(_read) \ - downcast<tiki100_bus_device &>(*device).set_mrq_rd_callback(DEVCB_##_read); - -#define MCFG_TIKI100_BUS_OUT_MREQ_CALLBACK(_write) \ - downcast<tiki100_bus_device &>(*device).set_mrq_wr_callback(DEVCB_##_write); - - - //************************************************************************** // TYPE DEFINITIONS //************************************************************************** @@ -76,12 +46,12 @@ public: device_tiki100bus_card_interface *next() const { return m_next; } // memory access - virtual uint8_t mrq_r(address_space &space, offs_t offset, uint8_t data, bool &mdis) { mdis = 1; return data; } - virtual void mrq_w(address_space &space, offs_t offset, uint8_t data) { } + virtual uint8_t mrq_r(offs_t offset, uint8_t data, bool &mdis) { mdis = 1; return data; } + virtual void mrq_w(offs_t offset, uint8_t data) { } // I/O access - virtual uint8_t iorq_r(address_space &space, offs_t offset, uint8_t data) { return data; } - virtual void iorq_w(address_space &space, offs_t offset, uint8_t data) { } + virtual uint8_t iorq_r(offs_t offset, uint8_t data) { return data; } + virtual void iorq_w(offs_t offset, uint8_t data) { } virtual void busak_w(int state) { m_busak = state; } @@ -111,7 +81,17 @@ class tiki100_bus_slot_device : public device_t, { public: // construction/destruction - tiki100_bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + template <typename T> + tiki100_bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, T &&opts, const char *dflt) + : tiki100_bus_slot_device(mconfig, tag, owner, 0) + { + option_reset(); + opts(*this); + set_default_option(dflt); + set_fixed(false); + } + + tiki100_bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); // device-level overrides virtual void device_start() override; @@ -142,20 +122,20 @@ public: tiki100_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); ~tiki100_bus_device() { m_device_list.detach_all(); } - template <class Object> devcb_base &set_irq_wr_callback(Object &&cb) { return m_irq_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_nmi_wr_callback(Object &&cb) { return m_nmi_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_busrq_wr_callback(Object &&cb) { return m_busrq_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_mrq_rd_callback(Object &&cb) { return m_in_mrq_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_mrq_wr_callback(Object &&cb) { return m_out_mrq_cb.set_callback(std::forward<Object>(cb)); } + auto irq_wr_callback() { return m_irq_cb.bind(); } + auto nmi_wr_callback() { return m_nmi_cb.bind(); } + auto busrq_wr_callback() { return m_busrq_cb.bind(); } + auto mrq_rd_callback() { return m_in_mrq_cb.bind(); } + auto mrq_wr_callback() { return m_out_mrq_cb.bind(); } void add_card(device_tiki100bus_card_interface *card); // computer interface - uint8_t mrq_r(address_space &space, offs_t offset, uint8_t data, bool &mdis); - DECLARE_WRITE8_MEMBER( mrq_w ); + uint8_t mrq_r(offs_t offset, uint8_t data, bool &mdis); + void mrq_w(offs_t offset, uint8_t data); - uint8_t iorq_r(address_space &space, offs_t offset, uint8_t data); - DECLARE_WRITE8_MEMBER( iorq_w ); + uint8_t iorq_r(offs_t offset, uint8_t data); + void iorq_w(offs_t offset, uint8_t data); DECLARE_WRITE_LINE_MEMBER( busak_w ); @@ -163,8 +143,8 @@ public: DECLARE_WRITE_LINE_MEMBER( irq_w ) { m_irq_cb(state); } DECLARE_WRITE_LINE_MEMBER( nmi_w ) { m_nmi_cb(state); } DECLARE_WRITE_LINE_MEMBER( busrq_w ) { m_busrq_cb(state); } - DECLARE_READ8_MEMBER( exin_mrq_r ) { return m_in_mrq_cb(offset); } - DECLARE_WRITE8_MEMBER( exin_mrq_w ) { m_out_mrq_cb(offset, data); } + uint8_t exin_mrq_r(offs_t offset) { return m_in_mrq_cb(offset); } + void exin_mrq_w(offs_t offset, uint8_t data) { m_out_mrq_cb(offset, data); } protected: // device-level overrides diff --git a/src/devices/bus/tiki100/hdc.cpp b/src/devices/bus/tiki100/hdc.cpp index 9a997119935..a351d83daca 100644 --- a/src/devices/bus/tiki100/hdc.cpp +++ b/src/devices/bus/tiki100/hdc.cpp @@ -85,11 +85,11 @@ void tiki100_hdc_device::device_reset() // tiki100bus_iorq_r - I/O read //------------------------------------------------- -uint8_t tiki100_hdc_device::iorq_r(address_space &space, offs_t offset, uint8_t data) +uint8_t tiki100_hdc_device::iorq_r(offs_t offset, uint8_t data) { if ((offset & 0xf8) == 0x20) { - data = m_hdc->read(space, offset & 0x07); + data = m_hdc->read(offset & 0x07); } return data; @@ -100,10 +100,10 @@ uint8_t tiki100_hdc_device::iorq_r(address_space &space, offs_t offset, uint8_t // tiki100bus_iorq_w - I/O write //------------------------------------------------- -void tiki100_hdc_device::iorq_w(address_space &space, offs_t offset, uint8_t data) +void tiki100_hdc_device::iorq_w(offs_t offset, uint8_t data) { if ((offset & 0xf8) == 0x20) { - m_hdc->write(space, offset, data); + m_hdc->write(offset, data); } } diff --git a/src/devices/bus/tiki100/hdc.h b/src/devices/bus/tiki100/hdc.h index 1c0447acff5..d38927ff004 100644 --- a/src/devices/bus/tiki100/hdc.h +++ b/src/devices/bus/tiki100/hdc.h @@ -36,8 +36,8 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // device_tiki100bus_card_interface overrides - virtual uint8_t iorq_r(address_space &space, offs_t offset, uint8_t data) override; - virtual void iorq_w(address_space &space, offs_t offset, uint8_t data) override; + virtual uint8_t iorq_r(offs_t offset, uint8_t data) override; + virtual void iorq_w(offs_t offset, uint8_t data) override; private: required_device<wd2010_device> m_hdc; |