diff options
Diffstat (limited to 'src/emu/cpu/g65816/g65816.c')
-rw-r--r-- | src/emu/cpu/g65816/g65816.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/emu/cpu/g65816/g65816.c b/src/emu/cpu/g65816/g65816.c index 953dd27c0b1..b238aa92ac3 100644 --- a/src/emu/cpu/g65816/g65816.c +++ b/src/emu/cpu/g65816/g65816.c @@ -98,10 +98,9 @@ TODO general: INLINE g65816i_cpu_struct *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_G65816 || cpu_get_type(device) == CPU_5A22); - return (g65816i_cpu_struct *)device->token; + return (g65816i_cpu_struct *)downcast<cpu_device *>(device)->token(); } /* Temporary Variables */ @@ -303,7 +302,7 @@ static void g65816_set_irq_line(g65816i_cpu_struct *cpustate, int line, int stat } /* Set the callback that is called when servicing an interrupt */ -static void g65816_set_irq_callback(g65816i_cpu_struct *cpustate, cpu_irq_callback callback) +static void g65816_set_irq_callback(g65816i_cpu_struct *cpustate, device_irq_callback callback) { INT_ACK = callback; } @@ -338,7 +337,7 @@ static CPU_INIT( g65816 ) g65816_set_irq_callback(cpustate, irqcallback); cpustate->device = device; - cpustate->program = device->space(AS_PROGRAM); + cpustate->program = device_memory(device)->space(AS_PROGRAM); cpustate->cpu_type = CPU_TYPE_G65816; state_save_register_device_item(device, 0, cpustate->a); @@ -419,7 +418,7 @@ void g65816_set_read_vector_callback(running_device *device, read8_space_func re CPU_GET_INFO( g65816 ) { - g65816i_cpu_struct *cpustate = (device != NULL && device->token != NULL) ? get_safe_token(device) : NULL; + g65816i_cpu_struct *cpustate = (device != NULL && downcast<cpu_device *>(device)->token() != NULL) ? get_safe_token(device) : NULL; switch (state) { |