diff options
Diffstat (limited to 'src/emu/cpu/m6809/m6809.c')
-rw-r--r-- | src/emu/cpu/m6809/m6809.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/emu/cpu/m6809/m6809.c b/src/emu/cpu/m6809/m6809.c index 710fc762a0d..65debfcf7fd 100644 --- a/src/emu/cpu/m6809/m6809.c +++ b/src/emu/cpu/m6809/m6809.c @@ -98,7 +98,7 @@ struct _m68_state_t UINT8 irq_state[2]; int extra_cycles; /* cycles used up by interrupts */ - cpu_irq_callback irq_callback; + device_irq_callback irq_callback; running_device *device; const m6809_config *config; int icount; @@ -114,11 +114,10 @@ struct _m68_state_t INLINE m68_state_t *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_M6809 || cpu_get_type(device) == CPU_M6809E); - return (m68_state_t *)device->token; + return (m68_state_t *)downcast<cpu_device *>(device)->token(); } static void check_irq_lines( m68_state_t *m68_state ); @@ -377,14 +376,14 @@ static CPU_INIT( m6809 ) 0 }; - const m6809_config *configdata = device->baseconfig().static_config ? (const m6809_config *)device->baseconfig().static_config : &default_config; + const m6809_config *configdata = device->baseconfig().static_config() ? (const m6809_config *)device->baseconfig().static_config() : &default_config; m68_state_t *m68_state = get_safe_token(device); m68_state->config = configdata; m68_state->irq_callback = irqcallback; m68_state->device = device; - m68_state->program = device->space(AS_PROGRAM); + m68_state->program = device_memory(device)->space(AS_PROGRAM); /* setup regtable */ @@ -1102,7 +1101,7 @@ static CPU_SET_INFO( m6809 ) CPU_GET_INFO( m6809 ) { - m68_state_t *m68_state = (device != NULL && device->token != NULL) ? get_safe_token(device) : NULL; + m68_state_t *m68_state = (device != NULL && downcast<cpu_device *>(device)->token() != NULL) ? get_safe_token(device) : NULL; switch (state) { |