diff options
author | Miodrag Milanovic <mmicko@gmail.com> | 2013-02-18 12:17:41 +0000 |
---|---|---|
committer | Miodrag Milanovic <mmicko@gmail.com> | 2013-02-18 12:17:41 +0000 |
commit | 8882b5f7f86e08100f46ad6ff0504b2061fc6770 (patch) | |
tree | 8a642176e26a6f2e5f3aef1fb5ca70a468f22443 /src/mess/drivers/fk1.c | |
parent | fb972fd2b5e449de199ad51faf64a7ddc93f5b3b (diff) |
IRQ_CALLBACK_MEMBER cleanup (no whatsnew)
Diffstat (limited to 'src/mess/drivers/fk1.c')
-rw-r--r-- | src/mess/drivers/fk1.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/mess/drivers/fk1.c b/src/mess/drivers/fk1.c index 50e3af653fd..9ad7fa07149 100644 --- a/src/mess/drivers/fk1.c +++ b/src/mess/drivers/fk1.c @@ -54,6 +54,7 @@ public: UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(keyboard_callback); TIMER_DEVICE_CALLBACK_MEMBER(vsync_callback); + IRQ_CALLBACK_MEMBER(fk1_irq_callback); }; @@ -404,12 +405,10 @@ TIMER_DEVICE_CALLBACK_MEMBER(fk1_state::keyboard_callback) 0 ? PRINTER */ -static IRQ_CALLBACK (fk1_irq_callback) +IRQ_CALLBACK_MEMBER(fk1_state::fk1_irq_callback) { - fk1_state *state = device->machine().driver_data<fk1_state>(); - - logerror("IRQ %02x\n", state->m_int_vector*2); - return state->m_int_vector * 2; + logerror("IRQ %02x\n", m_int_vector*2); + return m_int_vector * 2; } TIMER_DEVICE_CALLBACK_MEMBER(fk1_state::vsync_callback) @@ -430,7 +429,7 @@ void fk1_state::machine_reset() membank("bank3")->set_base(ram + 0x8000); membank("bank4")->set_base(ram + 0xc000); - machine().device("maincpu")->execute().set_irq_acknowledge_callback(fk1_irq_callback); + machine().device("maincpu")->execute().set_irq_acknowledge_callback(device_irq_acknowledge_delegate(FUNC(fk1_state::fk1_irq_callback),this)); } UINT32 fk1_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) |