diff options
author | 2008-12-26 07:16:09 +0000 | |
---|---|---|
committer | 2008-12-26 07:16:09 +0000 | |
commit | 2a4df134e06d85f1c515f99fcc6dfa339f8961e5 (patch) | |
tree | 50dc5c826f537ecdd61dc1ed7fc0347cc15eb19a /src/emu/cpu | |
parent | 097e05dcb09e746ac4aa461e1ecce8a1da12b419 (diff) |
02765: all naomi.c sets: Assertion
Diffstat (limited to 'src/emu/cpu')
-rw-r--r-- | src/emu/cpu/sh4/sh4.c | 4 | ||||
-rw-r--r-- | src/emu/cpu/sh4/sh4.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/emu/cpu/sh4/sh4.c b/src/emu/cpu/sh4/sh4.c index a9427fbcafd..a6301a8fd9d 100644 --- a/src/emu/cpu/sh4/sh4.c +++ b/src/emu/cpu/sh4/sh4.c @@ -3599,7 +3599,7 @@ static CPU_SET_INFO( sh4 ) case CPUINFO_INT_SH4_FRT_INPUT: sh4_set_frt_input(device, info->i); break; /* --- the following bits of info are set as pointers to data or functions --- */ - case CPUINFO_PTR_SH4_FTCSR_READ_CALLBACK: sh4->ftcsr_read_callback = (void (*) (UINT32 ))info->f; break; + case CPUINFO_FCT_SH4_FTCSR_READ_CALLBACK: sh4->ftcsr_read_callback = (void (*) (UINT32 ))info->f; break; case CPUINFO_PTR_SH4_EXTERNAL_DDT_DMA: sh4_dma_ddt(sh4, (struct sh4_ddt_dma *)info->f); break; } } @@ -3833,7 +3833,7 @@ CPU_GET_INFO( sh4 ) case CPUINFO_STR_REGISTER + SH4_XF14: sprintf(info->s, "XF14 :%08X %f", FP_XS(14),(double)FP_XFS(14)); break; case CPUINFO_STR_REGISTER + SH4_XF15: sprintf(info->s, "XF15 :%08X %f", FP_XS(15),(double)FP_XFS(15)); break; //%01.2e #endif - case CPUINFO_PTR_SH4_FTCSR_READ_CALLBACK: info->f = (genf*)sh4->ftcsr_read_callback; break; + case CPUINFO_FCT_SH4_FTCSR_READ_CALLBACK: info->f = (genf*)sh4->ftcsr_read_callback; break; } } diff --git a/src/emu/cpu/sh4/sh4.h b/src/emu/cpu/sh4/sh4.h index 347b7151102..3cc9aef2d91 100644 --- a/src/emu/cpu/sh4/sh4.h +++ b/src/emu/cpu/sh4/sh4.h @@ -62,8 +62,8 @@ enum enum { - CPUINFO_PTR_SH4_FTCSR_READ_CALLBACK = CPUINFO_FCT_CPU_SPECIFIC, - CPUINFO_PTR_SH4_EXTERNAL_DDT_DMA, + CPUINFO_FCT_SH4_FTCSR_READ_CALLBACK = CPUINFO_FCT_CPU_SPECIFIC, + CPUINFO_PTR_SH4_EXTERNAL_DDT_DMA = CPUINFO_PTR_CPU_SPECIFIC, }; enum |