===================================================================
RCS file: /cvs/prex-old/sys/include/debug.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- prex-old/sys/include/debug.h	2008/06/03 10:38:45	1.1.1.1
+++ prex-old/sys/include/debug.h	2008/08/13 17:12:30	1.1.1.1.2.1
@@ -30,62 +30,19 @@
 #ifndef _DEBUG_H
 #define _DEBUG_H
 
-#define MSGBUFSZ	128	/* Size of one kernel message */
+#define LOGBUF_SIZE	CONFIG_LOGBUF_SIZE
+#define DBGMSG_SIZE	128	/* Size of one kernel message */
 
-/*
- * BREAKPOINT()
- *
- * Break into debugger.
- * This works only with a debug version, and only when debugger
- * is attached.
- */
 #ifdef DEBUG
 #define BREAKPOINT()	breakpoint()
-#else
-#define BREAKPOINT()	do {} while (0)
-#endif
-
-/*
- * printk()
- *
- * Print out kernel message to the debug port.
- * The message is enabled only when DEBUG build.
- */
-#ifdef DEBUG
-extern void printk(const char *fmt, ...);
-#else
-#define printk(fmt...)	do {} while (0)
-#endif
-
-/*
- * panic()
- *
- * Reset CPU for fatal error.
- * If debugger is attached, break into it.
- */
-#ifdef DEBUG
-extern void panic(const char *fmt, ...);
-#else
-extern void machine_reset(void);
-#define panic(fmt...)	machine_reset()
-#endif
-
-/*
- * ASSERT(exp)
- *
- * If exp is false(zero), stop with source info.
- * This is enabled only when DEBUG build. An asserion check
- * should be used only for invalid kernel condition.
- * It can not be used to check the input argument from user
- * mode because kernel must not do panic for it. The kernel
- * should return an appropriate error code in such case.
- */
-#ifdef DEBUG
-extern void assert(const char *file, int line, const char *exp);
+#define DPRINTF(a)	printf a
 #define ASSERT(exp)	do { if (!(exp)) \
-    assert(__FILE__, __LINE__, #exp); } while (0)
+			     assert(__FILE__, __LINE__, #exp); } while (0)
 #else
+#define BREAKPOINT()	do {} while (0)
+#define DPRINTF(a)	do {} while (0)
 #define ASSERT(exp)	do {} while (0)
+#define panic(x)	machine_reset()
 #endif
 
 /*
@@ -100,19 +57,15 @@
  */
 #define DUMP_THREAD	1
 #define DUMP_TASK	2
-#define DUMP_OBJECT	3
-#define DUMP_TIMER	4
-#define DUMP_IRQ	5
-#define DUMP_DEVICE	6
-#define DUMP_VM		7
-#define DUMP_MSGLOG	8
-#define DUMP_TRACE	9
+#define DUMP_VM		3
 
 #ifdef DEBUG
-extern void	 boot_dump(void);
-extern int	 log_get(char **, size_t *);
+extern void	printf(const char *, ...);
+extern void	panic(const char *);
+extern int	debug_dump(int);
+extern void	debug_attach(void (*)(char *));
+extern void	assert(const char *, int, const char *);
+extern int	debug_getlog(char *);
 #endif
-extern int	 debug_dump(int);
-extern void	 debug_attach(void (*)(char *));
 
 #endif /* !_DEBUG_H */