*
* \brief AVR debug support (implementation).
*
- * \version $Id$
* \author Bernie Innocenti <bernie@codewiz.org>
* \author Stefano Fedrigo <aleph@develer.com>
* \author Francesco Sacchi <batt@develer.com>
*/
-#include "hw/hw_cpu.h" /* for CLOCK_FREQ */
+#include <hw/hw_cpufreq.h> /* for CPU_FREQ */
#include "hw/hw_ser.h" /* Required for bus macros overrides */
#include "cfg/cfg_debug.h"
*/
#ifndef KDBG_UART0_BUS_INIT
#define KDBG_UART0_BUS_INIT do { \
- UCSR0B = BV(TXEN0); \
+ UCR = BV(TXEN0); \
} while (0)
#endif
#ifndef KDBG_UART0_BUS_RX
#define KDBG_UART0_BUS_TX do {} while (0)
#endif
- #if CPU_AVR_ATMEGA64 || CPU_AVR_ATMEGA128 || CPU_AVR_ATMEGA168
+ #if CPU_AVR_ATMEGA64 || CPU_AVR_ATMEGA128 || CPU_AVR_ATMEGA1281 || CPU_AVR_ATMEGA168 || CPU_AVR_ATMEGA328P
#define UCR UCSR0B
#define UDR UDR0
#define USR UCSR0A
- #elif CPU_AVR_ATMEGA8
- #define UCR UCSRB
- #define USR UCSRA
+ #elif CPU_AVR_ATMEGA8 || CPU_AVR_ATMEGA32
+ #define UCR UCSRB
+ #define USR UCSRA
+ #define TXEN0 TXEN
+ #define UDRE0 UDRE
+ #define TXC0 TXC
+ #define TXCIE0 TXCIE
+ #define UDRIE0 UDRIE
#else
#error Unknown CPU
#endif
#define KDBG_RESTORE_IRQ(old) do { IRQ_RESTORE((old)); } while(0)
typedef cpu_flags_t kdbg_irqsave_t;
- #define KDBG_DELAY (((CLOCK_FREQ + CONFIG_KDEBUG_BAUDRATE / 2) / CONFIG_KDEBUG_BAUDRATE) + 7) / 14
+ #define KDBG_DELAY (((CPU_FREQ + CONFIG_KDEBUG_BAUDRATE / 2) / CONFIG_KDEBUG_BAUDRATE) + 7) / 14
static void _kdebug_bitbang_delay(void)
{
/**
* Putchar for BITBANG serial debug console.
* Sometimes, we can't permit to use a whole serial for debugging purpose.
- * Since debug console is in output only it is usefull to use a single generic I/O pin for debug.
+ * Since debug console is in output only it is useful to use a single generic I/O pin for debug.
* This is achieved by this simple function, that shift out the data like a UART, but
* in software :)
* The only requirement is that SER_BITBANG_* macros will be defined somewhere (usually hw_ser.h)
SER_BITBANG_INIT;
#else /* CONFIG_KDEBUG_PORT != 666 */
/* Compute the baud rate */
- uint16_t period = DIV_ROUND(CLOCK_FREQ / 16UL, CONFIG_KDEBUG_BAUDRATE) - 1;
+ uint16_t period = DIV_ROUND(CPU_FREQ / 16UL, CONFIG_KDEBUG_BAUDRATE) - 1;
- #if (CPU_AVR_ATMEGA64 || CPU_AVR_ATMEGA128)
+ #if (CPU_AVR_ATMEGA64 || CPU_AVR_ATMEGA128 || CPU_AVR_ATMEGA1281)
#if CONFIG_KDEBUG_PORT == 0
UBRR0H = (uint8_t)(period>>8);
UBRR0L = (uint8_t)period;
#error CONFIG_KDEBUG_PORT must be either 0 or 1
#endif
- #elif CPU_AVR_ATMEGA168
- UBRR0H = (uint8_t)(period>>8);
- UBRR0L = (uint8_t)period;
- KDBG_UART0_BUS_INIT;
- #elif CPU_AVR_ATMEGA8
- UBRRH = (uint8_t)(period>>8);
- UBRRL = (uint8_t)period;
+ #elif CPU_AVR_ATMEGA168 || CPU_AVR_ATMEGA328P
+ #if CONFIG_KDEBUG_PORT == 0
+ UBRR0H = (uint8_t)(period>>8);
+ UBRR0L = (uint8_t)period;
+ KDBG_UART0_BUS_INIT;
+ #else
+ #error Only CONFIG_KDEBUG_PORT 0 is supported for this cpu
+ #endif
+
+ #elif CPU_AVR_ATMEGA8 || CPU_AVR_ATMEGA32
+ #if CONFIG_KDEBUG_PORT == 0
+ UBRRH = (uint8_t)(period>>8);
+ UBRRL = (uint8_t)period;
+ KDBG_UART0_BUS_INIT;
+ #else
+ #error Only CONFIG_KDEBUG_PORT 0 is supported for this cpu
+ #endif
#elif CPU_AVR_ATMEGA103
- UBRR = (uint8_t)period;
- KDBG_UART0_BUS_INIT;
+ #if CONFIG_KDEBUG_PORT == 0
+ UBRR = (uint8_t)period;
+ KDBG_UART0_BUS_INIT;
+ #else
+ #error Only CONFIG_KDEBUG_PORT 0 is supported for this cpu
+ #endif
#else
#error Unknown CPU
#endif