summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine/z80dma.h
diff options
context:
space:
mode:
author ImJezze <jezze@gmx.net>2016-03-12 12:31:13 +0100
committer ImJezze <jezze@gmx.net>2016-03-12 12:31:13 +0100
commita026a582f1a0ea8c1ede3acaddacef506ef3f3b0 (patch)
treee31573822f2359677de519f9f3b600d98e8764cd /src/devices/machine/z80dma.h
parent477d2abd43984f076b7e45f5527591fa8fd0d241 (diff)
parentdcab55bf53b94713a6f72e9633f5101c8dd6c08c (diff)
Merge pull request #15 from mamedev/master
Sync to base master
Diffstat (limited to 'src/devices/machine/z80dma.h')
-rw-r--r--src/devices/machine/z80dma.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/devices/machine/z80dma.h b/src/devices/machine/z80dma.h
index fc1c3c1175c..0b1916c5d5f 100644
--- a/src/devices/machine/z80dma.h
+++ b/src/devices/machine/z80dma.h
@@ -111,13 +111,11 @@ private:
void do_transfer_write();
void do_search();
- static TIMER_CALLBACK( static_timerproc ) { reinterpret_cast<z80dma_device *>(ptr)->timerproc(); }
- void timerproc();
+ TIMER_CALLBACK_MEMBER(timerproc);
void update_status();
- static TIMER_CALLBACK( static_rdy_write_callback ) { reinterpret_cast<z80dma_device *>(ptr)->rdy_write_callback(param); }
- void rdy_write_callback(int state);
+ TIMER_CALLBACK_MEMBER(rdy_write_callback);
// internal state
devcb_write_line m_out_busreq_cb;