X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Fkdebug.c;h=88554e9571faedaa94bb374540140b7e809c9956;hb=1f9a4aef45e0bf55a31bf88a828ebd867cf32a34;hp=471e6f4ea41d52841dd897e51059d7a0aadb4fbb;hpb=0e46cbbbd56d4a79f41cec484f19048370e6df80;p=bertos.git

diff --git a/drv/kdebug.c b/drv/kdebug.c
index 471e6f4e..88554e95 100755
--- a/drv/kdebug.c
+++ b/drv/kdebug.c
@@ -1,21 +1,32 @@
 /*!
  * \file
  * <!--
- * Copyright 2003,2004 Develer S.r.l. (http://www.develer.com/)
- * Copyright 2000,2001,2002 Bernardo Innocenti <bernie@codewiz.org>
+ * Copyright 2003, 2004 Develer S.r.l. (http://www.develer.com/)
+ * Copyright 2000, 2001, 2002 Bernardo Innocenti <bernie@codewiz.org>
  * This file is part of DevLib - See devlib/README for information.
  * -->
  *
- * \brief General pourpose debug functions.
+ * \brief General pourpose debug support for embedded systems (implementation).
  *
  * \version $Id$
- *
  * \author Bernardo Innocenti <bernie@develer.com>
  * \author Stefano Fedrigo <aleph@develer.com>
  */
 
 /*#*
  *#* $Log$
+ *#* Revision 1.17  2004/10/03 18:41:28  bernie
+ *#* Restore \version header killed by mistake in previous commit.
+ *#*
+ *#* Revision 1.16  2004/10/03 18:40:50  bernie
+ *#* Use new CPU macros.
+ *#*
+ *#* Revision 1.15  2004/09/14 21:03:46  bernie
+ *#* Use debug.h instead of kdebug.h.
+ *#*
+ *#* Revision 1.14  2004/09/06 21:39:56  bernie
+ *#* Allow partial redefinition of BUS macros.
+ *#*
  *#* Revision 1.13  2004/08/29 22:04:26  bernie
  *#* Convert 485 macros to generic BUS macros;
  *#* kputchar(): New public function.
@@ -58,7 +69,8 @@
  *#*
  *#*/
 
-#include "kdebug.h"
+#include <debug.h>
+#include <cpu.h>
 #include "hw.h"
 #include "config.h"
 
@@ -93,28 +105,30 @@
 		 * Support for special bus policies or external transceivers
 		 * on UART0 (to be overridden in "hw.h").
 		 */
-		#if !defined(KDBG_UART0_BUS_INIT)
-			#if defined(KDBG_UART0_BUS_RX) || defined(KDBG_UART0_BUS_TX)
-				#error KDBG_UART0_BUS_INIT, KDBG_UART0_BUS_RX and KDBG_UART0_BUS_TX must be defined together
-			#endif
-			#define KDBG_UART0_BUS_INIT  do {} while (0)
-			#define KDBG_UART0_BUS_TX    do {} while (0)
-			#define KDBG_UART0_BUS_RX    do {} while (0)
-		#elif !defined(KDBG_UART0_BUS_RX) || !defined(KDBG_UART0_BUS_TX)
-			#error KDBG_UART0_BUS_INIT, KDBG_UART0_BUS_RX and KDBG_UART0_BUS_TX must be defined together
+		#ifndef KDBG_UART0_BUS_INIT
+		#define KDBG_UART0_BUS_INIT  do {} while (0)
+		#endif
+		#ifndef KDBG_UART0_BUS_RX
+		#define KDBG_UART0_BUS_RX    do {} while (0)
+		#endif
+		#ifndef KDBG_UART0_BUS_TX
+		#define KDBG_UART0_BUS_TX    do {} while (0)
 		#endif
 
-		#if defined(__AVR_ATmega64__)
+		#if CPU_AVR_ATMEGA64
 			#define UCR UCSR0B
 			#define UDR UDR0
 			#define USR UCSR0A
-		#elif defined(__AVR_ATmega8__)
+		#elif CPU_AVR_ATMEGA8
 			#define UCR UCSRB
 			#define USR UCSRA
