[ros-diffs] [hpoussin] 31443: Remove hack, as we can use 'filter' command in kdbg instead Fix debug level definitions

Author: hpoussin
Date: Wed Dec 26 13:24:31 2007
New Revision: 31443

URL: http://svn.reactos.org/svn/reactos?rev=31443&view=rev
Log:
Remove hack, as we can use 'filter' command in kdbg instead
Fix debug level definitions

Modified:
    trunk/reactos/drivers/network/tcpip/include/debug.h
    trunk/reactos/drivers/network/tcpip/tcpip/main.c

Modified: trunk/reactos/drivers/network/tcpip/include/debug.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/inclu...
==============================================================================
--- trunk/reactos/drivers/network/tcpip/include/debug.h (original)
+++ trunk/reactos/drivers/network/tcpip/include/debug.h Wed Dec 26 13:24:31 2007
@@ -9,9 +9,9 @@
 #ifndef __DEBUG_H
 #define __DEBUG_H

-#define MIN_TRACE      DPFLTR_WARNING_LEVEL
-#define MID_TRACE      DPFLTR_WARNING_LEVEL | DPFLTR_TRACE_LEVEL
-#define MAX_TRACE      DPFLTR_WARNING_LEVEL | DPFLTR_TRACE_LEVEL | DPFLTR_INFO_LEVEL
+#define MIN_TRACE      ((1 << DPFLTR_WARNING_LEVEL))
+#define MID_TRACE      ((1 << DPFLTR_WARNING_LEVEL) | (1 << DPFLTR_TRACE_LEVEL))
+#define MAX_TRACE      ((1 << DPFLTR_WARNING_LEVEL) | (1 << DPFLTR_TRACE_LEVEL) | (1 << DPFLTR_INFO_LEVEL))

#define DEBUG_CHECK    0x00000100
 #define DEBUG_MEMORY   0x00000200
@@ -37,8 +37,8 @@

#define REMOVE_PARENS(...) __VA_ARGS__
 #define TI_DbgPrint(_t_, _x_) \
-    DbgPrintEx(DPFLTR_TCPIP_ID, (_t_) & DPFLTR_MASK, "(%s:%d) ", __FILE__, __LINE__), \
-    DbgPrintEx(DPFLTR_TCPIP_ID, (_t_) & DPFLTR_MASK, REMOVE_PARENS _x_)
+    DbgPrintEx(DPFLTR_TCPIP_ID, (_t_) | DPFLTR_MASK, "(%s:%d) ", __FILE__, __LINE__), \
+    DbgPrintEx(DPFLTR_TCPIP_ID, (_t_) | DPFLTR_MASK, REMOVE_PARENS _x_)

#else /* DBG */

Modified: trunk/reactos/drivers/network/tcpip/tcpip/main.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpip...
==============================================================================
--- trunk/reactos/drivers/network/tcpip/tcpip/main.c (original)
+++ trunk/reactos/drivers/network/tcpip/tcpip/main.c Wed Dec 26 13:24:31 2007
@@ -8,14 +8,6 @@
  *   CSH 01/08-2000 Created
  */
 #include "precomp.h"
-
-#define NDEBUG
-
-#ifndef NDEBUG
-DWORD DebugTraceLevel = DEBUG_ULTRA & ~(DEBUG_LOCK | DEBUG_PBUFFER);
-#else
-DWORD DebugTraceLevel = 0;
-#endif /* NDEBUG */

PDEVICE_OBJECT TCPDeviceObject   = NULL;
 PDEVICE_OBJECT UDPDeviceObject   = NULL;
@@ -861,9 +853,6 @@
   DueTime.QuadPart = -(LONGLONG)IP_TIMEOUT * 10000;
   KeSetTimerEx(&IPTimer, DueTime, IP_TIMEOUT, &IPTimeoutDpc);

-  /* ROS Hack: ideally, DebugTraceLevel variable should be removed */
-  DbgSetDebugFilterState(DPFLTR_TCPIP_ID, DebugTraceLevel, TRUE);
-
   return STATUS_SUCCESS;
 }