diff options
Diffstat (limited to 'src/mame/machine/partner.cpp')
-rw-r--r-- | src/mame/machine/partner.cpp | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/src/mame/machine/partner.cpp b/src/mame/machine/partner.cpp index 9aeeb9820e2..6d5ecff2a30 100644 --- a/src/mame/machine/partner.cpp +++ b/src/mame/machine/partner.cpp @@ -49,27 +49,29 @@ void partner_state::partner_window_2(uint8_t bank_num, uint16_t offset,uint8_t * } } -READ8_MEMBER(partner_state::partner_floppy_r){ +uint8_t partner_state::partner_floppy_r(offs_t offset) +{ if (offset<0x100) { switch(offset & 3) { - case 0x00 : return m_fdc->status_r(space, 0); - case 0x01 : return m_fdc->track_r(space, 0); - case 0x02 : return m_fdc->sector_r(space, 0); + case 0x00 : return m_fdc->status_r(); + case 0x01 : return m_fdc->track_r(); + case 0x02 : return m_fdc->sector_r(); default : - return m_fdc->data_r(space, 0); + return m_fdc->data_r(); } } else { return 0; } } -WRITE8_MEMBER(partner_state::partner_floppy_w){ +void partner_state::partner_floppy_w(offs_t offset, uint8_t data) +{ if (offset<0x100) { switch(offset & 3) { - case 0x00 : m_fdc->cmd_w(space, 0,data); break; - case 0x01 : m_fdc->track_w(space, 0,data);break; - case 0x02 : m_fdc->sector_w(space, 0,data);break; - default : m_fdc->data_w(space, 0,data);break; + case 0x00 : m_fdc->cmd_w(data); break; + case 0x01 : m_fdc->track_w(data);break; + case 0x02 : m_fdc->sector_w(data);break; + default : m_fdc->data_w(data);break; } } else { floppy_image_device *floppy0 = m_fdc->subdevice<floppy_connector>("0")->get_device(); @@ -99,8 +101,8 @@ void partner_state::partner_iomap_bank(uint8_t *rom) switch(m_win_mem_page) { case 2 : // FDD - space.install_write_handler(0xdc00, 0xddff, write8_delegate(FUNC(partner_state::partner_floppy_w),this)); - space.install_read_handler (0xdc00, 0xddff, read8_delegate(FUNC(partner_state::partner_floppy_r),this)); + space.install_write_handler(0xdc00, 0xddff, write8sm_delegate(FUNC(partner_state::partner_floppy_w),this)); + space.install_read_handler (0xdc00, 0xddff, read8sm_delegate(FUNC(partner_state::partner_floppy_r),this)); break; case 4 : // Timer @@ -314,13 +316,13 @@ void partner_state::partner_bank_switch() } } -WRITE8_MEMBER(partner_state::partner_win_memory_page_w) +void partner_state::partner_win_memory_page_w(uint8_t data) { m_win_mem_page = ~data; partner_bank_switch(); } -WRITE8_MEMBER(partner_state::partner_mem_page_w) +void partner_state::partner_mem_page_w(uint8_t data) { m_mem_page = (data >> 4) & 0x0f; partner_bank_switch(); @@ -346,7 +348,7 @@ I8275_DRAW_CHARACTER_MEMBER(partner_state::display_pixels) } } -MACHINE_RESET_MEMBER(partner_state,partner) +void partner_state::machine_reset() { m_mem_page = 0; m_win_mem_page = 0; |