Remove hack, as we can use 'filter' command in kdbg instead

Fix debug level definitions

svn path=/trunk/; revision=31443
This commit is contained in:
Hervé Poussineau 2007-12-26 10:24:31 +00:00
parent 65987f47f6
commit 58212876b4
2 changed files with 5 additions and 16 deletions

View file

@ -9,9 +9,9 @@
#ifndef __DEBUG_H #ifndef __DEBUG_H
#define __DEBUG_H #define __DEBUG_H
#define MIN_TRACE DPFLTR_WARNING_LEVEL #define MIN_TRACE ((1 << DPFLTR_WARNING_LEVEL))
#define MID_TRACE DPFLTR_WARNING_LEVEL | DPFLTR_TRACE_LEVEL #define MID_TRACE ((1 << DPFLTR_WARNING_LEVEL) | (1 << DPFLTR_TRACE_LEVEL))
#define MAX_TRACE DPFLTR_WARNING_LEVEL | DPFLTR_TRACE_LEVEL | DPFLTR_INFO_LEVEL #define MAX_TRACE ((1 << DPFLTR_WARNING_LEVEL) | (1 << DPFLTR_TRACE_LEVEL) | (1 << DPFLTR_INFO_LEVEL))
#define DEBUG_CHECK 0x00000100 #define DEBUG_CHECK 0x00000100
#define DEBUG_MEMORY 0x00000200 #define DEBUG_MEMORY 0x00000200
@ -37,8 +37,8 @@
#define REMOVE_PARENS(...) __VA_ARGS__ #define REMOVE_PARENS(...) __VA_ARGS__
#define TI_DbgPrint(_t_, _x_) \ #define TI_DbgPrint(_t_, _x_) \
DbgPrintEx(DPFLTR_TCPIP_ID, (_t_) & DPFLTR_MASK, "(%s:%d) ", __FILE__, __LINE__), \ 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, REMOVE_PARENS _x_)
#else /* DBG */ #else /* DBG */

View file

@ -9,14 +9,6 @@
*/ */
#include "precomp.h" #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 TCPDeviceObject = NULL;
PDEVICE_OBJECT UDPDeviceObject = NULL; PDEVICE_OBJECT UDPDeviceObject = NULL;
PDEVICE_OBJECT IPDeviceObject = NULL; PDEVICE_OBJECT IPDeviceObject = NULL;
@ -861,9 +853,6 @@ DriverEntry(
DueTime.QuadPart = -(LONGLONG)IP_TIMEOUT * 10000; DueTime.QuadPart = -(LONGLONG)IP_TIMEOUT * 10000;
KeSetTimerEx(&IPTimer, DueTime, IP_TIMEOUT, &IPTimeoutDpc); KeSetTimerEx(&IPTimer, DueTime, IP_TIMEOUT, &IPTimeoutDpc);
/* ROS Hack: ideally, DebugTraceLevel variable should be removed */
DbgSetDebugFilterState(DPFLTR_TCPIP_ID, DebugTraceLevel, TRUE);
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }