summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/cpu/psx
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2012-09-24 14:09:14 +0000
committer Miodrag Milanovic <mmicko@gmail.com>2012-09-24 14:09:14 +0000
commitef6f5d0a52b1cbbc1418a248da72122e6958a958 (patch)
tree4dd325f2232bb5f4f9349599555846552d360d6c /src/emu/cpu/psx
parent7a7fa028bdc4fe10253488ffb180fc113eb2a14a (diff)
Introducing TIMER_CALLBACK_MEMBER and modernization part 1 (no whatsnew)
Diffstat (limited to 'src/emu/cpu/psx')
-rw-r--r--src/emu/cpu/psx/dma.c2
-rw-r--r--src/emu/cpu/psx/dma.h2
-rw-r--r--src/emu/cpu/psx/rcnt.c2
-rw-r--r--src/emu/cpu/psx/rcnt.h2
-rw-r--r--src/emu/cpu/psx/sio.c2
-rw-r--r--src/emu/cpu/psx/sio.h2
6 files changed, 6 insertions, 6 deletions
diff --git a/src/emu/cpu/psx/dma.c b/src/emu/cpu/psx/dma.c
index a877bb9a142..a088d94cdaa 100644
--- a/src/emu/cpu/psx/dma.c
+++ b/src/emu/cpu/psx/dma.c
@@ -190,7 +190,7 @@ void psxdma_device::dma_finished( int index )
dma_stop_timer( index );
}
-void psxdma_device::dma_finished_callback(void *ptr, int param)
+TIMER_CALLBACK_MEMBER(psxdma_device::dma_finished_callback)
{
dma_finished(param);
}
diff --git a/src/emu/cpu/psx/dma.h b/src/emu/cpu/psx/dma.h
index 64ef298ccf5..20d45a2b879 100644
--- a/src/emu/cpu/psx/dma.h
+++ b/src/emu/cpu/psx/dma.h
@@ -51,7 +51,7 @@ private:
void dma_timer_adjust( int n_channel );
void dma_interrupt_update();
void dma_finished( int n_channel );
- void dma_finished_callback(void *ptr, int param);
+ TIMER_CALLBACK_MEMBER(dma_finished_callback);
void write( offs_t offset, UINT32 data, UINT32 mem_mask );
UINT32 read( offs_t offset, UINT32 mem_mask );
diff --git a/src/emu/cpu/psx/rcnt.c b/src/emu/cpu/psx/rcnt.c
index 779943b346b..c237caae0fb 100644
--- a/src/emu/cpu/psx/rcnt.c
+++ b/src/emu/cpu/psx/rcnt.c
@@ -213,7 +213,7 @@ void psxrcnt_device::root_timer_adjust( int n_counter )
}
}
-void psxrcnt_device::root_finished( void *ptr, int param )
+TIMER_CALLBACK_MEMBER(psxrcnt_device::root_finished)
{
int n_counter = param;
psx_root *root = &root_counter[ n_counter ];
diff --git a/src/emu/cpu/psx/rcnt.h b/src/emu/cpu/psx/rcnt.h
index 5417d12f5e0..f2e454cfd66 100644
--- a/src/emu/cpu/psx/rcnt.h
+++ b/src/emu/cpu/psx/rcnt.h
@@ -53,7 +53,7 @@ private:
UINT16 root_current( int n_counter );
int root_target( int n_counter );
void root_timer_adjust( int n_counter );
- void root_finished( void *ptr, int param );
+ TIMER_CALLBACK_MEMBER(root_finished);
};
#endif
diff --git a/src/emu/cpu/psx/sio.c b/src/emu/cpu/psx/sio.c
index 170934cd8d7..6d0929755e4 100644
--- a/src/emu/cpu/psx/sio.c
+++ b/src/emu/cpu/psx/sio.c
@@ -157,7 +157,7 @@ void psxsio_device::sio_timer_adjust( int n_port )
sio->timer->adjust( n_time, n_port);
}
-void psxsio_device::sio_clock(void *ptr, int param)
+TIMER_CALLBACK_MEMBER(psxsio_device::sio_clock)
{
int n_port = param;
psx_sio *sio = &port[ n_port ];
diff --git a/src/emu/cpu/psx/sio.h b/src/emu/cpu/psx/sio.h
index 535f9c61f81..b925e05854a 100644
--- a/src/emu/cpu/psx/sio.h
+++ b/src/emu/cpu/psx/sio.h
@@ -82,7 +82,7 @@ protected:
private:
void sio_interrupt( int n_port );
void sio_timer_adjust( int n_port );
- void sio_clock(void *ptr, int param);
+ TIMER_CALLBACK_MEMBER(sio_clock);
psx_sio port[2];
};