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/h83002 | |
parent | d1e9200589119fa135ffd5801dd018ead4865c23 (diff) |
Changed CPU callbacks to use cpu_device, eliminating a bunch of casting.
Diffstat (limited to 'src/emu/cpu/h83002')
-rw-r--r-- | src/emu/cpu/h83002/h8_16.c | 6 | ||||
-rw-r--r-- | src/emu/cpu/h83002/h8_8.c | 6 | ||||
-rw-r--r-- | src/emu/cpu/h83002/h8priv.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/emu/cpu/h83002/h8_16.c b/src/emu/cpu/h83002/h8_16.c index c637afccf3c..a959c52398f 100644 --- a/src/emu/cpu/h83002/h8_16.c +++ b/src/emu/cpu/h83002/h8_16.c @@ -220,8 +220,8 @@ static CPU_INIT(h8) h8->mode_8bit = 0; - h8->program = device_memory(device)->space(AS_PROGRAM); - h8->io = device_memory(device)->space(AS_IO); + h8->program = device->space(AS_PROGRAM); + h8->io = device->space(AS_IO); state_save_register_device_item(device, 0, h8->h8err); state_save_register_device_item_array(device, 0, h8->regs); @@ -570,7 +570,7 @@ ADDRESS_MAP_END CPU_GET_INFO( h8_3002 ) { - h83xx_state *h8 = (device != NULL && downcast<cpu_device *>(device)->token() != NULL) ? get_safe_token(device) : NULL; + h83xx_state *h8 = (device != NULL && device->token() != NULL) ? get_safe_token(device) : NULL; switch(state) { // Interface functions and variables diff --git a/src/emu/cpu/h83002/h8_8.c b/src/emu/cpu/h83002/h8_8.c index da8618fc0e9..c601c4de3f4 100644 --- a/src/emu/cpu/h83002/h8_8.c +++ b/src/emu/cpu/h83002/h8_8.c @@ -237,8 +237,8 @@ static CPU_INIT(h8bit) h8->mode_8bit = 1; - h8->program = device_memory(device)->space(AS_PROGRAM); - h8->io = device_memory(device)->space(AS_IO); + h8->program = device->space(AS_PROGRAM); + h8->io = device->space(AS_IO); h8->timer[0] = timer_alloc(h8->device->machine, h8_timer_0_cb, h8); h8->timer[1] = timer_alloc(h8->device->machine, h8_timer_1_cb, h8); @@ -751,7 +751,7 @@ ADDRESS_MAP_END CPU_GET_INFO( h8_3334 ) { - h83xx_state *h8 = (device != NULL && downcast<cpu_device *>(device)->token() != NULL) ? get_safe_token(device) : NULL; + h83xx_state *h8 = (device != NULL && device->token() != NULL) ? get_safe_token(device) : NULL; switch(state) { // Interface functions and variables diff --git a/src/emu/cpu/h83002/h8priv.h b/src/emu/cpu/h83002/h8priv.h index 5f9091b3555..8b8f39d4846 100644 --- a/src/emu/cpu/h83002/h8priv.h +++ b/src/emu/cpu/h83002/h8priv.h @@ -26,7 +26,7 @@ struct _h83xx_state UINT8 incheckirqs; device_irq_callback irq_cb; - running_device *device; + cpu_device *device; const address_space *program; const address_space *io; |