@@ -67,8 +67,6 @@ static int reload_timer = -1;
6767void __exception_sethandler (u32 nExcept , void (* pHndl )(frame_context * ));
6868
6969extern void udelay (int us );
70- extern s32 CONF_GetEuRGB60 (void );
71- extern s32 CONF_GetProgressiveScan (void );
7270extern void fpu_exceptionhandler (frame_context * );
7371extern void irq_exceptionhandler (frame_context * );
7472extern void dec_exceptionhandler (frame_context * );
@@ -281,15 +279,15 @@ void c_default_exceptionhandler(frame_context *pCtx)
281279 u16 console_width = 574 ;
282280 u8 Yoffset = 48 ;
283281
284- if (CONF_GetEuRGB60 () > 0 || ((CONF_GetProgressiveScan () > 0 ) && VIDEO_HaveComponentCable ())) {
282+ if (SYS_GetEuRGB60 () > 0 || ((SYS_GetProgressiveScan () > 0 ) && VIDEO_HaveComponentCable ())) {
285283 // Changes to 480i/p values
286284 console_height = 640 ;
287285 console_width = 480 ;
288286 Yoffset = 32 ;
289287 }
290-
291- GX_AbortFrame ();
292288 lookup_xfb = VIDEO_GetNextFramebuffer ();
289+ VIDEO_WaitVSync ();
290+ GX_AbortFrame ();
293291 VIDEO_SetFramebuffer (exception_xfb );
294292 __VIClearFramebuffer (exception_xfb , console_height * console_width * VI_DISPLAY_PIX_SZ , COLOR_BLACK );
295293 __console_init (exception_xfb , 16 , Yoffset , console_height - 16 , console_width - Yoffset , 1280 );
@@ -310,10 +308,12 @@ void c_default_exceptionhandler(frame_context *pCtx)
310308
311309 _cpu_print_stack ((void * )pCtx -> SRR0 ,(void * )pCtx -> LR ,(void * )pCtx -> GPR [1 ]);
312310
311+ kprintf ("\n" );
312+
313313 if ((pCtx -> EXCPT_Number == EX_DSI ) || (pCtx -> EXCPT_Number == EX_FP )) {
314314 u32 i ;
315315 u32 * pAdd = (u32 * )pCtx -> SRR0 ;
316- kprintf ("\n\n\ tCODE DUMP:\n" );
316+ kprintf ("\n\tCODE DUMP:\n" );
317317 for (i = 0 ; i < 12 ; i += 4 )
318318 kprintf ("\t%p: %08X %08X %08X %08X\n" ,
319319 & (pAdd [i ]),pAdd [i ], pAdd [i + 1 ], pAdd [i + 2 ], pAdd [i + 3 ]);
0 commit comments