Set correct debug pins for AT91SAM7X.

[bertos.git] / cpu / avr / drv / kdebug_avr.c

diff --git a/cpu/avr/drv/kdebug_avr.c b/cpu/avr/drv/kdebug_avr.c
index 0ff8a8522528982c63e4f7af30d01ce67b22770a..35d0645d6867a61485ca708f3f5a3ce333a5fde1 100644 (file)
--- a/cpu/avr/drv/kdebug_avr.c
+++ b/cpu/avr/drv/kdebug_avr.c
@@ -39,8 +39,9 @@
  * \author Francesco Sacchi <batt@develer.com>
  */
 
-#include <cpu/cpu.h>
-#include <cfg/macros.h> /* for BV() */
+#include <cpu/types.h>
+#include <cpu/attr.h>
+#include <cfg/macros.h> /* for BV(), DIV_ROUND */
 #include <appconfig.h>
 #include <hw_cpu.h>     /* for CLOCK_FREQ */
 #include <hw_ser.h>     /* Required for bus macros overrides */
@@ -153,8 +154,8 @@
        typedef uint8_t kdbg_irqsave_t;
 
 /*
-       * Special debug port for BitBanged Serial see below for details...
-       */
+ * Special debug port for BitBanged Serial see below for details...
+ */
 #elif CONFIG_KDEBUG_PORT == 666
        #include "hw_ser.h"
        #define KDBG_WAIT_READY()      do { /*nop*/ } while(0)
@@ -222,7 +223,7 @@ INLINE void kdbg_hw_init(void)
                SER_BITBANG_INIT;
        #else /* CONFIG_KDEBUG_PORT != 666 */
                /* Compute the baud rate */
-               uint16_t period = (((CLOCK_FREQ / 16UL) + (CONFIG_KDEBUG_BAUDRATE / 2)) / CONFIG_KDEBUG_BAUDRATE) - 1;
+               uint16_t period = DIV_ROUND(CLOCK_FREQ / 16UL, CONFIG_KDEBUG_BAUDRATE) - 1;
 
                #if (CPU_AVR_ATMEGA64 || CPU_AVR_ATMEGA128)
                        #if CONFIG_KDEBUG_PORT == 0