X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Fdebug.c;h=9104262a0e8e0ce649ef192a1ef7e3507ac2ac1f;hb=1e2978df7fa83d68e84588e9695db33aafbd601b;hp=6a50ca2c7ba1a4a39e53985a60aabe87033a1661;hpb=dca6decf0b2d98f521488f071ba3af1a4a6b8647;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/debug.c b/KernelLand/Kernel/debug.c
index 6a50ca2c..9104262a 100644
--- a/KernelLand/Kernel/debug.c
+++ b/KernelLand/Kernel/debug.c
@@ -13,6 +13,7 @@
 extern void	Threads_Dump(void);
 extern void	KernelPanic_SetMode(void);
 extern void	KernelPanic_PutChar(char Ch);
+extern void	IPStack_SendDebugText(const char *Text);
 
 // === PROTOTYPES ===
 static void	Debug_Putchar(char ch);
@@ -30,11 +31,14 @@ volatile int	gbInPutChar = 0;
 #if LOCK_DEBUG_OUTPUT
 tShortSpinlock	glDebug_Lock;
 #endif
+// - Disabled because it breaks shit
+ int	gbSendNetworkDebug = 0;
 
 // === CODE ===
 static void Debug_Putchar(char ch)
 {
 	Debug_PutCharDebug(ch);
+	
 	if( !gbDebug_IsKPanic )
 	{
 		if(gbInPutChar)	return ;
@@ -45,6 +49,12 @@ static void Debug_Putchar(char ch)
 	}
 	else
 		KernelPanic_PutChar(ch);
+	
+	if( gbSendNetworkDebug )
+	{
+		char str[2] = {ch, 0};
+		IPStack_SendDebugText(str);
+	}
 }
 
 static void Debug_Puts(int UseKTerm, const char *Str)
@@ -60,7 +70,10 @@ static void Debug_Puts(int UseKTerm, const char *Str)
 	}
 	else
 		for( len = 0; Str[len]; len ++ );
-	
+
+	if( gbSendNetworkDebug )
+		IPStack_SendDebugText(Str);
+
 	// Output to the kernel terminal
 	if( UseKTerm && !gbDebug_IsKPanic && giDebug_KTerm != -1)
 	{
@@ -79,9 +92,9 @@ void Debug_DbgOnlyFmt(const char *format, va_list args)
 void Debug_Fmt(int bUseKTerm, const char *format, va_list args)
 {
 	char	buf[DEBUG_MAX_LINE_LEN];
-	 int	len;
+//	 int	len;
 	buf[DEBUG_MAX_LINE_LEN-1] = 0;
-	len = vsnprintf(buf, DEBUG_MAX_LINE_LEN-1, format, args);
+	/*len = */vsnprintf(buf, DEBUG_MAX_LINE_LEN-1, format, args);
 	//if( len < DEBUG_MAX_LINE )
 		// do something
 	Debug_Puts(bUseKTerm, buf);
@@ -149,27 +162,33 @@ void Debug(const char *Fmt, ...)
 	SHORTREL(&glDebug_Lock);
 	#endif
 }
-/**
- * \fn void Log(const char *Msg, ...)
- */
-void Log(const char *Fmt, ...)
+
+void LogV(const char *Fmt, va_list args)
 {
-	va_list	args;
-	
 	#if LOCK_DEBUG_OUTPUT
 	SHORTLOCK(&glDebug_Lock);
 	#endif
 
 	Debug_Puts(1, "Log: ");
-	va_start(args, Fmt);
 	Debug_Fmt(1, Fmt, args);
-	va_end(args);
 	Debug_Puts(1, "\r\n");
 	
 	#if LOCK_DEBUG_OUTPUT
 	SHORTREL(&glDebug_Lock);
 	#endif
 }
+
+/**
+ * \fn void Log(const char *Msg, ...)
+ */
+void Log(const char *Fmt, ...)
+{
+	va_list	args;
+	va_start(args, Fmt);
+	LogV(Fmt, args);
+	va_end(args);
+}
+
 void Warning(const char *Fmt, ...)
 {
 	va_list	args;
@@ -208,6 +227,7 @@ void Panic(const char *Fmt, ...)
 	Debug_Putchar('\n');
 
 	Threads_Dump();
+	Heap_Dump();
 
 	for(;;)	;
 }
@@ -371,7 +391,7 @@ void Debug_Leave(const char *FuncName, char RetType, ...)
 	#endif
 }
 
-void Debug_HexDump(const char *Header, const void *Data, Uint Length)
+void Debug_HexDump(const char *Header, const void *Data, size_t Length)
 {
 	const Uint8	*cdat = Data;
 	Uint	pos = 0;