+		#else
+			#error Unknown CPU
 		#endif
 
 		#define KDBG_WAIT_READY()     do { loop_until_bit_is_set(USR, UDRE); } while(0)
 		#define KDBG_WAIT_TXDONE()    do { loop_until_bit_is_set(USR, TXC); } while(0)
+
 		/*
 		 * We must clear the TXC flag before sending a new character to allow
 		 * KDBG_WAIT_TXDONE() to work properly.
@@ -127,10 +141,10 @@
 		#define KDBG_WRITE_CHAR(c)    do { USR |= BV(TXC); UDR = (c); } while(0)
 
 		#define KDBG_MASK_IRQ(old)    do { \
-			KDBG_UART0_BUS_TX; \
 			(old) = UCR; \
 			UCR |= BV(TXEN); \
 			UCR &= ~(BV(TXCIE) | BV(UDRIE)); \
+			KDBG_UART0_BUS_TX; \
 		} while(0)
 
 		#define KDBG_RESTORE_IRQ(old) do { \
@@ -148,14 +162,13 @@
 		 * on UART1 (to be overridden in "hw.h").
 		 */
 		#ifndef KDBG_UART1_BUS_INIT
-			#if defined(KDBG_UART1_BUS_RX) || defined(KDBG_UART1_BUS_TX)
-				#error KDBG_UART1_BUS_INIT, KDBG_UART1_BUS_RX and KDBG_UART1_BUS_TX must be defined together
-			#endif
-			#define KDBG_UART1_BUS_INIT  do {} while (0)
-			#define KDBG_UART1_BUS_TX    do {} while (0)
-			#define KDBG_UART1_BUS_RX    do {} while (0)
-		#elif !defined(KDBG_UART1_BUS_RX) || !defined(KDBG_UART1_BUS_TX)
-			#error KDBG_UART1_BUS_INIT, KDBG_UART1_BUS_RX and KDBG_UART1_BUS_TX must be defined together
+		#define KDBG_UART1_BUS_INIT  do {} while (0)
+		#endif
+		#ifndef KDBG_UART1_BUS_RX
+		#define KDBG_UART1_BUS_RX    do {} while (0)
+		#endif
+		#ifndef KDBG_UART1_BUS_TX
+		#define KDBG_UART1_BUS_TX    do {} while (0)
 		#endif
 
 		#define KDBG_WAIT_READY()     do { loop_until_bit_is_set(UCSR1A, UDRE); } while(0)
@@ -163,10 +176,10 @@
 		#define KDBG_WRITE_CHAR(c)    do { UCSR1A |= BV(TXC); UDR1 = (c); } while(0)
 
 		#define KDBG_MASK_IRQ(old)    do { \
-			KDBG_UART1_BUS_TX; \
 			(old) = UCSR1B; \
 			UCSR1B |= BV(TXEN); \
 			UCSR1B &= ~(BV(TXCIE) | BV(UDRIE)); \
+			KDBG_UART1_BUS_TX; \
 		} while(0)
 
 		#define KDBG_RESTORE_IRQ(old) do { \
@@ -210,7 +223,7 @@ void kdbg_init(void)
 	/* Compute the baud rate */
 	uint16_t period = (((CLOCK_FREQ / 16UL) + (CONFIG_KDEBUG_BAUDRATE / 2)) / CONFIG_KDEBUG_BAUDRATE) - 1;
 
-	#if defined(__AVR_ATmega64__)
+	#if CPU_AVR_ATMEGA64
 		#if CONFIG_KDEBUG_PORT == 0
 			UBRR0H = (uint8_t)(period>>8);
 			UBRR0L = (uint8_t)period;
@@ -222,14 +235,14 @@ void kdbg_init(void)
 		#else
 			#error CONFIG_KDEBUG_PORT must be either 0 or 1
 		#endif
-	#elif defined(__AVR_ATmega8__)
+	#elif CPU_AVR_ATMEGA8
 		UBRRH = (uint8_t)(period>>8);
 		UBRRL = (uint8_t)period;
-	#elif defined(__AVR_ATmega103__)
+	#elif CPU_AVR_ATMEGA103
 		UBRR = (uint8_t)period;
 		KDBG_UART0_BUS_INIT;
 	#else
-		#error Unknown arch
+		#error Unknown CPU
 	#endif
 
 #endif /* !CPU_I196 && !CPU_AVR */