summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/cpu/tms32051/tms32051.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu/cpu/tms32051/tms32051.c')
-rw-r--r--src/emu/cpu/tms32051/tms32051.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/emu/cpu/tms32051/tms32051.c b/src/emu/cpu/tms32051/tms32051.c
index f825f3c89b3..1183e27a223 100644
--- a/src/emu/cpu/tms32051/tms32051.c
+++ b/src/emu/cpu/tms32051/tms32051.c
@@ -142,7 +142,7 @@ struct _tms32051_state
INT32 treg2;
} shadow;
- cpu_irq_callback irq_callback;
+ device_irq_callback irq_callback;
running_device *device;
const address_space *program;
const address_space *data;
@@ -152,10 +152,9 @@ struct _tms32051_state
INLINE tms32051_state *get_safe_token(running_device *device)
{
assert(device != NULL);
- assert(device->token != NULL);
- assert(device->type == CPU);
+ assert(device->type() == CPU);
assert(cpu_get_type(device) == CPU_TMS32051);
- return (tms32051_state *)device->token;
+ return (tms32051_state *)downcast<cpu_device *>(device)->token();
}
static void delay_slot(tms32051_state *cpustate, UINT16 startpc);
@@ -225,8 +224,8 @@ static CPU_INIT( tms )
tms32051_state *cpustate = get_safe_token(device);
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
- cpustate->data = device->space(AS_DATA);
+ cpustate->program = device_memory(device)->space(AS_PROGRAM);
+ cpustate->data = device_memory(device)->space(AS_DATA);
}
static CPU_RESET( tms )
@@ -576,7 +575,7 @@ static CPU_READ( tms )
static CPU_GET_INFO( tms )
{
- tms32051_state *cpustate = (device != NULL && device->token != NULL) ? get_safe_token(device) : NULL;
+ tms32051_state *cpustate = (device != NULL && downcast<cpu_device *>(device)->token() != NULL) ? get_safe_token(device) : NULL;
switch(state)
{