X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcpu%2Favr%2Fdrv%2Fkdebug_avr.c;h=81e78530b30ead1ed66f766447ef75d31959abf6;hb=b708b0cbae2dc58ef30943ade3d56c464b49a59c;hp=25a2cd09996d9fe774cc0a1802742c353273adc0;hpb=52320f9345b0e2b083aa09cb79bc56e75e60dbaf;p=bertos.git diff --git a/bertos/cpu/avr/drv/kdebug_avr.c b/bertos/cpu/avr/drv/kdebug_avr.c index 25a2cd09..81e78530 100644 --- a/bertos/cpu/avr/drv/kdebug_avr.c +++ b/bertos/cpu/avr/drv/kdebug_avr.c @@ -27,22 +27,21 @@ * 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 + * Copyright 2000, 2001, 2002 Bernie Innocenti * * --> * * \brief AVR debug support (implementation). * - * \version $Id$ - * \author Bernardo Innocenti + * \author Bernie Innocenti * \author Stefano Fedrigo * \author Francesco Sacchi */ -#include "hw_cpu.h" /* for CLOCK_FREQ */ -#include "hw_ser.h" /* Required for bus macros overrides */ +#include /* for CPU_FREQ */ +#include "hw/hw_ser.h" /* Required for bus macros overrides */ -#include +#include "cfg/cfg_debug.h" #include /* for BV(), DIV_ROUND */ #include @@ -54,7 +53,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 @@ -63,7 +62,7 @@ */ #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 @@ -73,13 +72,18 @@ #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 @@ -117,7 +121,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,14 +163,14 @@ * 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 + #define KDBG_DELAY (((CPU_FREQ + CONFIG_KDEBUG_BAUDRATE / 2) / CONFIG_KDEBUG_BAUDRATE) + 7) / 14 static void _kdebug_bitbang_delay(void) { @@ -185,7 +189,7 @@ /** * 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) @@ -225,9 +229,9 @@ INLINE void kdbg_hw_init(void) 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; @@ -240,16 +244,30 @@ INLINE void kdbg_hw_init(void) #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