diff options
author | 2010-06-08 17:35:49 +0000 | |
---|---|---|
committer | 2010-06-08 17:35:49 +0000 | |
commit | 5e04468569256d7b9cc1b6069f9c46c90e2455be (patch) | |
tree | 6e00da715aa56ac59d107f6c3f7b8058362da5b0 /src/emu/cpu/arm/arm.c | |
parent | d1e9200589119fa135ffd5801dd018ead4865c23 (diff) |
Changed CPU callbacks to use cpu_device, eliminating a bunch of casting.
Diffstat (limited to 'src/emu/cpu/arm/arm.c')
-rw-r--r-- | src/emu/cpu/arm/arm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/emu/cpu/arm/arm.c b/src/emu/cpu/arm/arm.c index 40bfcea293d..84f3c2832be 100644 --- a/src/emu/cpu/arm/arm.c +++ b/src/emu/cpu/arm/arm.c @@ -234,7 +234,7 @@ typedef struct UINT8 pendingIrq; UINT8 pendingFiq; device_irq_callback irq_callback; - running_device *device; + cpu_device *device; const address_space *program; } ARM_REGS; @@ -315,7 +315,7 @@ static CPU_RESET( arm ) memset(cpustate, 0, sizeof(ARM_REGS)); cpustate->irq_callback = save_irqcallback; cpustate->device = device; - cpustate->program = device_memory(device)->space(AS_PROGRAM); + cpustate->program = device->space(AS_PROGRAM); /* start up in SVC mode with interrupts disabled. */ R15 = eARM_MODE_SVC|I_MASK|F_MASK; @@ -500,7 +500,7 @@ static CPU_INIT( arm ) cpustate->irq_callback = irqcallback; cpustate->device = device; - cpustate->program = device_memory(device)->space(AS_PROGRAM); + cpustate->program = device->space(AS_PROGRAM); state_save_register_device_item_array(device, 0, cpustate->sArmRegister); state_save_register_device_item_array(device, 0, cpustate->coproRegister); @@ -1435,7 +1435,7 @@ static CPU_SET_INFO( arm ) CPU_GET_INFO( arm ) { - ARM_REGS *cpustate = (device != NULL && downcast<cpu_device *>(device)->token() != NULL) ? get_safe_token(device) : NULL; + ARM_REGS *cpustate = (device != NULL && device->token() != NULL) ? get_safe_token(device) : NULL; switch (state) { |