diff options
Diffstat (limited to 'src/devices/bus/coco/coco_t4426.cpp')
-rw-r--r-- | src/devices/bus/coco/coco_t4426.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/devices/bus/coco/coco_t4426.cpp b/src/devices/bus/coco/coco_t4426.cpp index 47a1421ed1a..e01962e1dd3 100644 --- a/src/devices/bus/coco/coco_t4426.cpp +++ b/src/devices/bus/coco/coco_t4426.cpp @@ -95,15 +95,15 @@ namespace { public: // construction/destruction - coco_t4426_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + coco_t4426_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); // optional information overrides virtual void device_add_mconfig(machine_config &config) override; virtual const tiny_rom_entry *device_rom_region() const override; virtual ioport_constructor device_input_ports() const override; - virtual uint8_t* get_cart_base() override; - void pia_A_w(uint8_t data); + virtual u8 *get_cart_base() override; + void pia_A_w(u8 data); // Clocks void write_acia_clocks(int id, int state); @@ -117,7 +117,7 @@ namespace DECLARE_WRITE_LINE_MEMBER (write_f13_clock){ write_acia_clocks(mc14411_device::TIMER_F13, state); } DECLARE_WRITE_LINE_MEMBER (write_f15_clock){ write_acia_clocks(mc14411_device::TIMER_F15, state); } protected: - coco_t4426_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + coco_t4426_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); // device-level overrides virtual void device_start() override; @@ -125,13 +125,13 @@ namespace // internal state device_image_interface *m_cart; - uint8_t m_select; + u8 m_select; optional_ioport m_autostart; - virtual DECLARE_READ8_MEMBER(cts_read) override; - virtual DECLARE_READ8_MEMBER(scs_read) override; - virtual DECLARE_WRITE8_MEMBER(scs_write) override; + virtual u8 cts_read(offs_t offset) override; + virtual u8 scs_read(offs_t offset) override; + virtual void scs_write(offs_t offset, u8 data) override; private: // internal state required_memory_region m_eprom; @@ -236,7 +236,7 @@ DEFINE_DEVICE_TYPE_PRIVATE(COCO_T4426, device_cococart_interface, coco_t4426_dev // coco_t4426_device - constructor //------------------------------------------------- -coco_t4426_device::coco_t4426_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +coco_t4426_device::coco_t4426_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) : device_t(mconfig, type, tag, owner, clock) , device_cococart_interface(mconfig, *this) , m_cart(nullptr) @@ -251,7 +251,7 @@ coco_t4426_device::coco_t4426_device(const machine_config &mconfig, device_type { } -coco_t4426_device::coco_t4426_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +coco_t4426_device::coco_t4426_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) : coco_t4426_device(mconfig, COCO_T4426, tag, owner, clock) { } @@ -326,9 +326,9 @@ void coco_t4426_device::write_acia_clocks(int id, int state) ACIA is located at ff48-ff4F with A1 = 1 -------------------------------------------------*/ -READ8_MEMBER(coco_t4426_device::scs_read) +u8 coco_t4426_device::scs_read(offs_t offset) { - uint8_t result = 0x00; + u8 result = 0x00; LOG("%s Offs:%d\n", FUNCNAME, offset); @@ -358,7 +358,7 @@ READ8_MEMBER(coco_t4426_device::scs_read) ACIA is located at ff48-ff4F with A1 = 1 -------------------------------------------------*/ -WRITE8_MEMBER(coco_t4426_device::scs_write) +void coco_t4426_device::scs_write(offs_t offset, u8 data) { LOG("%s Offs:%d Data:%02x\n", FUNCNAME, offset, data); LOGSETUP(" * Offs:%02x <- %02x\n", offset, data); @@ -397,7 +397,7 @@ WRITE8_MEMBER(coco_t4426_device::scs_write) #define ROM6 (~0x40 & 0xff) #define ROM7 (~0x80 & 0xff) -void coco_t4426_device::pia_A_w(uint8_t data) +void coco_t4426_device::pia_A_w(u8 data) { LOGPIA("%s(%02x)\n", FUNCNAME, data); m_select = data; @@ -407,9 +407,9 @@ void coco_t4426_device::pia_A_w(uint8_t data) cts_read -------------------------------------------------*/ -READ8_MEMBER(coco_t4426_device::cts_read) +u8 coco_t4426_device::cts_read(offs_t offset) { - uint8_t result = 0x00; + u8 result = 0x00; switch (offset & 0x2000) { @@ -440,7 +440,7 @@ READ8_MEMBER(coco_t4426_device::cts_read) get_cart_base -------------------------------------------------*/ -uint8_t* coco_t4426_device::get_cart_base() +u8 *coco_t4426_device::get_cart_base() { LOG("%s - m_select %02x -> %02x\n", FUNCNAME, m_select, ~m_select & 0xff ); return memregion(CARTSLOT_TAG)->base(); |