diff options
author | 2023-05-31 17:43:46 +0200 | |
---|---|---|
committer | 2023-06-01 01:43:46 +1000 | |
commit | 9f661e567c4528e7f7f662209e4b677f12b99875 (patch) | |
tree | 5dbd6f4cc4c274c296511dbde1d802d68dea4743 /src/mame/apple/macii.cpp | |
parent | a9935073709fffa95130ef1b7ea701c3a2325b9b (diff) |
emu/device.h: Removed device (READ|WRITE)_LINE_MEMBER in favor of explicit function signatures. (#11283) [Ryan Holtz]
Diffstat (limited to 'src/mame/apple/macii.cpp')
-rw-r--r-- | src/mame/apple/macii.cpp | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/mame/apple/macii.cpp b/src/mame/apple/macii.cpp index bc55873f9d2..005b631c406 100644 --- a/src/mame/apple/macii.cpp +++ b/src/mame/apple/macii.cpp @@ -151,7 +151,7 @@ private: // ADB refresh timer, independent of anything else going on emu_timer *m_adbupdate_timer = nullptr; - WRITE_LINE_MEMBER(adb_irq_w) { m_adb_irq_pending = state; } + void adb_irq_w(int state) { m_adb_irq_pending = state; } // this is shared among all video setups with vram optional_shared_ptr<uint32_t> m_vram; @@ -163,7 +163,7 @@ private: void set_memory_overlay(int overlay); void scc_mouse_irq( int x, int y ); void nubus_slot_interrupt(uint8_t slot, uint32_t state); - DECLARE_WRITE_LINE_MEMBER(set_scc_interrupt); + void set_scc_interrupt(int state); void set_via_interrupt(int value); void set_via2_interrupt(int value); void field_interrupts(); @@ -185,10 +185,10 @@ private: void macii_scsi_drq_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); void scsi_berr_w(uint8_t data); - template <int Slot> DECLARE_WRITE_LINE_MEMBER(nubus_irq_w); + template <int Slot> void nubus_irq_w(int state); - DECLARE_WRITE_LINE_MEMBER(mac_scsi_irq); - DECLARE_WRITE_LINE_MEMBER(mac_asc_irq); + void mac_scsi_irq(int state); + void mac_asc_irq(int state); void macii_map(address_map &map); void macse30_map(address_map &map); @@ -211,7 +211,7 @@ private: TIMER_CALLBACK_MEMBER(mac_adbrefresh_tick); TIMER_CALLBACK_MEMBER(mac_scanline_tick); - DECLARE_WRITE_LINE_MEMBER(mac_adb_via_out_cb2); + void mac_adb_via_out_cb2(int state); uint8_t mac_via_in_a(); uint8_t mac_via_in_b(); void mac_via_out_a(uint8_t data); @@ -221,8 +221,8 @@ private: void mac_via2_out_a(uint8_t data); void mac_via2_out_b(uint8_t data); void mac_state_load(); - DECLARE_WRITE_LINE_MEMBER(mac_via_irq); - DECLARE_WRITE_LINE_MEMBER(mac_via2_irq); + void mac_via_irq(int state); + void mac_via2_irq(int state); void mac_driver_init(model_t model); void mac_install_memory(offs_t memory_begin, offs_t memory_end, offs_t memory_size, void *memory_data, int is_rom); }; @@ -302,7 +302,7 @@ void mac_state::field_interrupts() } } -WRITE_LINE_MEMBER(mac_state::set_scc_interrupt) +void mac_state::set_scc_interrupt(int state) { m_scc_interrupt = state; this->field_interrupts(); @@ -320,7 +320,7 @@ void mac_state::set_via2_interrupt(int value) this->field_interrupts(); } -WRITE_LINE_MEMBER(mac_state::mac_asc_irq) +void mac_state::mac_asc_irq(int state) { m_via2->write_cb1(state ^ 1); } @@ -478,7 +478,7 @@ void mac_state::macii_scsi_w(offs_t offset, uint16_t data, uint16_t mem_mask) m_scsihelp->write_wrapper(pseudo_dma, reg, data >> 8); } -WRITE_LINE_MEMBER(mac_state::mac_scsi_irq) +void mac_state::mac_scsi_irq(int state) { } @@ -536,7 +536,7 @@ void mac_state::mac_iwm_w(offs_t offset, uint16_t data, uint16_t mem_mask) m_maincpu->adjust_icount(-5); } -WRITE_LINE_MEMBER(mac_state::mac_adb_via_out_cb2) +void mac_state::mac_adb_via_out_cb2(int state) { // printf("VIA OUT CB2 = %x\n", state); #if !MACII_USE_ADBMODEM @@ -661,7 +661,7 @@ void mac_state::mac_via_out_b(uint8_t data) m_rtc->clk_w((data >> 1) & 0x01); } -WRITE_LINE_MEMBER(mac_state::mac_via_irq) +void mac_state::mac_via_irq(int state) { /* interrupt the 68k (level 1) */ set_via_interrupt(state); @@ -722,7 +722,7 @@ void mac_state::mac_via_w(offs_t offset, uint16_t data, uint16_t mem_mask) * VIA 2 (on Mac IIs, PowerBooks > 100, and PowerMacs) * *************************************************************************/ -WRITE_LINE_MEMBER(mac_state::mac_via2_irq) +void mac_state::mac_via2_irq(int state) { set_via2_interrupt(state); } @@ -961,17 +961,17 @@ TIMER_CALLBACK_MEMBER(mac_state::mac_scanline_tick) m_scanline_timer->adjust(m_screen->time_until_pos(next_scanline), next_scanline); } -template <int Slot> WRITE_LINE_MEMBER(mac_state::nubus_irq_w) +template <int Slot> void mac_state::nubus_irq_w(int state) { nubus_slot_interrupt(Slot, state); } -template WRITE_LINE_MEMBER(mac_state::nubus_irq_w<9>); -template WRITE_LINE_MEMBER(mac_state::nubus_irq_w<0xa>); -template WRITE_LINE_MEMBER(mac_state::nubus_irq_w<0xb>); -template WRITE_LINE_MEMBER(mac_state::nubus_irq_w<0xc>); -template WRITE_LINE_MEMBER(mac_state::nubus_irq_w<0xd>); -template WRITE_LINE_MEMBER(mac_state::nubus_irq_w<0xe>); +template void mac_state::nubus_irq_w<9>(int state); +template void mac_state::nubus_irq_w<0xa>(int state); +template void mac_state::nubus_irq_w<0xb>(int state); +template void mac_state::nubus_irq_w<0xc>(int state); +template void mac_state::nubus_irq_w<0xd>(int state); +template void mac_state::nubus_irq_w<0xe>(int state); void mac_state::phases_w(uint8_t phases) { |