X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcpu%2Favr%2Fdrv%2Fkdebug_avr.c;h=886b7d6d69f4a81f53d658ad05dedae1d4e5aa18;hb=006c06fa5c4ce4a6e250877655e9963a8310538a;hp=3e1bdfda3936b08a18bc9da6810e5066835ffa97;hpb=11da44352fcd4d33b173c976db45293ac1a87cca;p=bertos.git

diff --git a/bertos/cpu/avr/drv/kdebug_avr.c b/bertos/cpu/avr/drv/kdebug_avr.c
index 3e1bdfda..886b7d6d 100644
--- a/bertos/cpu/avr/drv/kdebug_avr.c
+++ b/bertos/cpu/avr/drv/kdebug_avr.c
@@ -27,22 +27,22 @@
  * the GNU General Public License.
  *
  * Copyright 2003, 2004, 2005, 2006, 2007 Develer S.r.l. (http://www.develer.com/)
- * Copyright 2000, 2001, 2002 Bernardo Innocenti <bernie@codewiz.org>
+ * Copyright 2000, 2001, 2002 Bernie Innocenti <bernie@codewiz.org>
  *
  * -->
  *
  * \brief AVR debug support (implementation).
  *
  * \version $Id$
- * \author Bernardo Innocenti <bernie@develer.com>
+ * \author Bernie Innocenti <bernie@codewiz.org>
  * \author Stefano Fedrigo <aleph@develer.com>
  * \author Francesco Sacchi <batt@develer.com>
  */
 
-#include "hw_cpu.h"     /* for CLOCK_FREQ */
-#include "hw_ser.h"     /* Required for bus macros overrides */
+#include "hw/hw_cpu.h"     /* for CLOCK_FREQ */
+#include "hw/hw_ser.h"     /* Required for bus macros overrides */
 
-#include <cfg/cfg_debug.h>
+#include "cfg/cfg_debug.h"
 #include <cfg/macros.h> /* for BV(), DIV_ROUND */
 
 #include <cpu/types.h>
@@ -54,7 +54,7 @@
 
 	/*
 	 * Support for special bus policies or external transceivers
-	 * on UART0 (to be overridden in "hw_ser.h").
+	 * on UART0 (to be overridden in "hw/hw_ser.h").
 	 *
 	 * HACK: if we don't set TXEN, kdbg disables the transmitter
 	 * after each output statement until the serial driver
@@ -117,7 +117,7 @@
 
 	/*
 		* Support for special bus policies or external transceivers
-		* on UART1 (to be overridden in "hw_ser.h").
+		* on UART1 (to be overridden in "hw/hw_ser.h").
 		*
 		* HACK: if we don't set TXEN, kdbg disables the transmitter
 		* after each output statement until the serial driver
@@ -159,12 +159,12 @@
  * Special debug port for BitBanged Serial see below for details...
  */
 #elif CONFIG_KDEBUG_PORT == 666
-	#include "hw_ser.h"
+	#include "hw/hw_ser.h"
 	#define KDBG_WAIT_READY()      do { /*nop*/ } while(0)
 	#define KDBG_WRITE_CHAR(c)     _kdebug_bitbang_putchar((c))
 	#define KDBG_MASK_IRQ(old)     do { IRQ_SAVE_DISABLE((old)); } while(0)
 	#define KDBG_RESTORE_IRQ(old)  do { IRQ_RESTORE((old)); } while(0)
-	typedef cpuflags_t kdbg_irqsave_t;
+	typedef cpu_flags_t kdbg_irqsave_t;
 
 	#define KDBG_DELAY (((CLOCK_FREQ + CONFIG_KDEBUG_BAUDRATE / 2) / CONFIG_KDEBUG_BAUDRATE) + 7) / 14