X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2Fkpanic.c;h=ccb107370d469d2240faafd67a28994de5d6cc66;hb=dcebc16c576aa98eb6a33047f4c4b2b69b30a1bc;hp=505f698ad9b18f3d05e9af3ecbc972891fb894d8;hpb=eb934b266052965b9c480d11d6866a994f30731b;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/kpanic.c b/Kernel/arch/x86/kpanic.c
index 505f698a..ccb10737 100644
--- a/Kernel/arch/x86/kpanic.c
+++ b/Kernel/arch/x86/kpanic.c
@@ -6,22 +6,101 @@
 
 #include <acess.h>
 
+
+
 #define	FB	((Uint16 *)(KERNEL_BASE|0xB8000))
+#define BGC	0x4F00	// White on Red
+//#define BGC	0xC000	// Black on Bright Red
+//#define BGC	0x1F00	// White on Blue (BSOD!)
+
+extern Uint32	GetEIP(void);
+extern void	Error_Backtrace(Uint32 eip, Uint32 ebp);
 
  int	giKP_Pos = 0;
 
+const struct {
+	Uint16	IdxPort;
+	Uint16	DatPort;
+	Uint8	Index;
+	Uint8	Value;
+}	caRegValues[] = {
+	//{0x3C0, 0x3C0, 0x10, 0x0C},	// Mode Control (Blink Enabled)
+	{0x3C0, 0x3C0, 0x10, 0x04},	// Mode Control (Blink Disabled)
+	{0x3C0, 0x3C0, 0x11, 0x00},	// Overscan Register
+	{0x3C0, 0x3C0, 0x12, 0x0F},	// Color Plane Enable
+	{0x3C0, 0x3C0, 0x13, 0x08},	// Horizontal Panning
+	{0x3C0, 0x3C0, 0x14, 0x00},	// Color Select
+	{0    , 0x3C2, 0   , 0x67},	// Miscellaneous Output Register
+	{0x3C4, 0x3C5, 0x01, 0x00},	// Clock Mode Register
+	{0x3C4, 0x3C5, 0x03, 0x00},	// Character select
+	{0x3C4, 0x3C5, 0x04, 0x07},	// Memory Mode Register
+	{0x3CE, 0x3CF, 0x05, 0x10},	// Mode Register
+	{0x3CE, 0x3CF, 0x06, 0x0E},	// Miscellaneous Register
+	{0x3D4, 0x3D5, 0x00, 0x5F},	// Horizontal Total
+	{0x3D4, 0x3D5, 0x01, 0x4F},	// Horizontal Display Enable End
+	{0x3D4, 0x3D5, 0x02, 0x50},	// Horizontal Blank Start
+	{0x3D4, 0x3D5, 0x03, 0x82},	// Horizontal Blank End
+	{0x3D4, 0x3D5, 0x04, 0x55},	// Horizontal Retrace Start
+	{0x3D4, 0x3D5, 0x05, 0x81},	// Horizontal Retrace End
+	{0x3D4, 0x3D5, 0x06, 0xBF},	// Vertical Total
+	{0x3D4, 0x3D5, 0x07, 0x1F},	// Overflow Register
+	{0x3D4, 0x3D5, 0x08, 0x00},	// Preset row scan
+	{0x3D4, 0x3D5, 0x09, 0x4F},	// Maximum Scan Line
+	{0x3D4, 0x3D5, 0x10, 0x9C},	// Vertical Retrace Start
+	{0x3D4, 0x3D5, 0x11, 0x8E},	// Vertical Retrace End
+	{0x3D4, 0x3D5, 0x12, 0x8F},	// Vertical Display Enable End
+	{0x3D4, 0x3D5, 0x13, 0x28},	// Logical Width
+	{0x3D4, 0x3D5, 0x14, 0x1F},	// Underline Location
+	{0x3D4, 0x3D5, 0x15, 0x96},	// Vertical Blank Start
+	{0x3D4, 0x3D5, 0x16, 0xB9},	// Vertical Blank End
+	{0x3D4, 0x3D5, 0x17, 0xA3}	// CRTC Mode Control
+};
+#define	NUM_REGVALUES	(sizeof(caRegValues)/sizeof(caRegValues[0]))
+
+// === PROTOTYPES ===
+void	KernelPanic_SetMode(void);
+void	KernelPanic_PutChar(char Ch);
+
+// === CODE ===
 /**
  * \brief Sets the screen mode for a kernel panic
  */
-void KernelPanic_SetMode()
+void KernelPanic_SetMode(void)
 {
 	 int	i;
+	
+	// This function is called by Panic(), but MM_PageFault and the
+	// CPU exception handers also call it, so let's not clear the screen
+	// twice
+	if( giKP_Pos )	return ;
+	
 	// Restore VGA 0xB8000 text mode
+	#if 1
+	for( i = 0; i < NUM_REGVALUES; i++ )
+	{
+		// Reset Flip-Flop
+		if( caRegValues[i].IdxPort == 0x3C0 )	inb(0x3DA);
+		
+		if( caRegValues[i].IdxPort )
+			outb(caRegValues[i].IdxPort, caRegValues[i].Index);
+		outb(caRegValues[i].DatPort, caRegValues[i].Value);
+	}
+	
+	inb(0x3DA);
+	outb(0x3C0, 0x20);
+	#endif
 	
 	// Clear Screen
 	for( i = 0; i < 80*25; i++ )
 	{
-		FB[i] = 0x4F00;
+		FB[i] = BGC;
+	}
+	
+	{
+		Uint32	eip = GetEIP();
+		Uint32	ebp;
+		__asm__ __volatile__ ("mov %%ebp, %0" : "=r" (ebp));
+		Error_Backtrace(eip, ebp);
 	}
 }