diff options
Diffstat (limited to 'src/devices/bus/ecbbus/grip.h')
-rw-r--r-- | src/devices/bus/ecbbus/grip.h | 43 |
1 files changed, 20 insertions, 23 deletions
diff --git a/src/devices/bus/ecbbus/grip.h b/src/devices/bus/ecbbus/grip.h index d1e1456eb57..289b91eb850 100644 --- a/src/devices/bus/ecbbus/grip.h +++ b/src/devices/bus/ecbbus/grip.h @@ -52,17 +52,17 @@ protected: virtual void ecbbus_io_w(offs_t offset, uint8_t data) override; private: - DECLARE_READ8_MEMBER( ppi_pa_r ); - DECLARE_WRITE8_MEMBER( ppi_pa_w ); - DECLARE_READ8_MEMBER( ppi_pb_r ); - DECLARE_WRITE8_MEMBER( ppi_pc_w ); - DECLARE_READ8_MEMBER( sti_gpio_r ); - DECLARE_WRITE_LINE_MEMBER( speaker_w ); + uint8_t ppi_pa_r(); + void ppi_pa_w(uint8_t data); + uint8_t ppi_pb_r(); + void ppi_pc_w(uint8_t data); + uint8_t sti_gpio_r(); + void speaker_w(int state); void kb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( write_centronics_busy ); - DECLARE_WRITE_LINE_MEMBER( write_centronics_fault ); + void write_centronics_busy(int state); + void write_centronics_fault(int state); MC6845_UPDATE_ROW( crtc_update_row ); @@ -72,7 +72,7 @@ private: required_device<centronics_device> m_centronics; required_device<palette_device> m_palette; required_device<speaker_sound_device> m_speaker; - optional_shared_ptr<uint8_t> m_video_ram; + memory_share_creator<uint8_t> m_video_ram; required_ioport m_j3a; required_ioport m_j3b; required_ioport m_j7; @@ -100,26 +100,23 @@ private: uint8_t m_ppi_pa; // PPI port A data uint8_t m_ppi_pc; // PPI port C data - // timers - emu_timer *m_kb_timer; - - DECLARE_WRITE8_MEMBER( vol0_w ); - DECLARE_WRITE8_MEMBER( vol1_w ); - DECLARE_WRITE8_MEMBER( flash_w ); - DECLARE_WRITE8_MEMBER( page_w ); - DECLARE_READ8_MEMBER( stat_r ); - DECLARE_READ8_MEMBER( lrs_r ); - DECLARE_WRITE8_MEMBER( lrs_w ); - DECLARE_READ8_MEMBER( cxstb_r ); - DECLARE_WRITE8_MEMBER( cxstb_w ); + void vol0_w(uint8_t data); + void vol1_w(uint8_t data); + void flash_w(uint8_t data); + void page_w(uint8_t data); + uint8_t stat_r(); + uint8_t lrs_r(); + void lrs_w(uint8_t data); + uint8_t cxstb_r(); + void cxstb_w(uint8_t data); void grip_io(address_map &map); void grip_mem(address_map &map); /* required_device<hd6345_device> m_crtc; - DECLARE_WRITE8_MEMBER( eprom_w ); - DECLARE_WRITE8_MEMBER( dpage_w ); + void eprom_w(uint8_t data); + void dpage_w(uint8_t data); // video state int m_dpage; // displayed video page |