Try to be more consistent in unimplemented messages

svn path=/trunk/; revision=30443

reactos/dll/win32/hid/precomp.h

@@ -1,5 +1,6 @@
 #define WIN32_NO_STATUS
 #include <windows.h>
+#include <debug.h>
 
 #define DDKAPI __stdcall
 #define _HIDPI_
@@ -18,9 +19,4 @@ typedef VOID
 extern HINSTANCE hDllInstance;
 extern const GUID HidClassGuid;
 
-#ifndef UNIMPLEMENTED
-#define UNIMPLEMENTED \
-  DbgPrint("HID:  %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__)
-#endif
-
 /* EOF */

reactos/include/reactos/debug.h

@@ -117,21 +117,6 @@ RtlAssert(
 #define ASSERT_IRQL(x) assert(KeGetCurrentIrql()<=(x))
 #define assert_irql(x) assert(KeGetCurrentIrql()<=(x))
 
-/* Macros expanding to the appropriate inline assembly to raise a breakpoint */
-#if defined(_M_IX86)
-#define ASM_BREAKPOINT "\nint $3\n"
-#elif defined(_M_ALPHA)
-#define ASM_BREAKPOINT "\ncall_pal bpt\n"
-#elif defined(_M_MIPS)
-#define ASM_BREAKPOINT "\nbreak\n"
-#elif defined(__x86_64__)
-#define ASM_BREAKPOINT "\nint $3\n"
-#elif defined(_M_PPC)
-#define ASM_BREAKPOINT "\ntwi 1\n"
-#else
-#error Unsupported architecture.
-#endif
-
 #ifndef KEBUGCHECK
 #define KEBUGCHECK(a) DbgPrint("KeBugCheck (0x%X) at %s:%i\n", a, __FILE__,__LINE__), KeBugCheck(a)
 #define KEBUGCHECKEX(a,b,c,d,e) DbgPrint("KeBugCheckEx (0x%X, 0x%X, 0x%X, 0x%X, 0x%X) at %s:%i\n", a, b, c, d, e, __FILE__,__LINE__), KeBugCheckEx(a,b,c,d,e)

reactos/lib/fslib/vfatlib/vfatlib.c

@@ -212,7 +212,7 @@ VfatChkdsk(
 	IN BOOLEAN ScanDrive,
 	IN PFMIFSCALLBACK Callback)
 {
-	DPRINT1("VfatChkdsk() unimplemented!\n");
+	UNIMPLEMENTED;
 	return STATUS_SUCCESS;
 }
 

reactos/ntoskrnl/include/internal/debug.h

@@ -15,72 +15,19 @@
  *        Define NASSERT before including this header to disable assertions
  */
 
-#ifdef CHECKPOINT
+#include <reactos/debug.h>
-#undef CHECKPOINT
-#endif
 
-#ifdef DPRINT
+#ifndef __NTOSKRNL_DEBUG
-#undef DPRINT
+#define __NTOSKRNL_DEBUG
-#endif
 
-#ifndef NDEBUG
+#include <reactos/debug.h>
-#ifdef __GNUC__ /* using GNU C/C99 macro ellipsis */
-#define DPRINT(args...) do { DbgPrint("(%s:%d) ",__FILE__,__LINE__); DbgPrint(args); } while(0)
-#else
-#define DPRINT DbgPrint("(%s:%d) ",__FILE__,__LINE__); DbgPrint
-#endif
-#define CHECKPOINT do { DbgPrint("%s:%d\n",__FILE__,__LINE__); } while(0)
-#else /* NDEBUG */
-#ifdef __GNUC__ /* using GNU C/C99 macro ellipsis */
-#define DPRINT(args...)
-#else
-#define DPRINT
-#endif
-#define CHECKPOINT
-#endif /* NDEBUG */
-
-#ifndef __INTERNAL_DEBUG
-#define __INTERNAL_DEBUG
 
 #if defined(_MSC_VER) && (_MSC_VER < 1300)
 /* TODO: Verify which version the MS compiler learned the __FUNCTION__ macro */
 #define __FUNCTION__ "<unknown>"
 #endif
-#define UNIMPLEMENTED DbgPrint("%s at %s:%d is unimplemented, have a nice day\n",__FUNCTION__,__FILE__,__LINE__);
 
-
+#define CPRINT DPRINT1
-#ifdef assert
-#undef assert
-#endif
-
-#ifdef DBG
-
-/* Print if using a "checked" version */
-#ifdef __GNUC__ /* using GNU C/C99 macro ellipsis */
-#define CPRINT(args...) do { DbgPrint("(%s:%d) ",__FILE__,__LINE__); DbgPrint(args); } while(0)
-#else
-#define CPRINT DbgPrint("(%s:%d) ",__FILE__,__LINE__); DbgPrint
-#endif
-
-#ifdef __GNUC__ /* using GNU C/C99 macro ellipsis */
-#define DPRINT1(args...) do { DbgPrint("(%s:%d) ",__FILE__,__LINE__); DbgPrint(args); } while(0)
-#else
-#define DPRINT1 DbgPrint("(%s:%d) ",__FILE__,__LINE__); DbgPrint
-#endif
-
-#else /* DBG */
-
-#ifdef __GNUC__ /* using GNU C/C99 macro ellipsis */
-#define CPRINT(args...)
-#define DPRINT1(args...)
-#else
-#define CPRINT
-#define DPRINT1
-#endif
-
-#endif /* DBG */
-
-#define CHECKPOINT1 do { DbgPrint("%s:%d\n",__FILE__,__LINE__); } while(0)
 
 /*
  * FUNCTION: Assert a maximum value for the current irql
@@ -88,9 +35,7 @@
  *        x = Maximum irql
  */
 #define ASSERT_IRQL_LESS_OR_EQUAL(x) ASSERT(KeGetCurrentIrql()<=(x))
-#define ASSERT_IRQL(x) ASSERT_IRQL_LESS_OR_EQUAL(x)
 #define ASSERT_IRQL_EQUAL(x) ASSERT(KeGetCurrentIrql()==(x))
 #define ASSERT_IRQL_LESS(x) ASSERT(KeGetCurrentIrql()<(x))
-#define assert_irql(x) assert(KeGetCurrentIrql()<=(x))
 
-#endif /* __INTERNAL_DEBUG */
+#endif /* __NTOSKRNL_DEBUG */