diff options
Diffstat (limited to 'src/devices/bus/cbmiec/c1541.h')
-rw-r--r-- | src/devices/bus/cbmiec/c1541.h | 43 |
1 files changed, 21 insertions, 22 deletions
diff --git a/src/devices/bus/cbmiec/c1541.h b/src/devices/bus/cbmiec/c1541.h index 36310429f63..09e12a0f265 100644 --- a/src/devices/bus/cbmiec/c1541.h +++ b/src/devices/bus/cbmiec/c1541.h @@ -68,19 +68,19 @@ private: inline void set_iec_data(); - DECLARE_WRITE_LINE_MEMBER( via0_irq_w ); - virtual DECLARE_READ8_MEMBER( via0_pa_r ); - DECLARE_WRITE8_MEMBER( via0_pa_w ); - DECLARE_READ8_MEMBER( via0_pb_r ); - DECLARE_WRITE8_MEMBER( via0_pb_w ); - DECLARE_WRITE_LINE_MEMBER( via0_ca2_w ); - DECLARE_WRITE_LINE_MEMBER( via1_irq_w ); - DECLARE_READ8_MEMBER( via1_pb_r ); - DECLARE_WRITE8_MEMBER( via1_pb_w ); - DECLARE_WRITE_LINE_MEMBER( atn_w ); - DECLARE_WRITE_LINE_MEMBER( byte_w ); - - DECLARE_FLOPPY_FORMATS( floppy_formats ); + void via0_irq_w(int state); + virtual uint8_t via0_pa_r(); + void via0_pa_w(uint8_t data); + uint8_t via0_pb_r(); + void via0_pb_w(uint8_t data); + void via0_ca2_w(int state); + void via1_irq_w(int state); + uint8_t via1_pb_r(); + void via1_pb_w(uint8_t data); + void atn_w(int state); + void byte_w(int state); + + static void floppy_formats(format_registration &fr); required_device<via6522_device> m_via0; required_device<via6522_device> m_via1; @@ -139,8 +139,7 @@ protected: virtual void device_add_mconfig(machine_config &config) override; private: - // not really public - virtual DECLARE_READ8_MEMBER( via0_pa_r ) override; + virtual uint8_t via0_pa_r() override; }; @@ -265,13 +264,13 @@ private: required_device<output_latch_device> m_cent_data_out; required_memory_region m_mmu_rom; - DECLARE_READ8_MEMBER( pia_r ); - DECLARE_WRITE8_MEMBER( pia_w ); - DECLARE_WRITE8_MEMBER( pia_pa_w ); - DECLARE_READ8_MEMBER( pia_pb_r ); - DECLARE_WRITE8_MEMBER( pia_pb_w ); - DECLARE_READ8_MEMBER( read ); - DECLARE_WRITE8_MEMBER( write ); + uint8_t pia_r(offs_t offset); + void pia_w(offs_t offset, uint8_t data); + void pia_pa_w(uint8_t data); + uint8_t pia_pb_r(); + void pia_pb_w(uint8_t data); + uint8_t read(); + void write(uint8_t data); void c1541pdc_mem(address_map &map); }; |