diff options
Diffstat (limited to 'src/mame/drivers/olyboss.cpp')
-rw-r--r-- | src/mame/drivers/olyboss.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/mame/drivers/olyboss.cpp b/src/mame/drivers/olyboss.cpp index a6d5ec61508..6bb254bad2b 100644 --- a/src/mame/drivers/olyboss.cpp +++ b/src/mame/drivers/olyboss.cpp @@ -87,27 +87,27 @@ protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; private: - DECLARE_READ8_MEMBER(keyboard_read); + uint8_t keyboard_read(); UPD3301_DRAW_CHARACTER_MEMBER( olyboss_display_pixels ); DECLARE_WRITE_LINE_MEMBER( hrq_w ); DECLARE_WRITE_LINE_MEMBER( tc_w ); DECLARE_WRITE_LINE_MEMBER( romdis_w ); - DECLARE_READ8_MEMBER( dma_mem_r ); - DECLARE_WRITE8_MEMBER( dma_mem_w ); + uint8_t dma_mem_r(offs_t offset); + void dma_mem_w(offs_t offset, uint8_t data); DECLARE_READ8_MEMBER( fdcctrl_r ); DECLARE_WRITE8_MEMBER( fdcctrl_w ); DECLARE_WRITE8_MEMBER( fdcctrl85_w ); - DECLARE_READ8_MEMBER( fdcdma_r ); - DECLARE_WRITE8_MEMBER( fdcdma_w ); - DECLARE_WRITE8_MEMBER( crtcdma_w ); + uint8_t fdcdma_r(); + void fdcdma_w(uint8_t data); + void crtcdma_w(uint8_t data); DECLARE_READ8_MEMBER( rom_r ); DECLARE_WRITE8_MEMBER( rom_w ); DECLARE_WRITE8_MEMBER( vchrmap_w ); DECLARE_WRITE8_MEMBER( vchrram_w ); DECLARE_WRITE8_MEMBER( vchrram85_w ); - DECLARE_WRITE8_MEMBER( ppic_w ); + void ppic_w(uint8_t data); void olyboss_io(address_map &map); void olyboss_mem(address_map &map); void olyboss85_io(address_map &map); @@ -282,7 +282,7 @@ UPD3301_DRAW_CHARACTER_MEMBER( olyboss_state::olyboss_display_pixels ) // KEYBOARD //************************************************************************** -READ8_MEMBER( olyboss_state::keyboard_read ) +uint8_t olyboss_state::keyboard_read() { //logerror ("keyboard_read offs [%d]\n",offset); if (m_keybhit) @@ -295,7 +295,7 @@ READ8_MEMBER( olyboss_state::keyboard_read ) return 0x00; } -WRITE8_MEMBER( olyboss_state::ppic_w ) +void olyboss_state::ppic_w(uint8_t data) { m_uic->ireq4_w(BIT(data, 5) ? CLEAR_LINE : ASSERT_LINE); m_fdcctrl = (m_fdcctrl & ~0x10) | (BIT(data, 5) ? 0x10 : 0); @@ -351,31 +351,31 @@ WRITE_LINE_MEMBER( olyboss_state::tc_w ) } } -READ8_MEMBER( olyboss_state::dma_mem_r ) +uint8_t olyboss_state::dma_mem_r(offs_t offset) { address_space &program = m_maincpu->space(AS_PROGRAM); return program.read_byte(offset); } -WRITE8_MEMBER( olyboss_state::dma_mem_w ) +void olyboss_state::dma_mem_w(offs_t offset, uint8_t data) { address_space &program = m_maincpu->space(AS_PROGRAM); program.write_byte(offset, data); } -READ8_MEMBER( olyboss_state::fdcdma_r ) +uint8_t olyboss_state::fdcdma_r() { m_channel = 0; return m_fdc->dma_r(); } -WRITE8_MEMBER( olyboss_state::fdcdma_w ) +void olyboss_state::fdcdma_w(uint8_t data) { m_channel = 0; m_fdc->dma_w(data); } -WRITE8_MEMBER( olyboss_state::crtcdma_w ) +void olyboss_state::crtcdma_w(uint8_t data) { m_channel = 2; m_crtc->dack_w(data); |