Use existing framebuffer

Author: Extrems

include/ogc/consol.h

@@ -26,9 +26,9 @@
  * \param[in] xres,yres size of the console in pixel
  * \param[in] stride size of one line of the framebuffer in bytes
  *
- * \return none
+ * \return 0 on success, <0 on error
  */
-void CON_Init(void *framebuffer,int xstart,int ystart,int xres,int yres,int stride);
+s32 CON_Init(void *framebuffer,int xstart,int ystart,int xres,int yres,int stride);
 
 /*!
  * \fn s32 CON_InitEx(GXRModeObj *rmode, s32 conXOrigin,s32 conYOrigin,s32 conWidth,s32 conHeight)

libogc/console.c

@@ -86,7 +86,7 @@ static FILE *stdcon = NULL;
 
 extern u8 console_font_8x16[];
 
-void __console_vipostcb(u32 retraceCnt)
+void __console_vipostcb(u32 retraceCount)
 {
 	u32 ycnt,xcnt, fb_stride;
 	u32 *fb,*ptr;
@@ -613,10 +613,14 @@ static int __console_fstat_r(struct _reent *r,void *fd,struct stat *st)
 	return 0;
 }
 
-void CON_Init(void *framebuffer,int xstart,int ystart,int xres,int yres,int stride)
+s32 CON_Init(void *framebuffer,int xstart,int ystart,int xres,int yres,int stride)
 {
 	framebuffer = SYS_VirtualToUncached(framebuffer);
+	if(!framebuffer) return -1;
+
 	__console_init(framebuffer,xstart,ystart,xres,yres,stride);
+
+	return 0;
 }
 
 s32 CON_InitEx(GXRModeObj *rmode, s32 conXOrigin,s32 conYOrigin,s32 conWidth,s32 conHeight)

libogc/exception.c

@@ -60,7 +60,6 @@ typedef struct _framerec {
 	void *lr;
 } frame_rec, *frame_rec_t;
 
-static void *exception_xfb = (void*)0xC1700000;			//we use a static address above ArenaHi.
 static int reload_timer = -1;
 static u32 rumble_cmds[PAD_CHANMAX] = {
 	PAD_MOTOR_STOP, PAD_MOTOR_STOP, PAD_MOTOR_STOP, PAD_MOTOR_STOP
@@ -72,7 +71,6 @@ extern void fpu_exceptionhandler(frame_context*);
 extern void irq_exceptionhandler(frame_context*);
 extern void dec_exceptionhandler(frame_context*);
 extern void default_exceptionhandler(frame_context*);
-extern void VIDEO_SetFramebuffer(void *);
 extern void __dsp_shutdown(void);
 extern void __reload(void);
 #if defined(HW_DOL)
@@ -260,14 +258,15 @@ static void waitForReload(void)
 //just implement core for unrecoverable exceptions.
 void c_default_exceptionhandler(frame_context *pCtx)
 {
+	void *framebuffer;
 	u16 xstart,ystart;
 	u16 xres,yres,stride;
 
 	__dsp_shutdown();
 	GX_AbortFrame();
 	VIDEO_GetFrameBufferPan(&xstart,&ystart,&xres,&yres,&stride);
-	CON_Init(exception_xfb,xstart,ystart,xres,yres,stride*VI_DISPLAY_PIX_SZ);
-	VIDEO_SetFramebuffer(exception_xfb);
+	framebuffer = VIDEO_GetCurrentFramebuffer();
+	CON_Init(framebuffer,xstart,ystart,xres,yres,stride*VI_DISPLAY_PIX_SZ);
 
 	kprintf("\n\n\n\tException (%s) occurred!", exception_name[pCtx->nExcept]);