02765: all naomi.c sets: Assertion

This commit is contained in:
Aaron Giles 2008-12-26 07:16:09 +00:00
parent 097e05dcb0
commit 2a4df134e0
2 changed files with 4 additions and 4 deletions

View File

@ -3599,7 +3599,7 @@ static CPU_SET_INFO( sh4 )
case CPUINFO_INT_SH4_FRT_INPUT: sh4_set_frt_input(device, info->i); break; 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 --- */ /* --- 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; 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_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 case CPUINFO_STR_REGISTER + SH4_XF15: sprintf(info->s, "XF15 :%08X %f", FP_XS(15),(double)FP_XFS(15)); break; //%01.2e
#endif #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;
} }
} }

View File

@ -62,8 +62,8 @@ enum
enum enum
{ {
CPUINFO_PTR_SH4_FTCSR_READ_CALLBACK = CPUINFO_FCT_CPU_SPECIFIC, CPUINFO_FCT_SH4_FTCSR_READ_CALLBACK = CPUINFO_FCT_CPU_SPECIFIC,
CPUINFO_PTR_SH4_EXTERNAL_DDT_DMA, CPUINFO_PTR_SH4_EXTERNAL_DDT_DMA = CPUINFO_PTR_CPU_SPECIFIC,
}; };
enum enum