X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Fkdebug.c;h=1e20615a59cc8d1a16cd0c84e060ec3be03a2e18;hb=faed9d33b0a6bd6c2376e313fa3b73512c545caa;hp=517a20c9a3593da5a5556c1453ab23a763aa8c73;hpb=27fef4ed34eb237817defa14242e726ccad70948;p=bertos.git

diff --git a/drv/kdebug.c b/drv/kdebug.c
index 517a20c9..1e20615a 100644
--- a/drv/kdebug.c
+++ b/drv/kdebug.c
@@ -40,13 +40,17 @@
 
 
 #include <cfg/debug.h>
-#include <cpu/cpu.h>
+#include <cpu/irq.h>
+#include <cpu/attr.h>
+#include <cpu/types.h>
 #include <cfg/macros.h> /* for BV() */
 #include <appconfig.h>
-#include <hw_cpu.h>     /* for CLOCK_FREQ */
-#include <hw_ser.h>     /* Required for bus macros overrides */
+#warning what about these?
+//#include <hw_cpu.h>     /* for CLOCK_FREQ */
+//#include <hw_ser.h>     /* Required for bus macros overrides */
 
 #include <mware/formatwr.h> /* for _formatted_write() */
+#include <mware/pgm.h>
 
 #ifdef _DEBUG
 
@@ -55,10 +59,10 @@
 #endif
 
 
-#if defined(_EMUL)
+#if OS_HOSTED
 	#include <stdio.h>
 	#define KDBG_WAIT_READY()      do { /*nop*/ } while(0)
-	#define KDBG_WRITE_CHAR(c)     putchar((c))
+	#define KDBG_WRITE_CHAR(c)     putc((c), stderr)
 	#define KDBG_MASK_IRQ(old)     do { (void)(old); } while(0)
 	#define KDBG_RESTORE_IRQ(old)  do { /*nop*/ } while(0)
 	typedef char kdbg_irqsave_t; /* unused */
@@ -77,7 +81,7 @@ void kdbg_init(void)
 {
 	/* Init debug hw */
 	kdbg_hw_init();
-	kputs("\n\n*** DBG START ***\n");
+	kputs("\n\n*** BeRTOS DBG START ***\n");
 }
 
 
@@ -225,7 +229,7 @@ int PGM_FUNC(__invalid_ptr)(void *value, const char * PGM_ATTR name, const char
 	PGM_FUNC(kputs)(PGM_STR("Invalid ptr: "));
 	PGM_FUNC(kputs)(name);
 	#if CONFIG_PRINTF
-		PGM_FUNC(kprintf)(PGM_STR(" = 0x%x\n"), (unsigned int)value);
+		PGM_FUNC(kprintf)(PGM_STR(" = 0x%p\n"), value);
 	#else
 		(void)value;
 		kputchar('\n');