Overhaul kdump().

[bertos.git] / bertos / drv / kdebug.c

diff --git a/bertos/drv/kdebug.c b/bertos/drv/kdebug.c
index 37ae5ff98630591bdf64f7971a9c487a2efbc68b..9c210343bc149f03235032d68ff3dc90d7a80aa7 100644 (file)
--- a/bertos/drv/kdebug.c
+++ b/bertos/drv/kdebug.c
@@ -28,12 +28,10 @@
  *
  * Copyright 2003, 2004, 2005, 2006, 2007 Develer S.r.l. (http://www.develer.com/)
  * Copyright 2000, 2001, 2002 Bernie Innocenti <bernie@codewiz.org>
- *
  * -->
  *
  * \brief General pourpose debug support for embedded systems (implementation).
  *
- * \version $Id$
  * \author Bernie Innocenti <bernie@codewiz.org>
  * \author Stefano Fedrigo <aleph@develer.com>
  */
@@ -43,7 +41,6 @@
 #include <cfg/debug.h>
 #include <cfg/os.h>
 
-#include <cpu/irq.h>
 #include <cpu/attr.h>
 #include <cpu/types.h>
 
@@ -58,9 +55,10 @@
 
 
 #if OS_HOSTED
-       #include <stdio.h>
+       #include <unistd.h> // write()
+
        #define KDBG_WAIT_READY()      do { /*nop*/ } while(0)
-       #define KDBG_WRITE_CHAR(c)     putc((c), stderr)
+       #define KDBG_WRITE_CHAR(c)     do { char __c = (c); write(STDERR_FILENO, &__c, sizeof(__c)); } while(0)
        #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 */
@@ -276,8 +274,14 @@ void kdump(const void *_buf, size_t len)
 {
        const unsigned char *buf = (const unsigned char *)_buf;
 
+       kprintf("Dumping buffer at addr [%p], %z bytes", buf, len);
+       size_t i=0;
        while (len--)
-               kprintf("%02X", *buf++);
+       {
+               if ((i % 16) == 0)
+                       kputs("\n");
+               kprintf("%02X ", *buf++);
+       }
        kputchar('\n');
 }