X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcpu%2Favr%2Fdrv%2Fkdebug_avr.c;h=5a8d2f3157b31ed5f8c214f805ad381ae14a4a9a;hb=0f60d6b24cf8ec1c9bd8dca82fed6325932c5aca;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..5a8d2f31 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 <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_cpufreq.h>     /* for CPU_FREQ */
+#include "hw/hw_ser.h"     /* Required for bus macros overrides */
 
-#include <appconfig.h>
+#include "cfg/cfg_debug.h"
 #include <cfg/macros.h> /* for BV(), DIV_ROUND */
 
 #include <cpu/types.h>
@@ -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,19 @@
 	#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_ATMEGA1280 \
+	    || 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
@@ -116,14 +121,14 @@
 #elif CONFIG_KDEBUG_PORT == 1
 
 	/*
-		* Support for special bus policies or external transceivers
-		* on UART1 (to be overridden in "hw_ser.h").
-		*
-		* HACK: if we don't set TXEN, kdbg disables the transmitter
-		* after each output statement until the serial driver
-		* is initialized.  These glitches confuse the debug
-		* terminal that ends up printing some trash.
-		*/
+	 * Support for special bus policies or external transceivers
+	 * 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
+	 * is initialized.  These glitches confuse the debug
+	 * terminal that ends up printing some trash.
+	 */
 	#ifndef KDBG_UART1_BUS_INIT
 	#define KDBG_UART1_BUS_INIT  do { \
 			UCSR1B = BV(TXEN1); \
@@ -155,18 +160,103 @@
 
 	typedef uint8_t kdbg_irqsave_t;
 
+#elif CONFIG_KDEBUG_PORT == 2
+
+	/*
+	 * Support for special bus policies or external transceivers
+	 * on UART2 (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
+	 * is initialized.  These glitches confuse the debug
+	 * terminal that ends up printing some trash.
+	 */
+	#ifndef KDBG_UART2_BUS_INIT
+	#define KDBG_UART2_BUS_INIT  do { \
+			UCSR2B = BV(TXEN2); \
+		} while (0)
+	#endif
+	#ifndef KDBG_UART2_BUS_RX
+	#define KDBG_UART2_BUS_RX    do {} while (0)
+	#endif
+	#ifndef KDBG_UART2_BUS_TX
+	#define KDBG_UART2_BUS_TX    do {} while (0)
+	#endif
+
+	#define KDBG_WAIT_READY()     do { loop_until_bit_is_set(UCSR2A, UDRE2); } while(0)
+	#define KDBG_WAIT_TXDONE()    do { loop_until_bit_is_set(UCSR2A, TXC2); } while(0)
+	#define KDBG_WRITE_CHAR(c)    do { UCSR2A |= BV(TXC2); UDR2 = (c); } while(0)
+
+	#define KDBG_MASK_IRQ(old)    do { \
+		(old) = UCSR2B; \
+		UCSR2B |= BV(TXEN2); \
+		UCSR2B &= ~(BV(TXCIE2) | BV(UDRIE2)); \
+		KDBG_UART2_BUS_TX; \
+	} while(0)
+
+	#define KDBG_RESTORE_IRQ(old) do { \
+		KDBG_WAIT_TXDONE(); \
+		KDBG_UART2_BUS_RX; \
+		UCSR2B = (old); \
+	} while(0)
+
+	typedef uint8_t kdbg_irqsave_t;
+
+#elif CONFIG_KDEBUG_PORT == 3
+
+	/*
+	 * Support for special bus policies or external transceivers
+	 * on UART3 (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
+	 * is initialized.  These glitches confuse the debug
+	 * terminal that ends up printing some trash.
+	 */
+	#ifndef KDBG_UART3_BUS_INIT
+	#define KDBG_UART3_BUS_INIT  do { \
+			UCSR3B = BV(TXEN3); \
+		} while (0)
+	#endif
+	#ifndef KDBG_UART3_BUS_RX
+	#define KDBG_UART3_BUS_RX    do {} while (0)
+	#endif
+	#ifndef KDBG_UART3_BUS_TX
+	#define KDBG_UART3_BUS_TX    do {} while (0)
+	#endif
+
+	#define KDBG_WAIT_READY()     do { loop_until_bit_is_set(UCSR3A, UDRE3); } while(0)
+	#define KDBG_WAIT_TXDONE()    do { loop_until_bit_is_set(UCSR3A, TXC3); } while(0)
+	#define KDBG_WRITE_CHAR(c)    do { UCSR3A |= BV(TXC3); UDR3 = (c); } while(0)
+
+	#define KDBG_MASK_IRQ(old)    do { \
+		(old) = UCSR3B; \
+		UCSR3B |= BV(TXEN3); \
+		UCSR3B &= ~(BV(TXCIE3) | BV(UDRIE3)); \
+		KDBG_UART3_BUS_TX; \
+	} while(0)
+
+	#define KDBG_RESTORE_IRQ(old) do { \
+		KDBG_WAIT_TXDONE(); \
+		KDBG_UART3_BUS_RX; \
+		UCSR3B = (old); \
+	} while(0)
+
+	typedef uint8_t kdbg_irqsave_t;
+
+
 /*
  * 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 +275,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)
@@ -215,7 +305,7 @@
 		}
 	}
 #else
-	#error CONFIG_KDEBUG_PORT should be either 0, 1 or 666
+	#error CONFIG_KDEBUG_PORT should be either 0, 1, 2, 3 or 666
 #endif
 
 
@@ -225,9 +315,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 +330,51 @@ 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_ATMEGA1280
+			#if CONFIG_KDEBUG_PORT == 0
+				UBRR0H = (uint8_t)(period>>8);
+				UBRR0L = (uint8_t)period;
+				KDBG_UART0_BUS_INIT;
+			#elif CONFIG_KDEBUG_PORT == 1
+				UBRR1H = (uint8_t)(period>>8);
+				UBRR1L = (uint8_t)period;
+				KDBG_UART1_BUS_INIT;
+			#elif CONFIG_KDEBUG_PORT == 2
+				UBRR2H = (uint8_t)(period>>8);
+				UBRR2L = (uint8_t)period;
+				KDBG_UART2_BUS_INIT;
+			#elif CONFIG_KDEBUG_PORT == 3
+				UBRR3H = (uint8_t)(period>>8);
+				UBRR3L = (uint8_t)period;
+				KDBG_UART3_BUS_INIT;
+			#else
+				#error CONFIG_KDEBUG_PORT must be either 0 or 1 or 2 or 3
+			#endif
+
+		#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