diff options
Diffstat (limited to 'src/devices/bus/coco/coco_multi.cpp')
-rw-r--r-- | src/devices/bus/coco/coco_multi.cpp | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/src/devices/bus/coco/coco_multi.cpp b/src/devices/bus/coco/coco_multi.cpp index 1ffa00e3078..e35a7546a1a 100644 --- a/src/devices/bus/coco/coco_multi.cpp +++ b/src/devices/bus/coco/coco_multi.cpp @@ -78,7 +78,7 @@ // MACROS / CONSTANTS //************************************************************************** -static constexpr uint8_t MULTI_SLOT_LOOKUP[] = {0xcc, 0xdd, 0xee, 0xff}; +static constexpr u8 MULTI_SLOT_LOOKUP[] = {0xcc, 0xdd, 0xee, 0xff}; //************************************************************************** // TYPE DEFINITIONS @@ -95,7 +95,7 @@ namespace { public: // construction/destruction - coco_multipak_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + coco_multipak_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); INPUT_CHANGED_MEMBER( switch_changed ); @@ -103,17 +103,17 @@ namespace // device-level overrides virtual void device_start() override; virtual void device_reset() override; - virtual READ8_MEMBER(cts_read) override; - virtual WRITE8_MEMBER(cts_write) override; - virtual READ8_MEMBER(scs_read) override; - virtual WRITE8_MEMBER(scs_write) override; + virtual u8 cts_read(offs_t offset) override; + virtual void cts_write(offs_t offset, u8 data) override; + virtual u8 scs_read(offs_t offset) override; + virtual void scs_write(offs_t offset, u8 data) override; virtual void set_sound_enable(bool sound_enable) override; // optional information overrides virtual void device_add_mconfig(machine_config &config) override; - virtual uint8_t* get_cart_base() override; - virtual uint32_t get_cart_size() override; + virtual u8 *get_cart_base() override; + virtual u32 get_cart_size() override; virtual address_space &cartridge_space() override; virtual ioport_constructor device_input_ports() const override; @@ -123,8 +123,8 @@ namespace required_device_array<cococart_slot_device, 4> m_slots; // internal state - uint8_t m_select; - uint8_t m_block; + u8 m_select; + u8 m_block; // internal accessors int active_scs_slot_number() const; @@ -134,9 +134,9 @@ namespace cococart_slot_device &active_cts_slot(); // methods - void set_select(uint8_t new_select); - DECLARE_READ8_MEMBER(ff7f_read); - DECLARE_WRITE8_MEMBER(ff7f_write); + void set_select(u8 new_select); + u8 ff7f_read(); + void ff7f_write(u8 data); void update_line(int slot_number, line ln); DECLARE_WRITE_LINE_MEMBER(multi_slot1_cart_w); @@ -240,7 +240,7 @@ ioport_constructor coco_multipak_device::device_input_ports() const // coco_multipak_device - constructor //------------------------------------------------- -coco_multipak_device::coco_multipak_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +coco_multipak_device::coco_multipak_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) : device_t(mconfig, COCO_MULTIPAK, tag, owner, clock) , device_cococart_interface(mconfig, *this) , m_slots(*this, "slot%u", 1), m_select(0), m_block(0) @@ -255,7 +255,7 @@ coco_multipak_device::coco_multipak_device(const machine_config &mconfig, const void coco_multipak_device::device_start() { // install $FF7F handler - install_readwrite_handler(0xFF7F, 0xFF7F, read8_delegate(*this, FUNC(coco_multipak_device::ff7f_read)), write8_delegate(*this, FUNC(coco_multipak_device::ff7f_write))); + install_readwrite_handler(0xFF7F, 0xFF7F, read8smo_delegate(*this, FUNC(coco_multipak_device::ff7f_read)), write8smo_delegate(*this, FUNC(coco_multipak_device::ff7f_write))); // initial state m_select = 0xFF; @@ -354,7 +354,7 @@ cococart_slot_device &coco_multipak_device::active_cts_slot() // set_select //------------------------------------------------- -void coco_multipak_device::set_select(uint8_t new_select) +void coco_multipak_device::set_select(u8 new_select) { // identify old value for CART, in case this needs to change cococart_slot_device::line_value old_cart = active_cts_slot().get_line_value(line::CART); @@ -375,7 +375,7 @@ void coco_multipak_device::set_select(uint8_t new_select) // ff7f_read //------------------------------------------------- -READ8_MEMBER(coco_multipak_device::ff7f_read) +u8 coco_multipak_device::ff7f_read() { return m_select | 0xcc; } @@ -384,7 +384,7 @@ READ8_MEMBER(coco_multipak_device::ff7f_read) // ff7f_write //------------------------------------------------- -WRITE8_MEMBER(coco_multipak_device::ff7f_write) +void coco_multipak_device::ff7f_write(u8 data) { m_block = 0xff; set_select(data); @@ -440,7 +440,7 @@ void coco_multipak_device::set_sound_enable(bool sound_enable) // get_cart_base //------------------------------------------------- -uint8_t* coco_multipak_device::get_cart_base() +u8 *coco_multipak_device::get_cart_base() { return active_cts_slot().get_cart_base(); } @@ -450,7 +450,7 @@ uint8_t* coco_multipak_device::get_cart_base() // get_cart_size //------------------------------------------------- -uint32_t coco_multipak_device::get_cart_size() +u32 coco_multipak_device::get_cart_size() { return active_cts_slot().get_cart_size(); } @@ -460,9 +460,9 @@ uint32_t coco_multipak_device::get_cart_size() // cts_read //------------------------------------------------- -READ8_MEMBER(coco_multipak_device::cts_read) +u8 coco_multipak_device::cts_read(offs_t offset) { - return active_cts_slot().cts_read(space, offset); + return active_cts_slot().cts_read(offset); } @@ -470,9 +470,9 @@ READ8_MEMBER(coco_multipak_device::cts_read) // cts_write //------------------------------------------------- -WRITE8_MEMBER(coco_multipak_device::cts_write) +void coco_multipak_device::cts_write(offs_t offset, u8 data) { - active_cts_slot().cts_write(space, offset, data); + active_cts_slot().cts_write(offset, data); } @@ -480,9 +480,9 @@ WRITE8_MEMBER(coco_multipak_device::cts_write) // scs_read //------------------------------------------------- -READ8_MEMBER(coco_multipak_device::scs_read) +u8 coco_multipak_device::scs_read(offs_t offset) { - return active_scs_slot().scs_read(space, offset); + return active_scs_slot().scs_read(offset); } @@ -490,9 +490,9 @@ READ8_MEMBER(coco_multipak_device::scs_read) // scs_write //------------------------------------------------- -WRITE8_MEMBER(coco_multipak_device::scs_write) +void coco_multipak_device::scs_write(offs_t offset, u8 data) { - active_scs_slot().scs_write(space, offset, data); + active_scs_slot().scs_write(offset, data); } |