X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Fkdebug.c;h=f0afc9a899a4fb49defad37d8d4ead7b0af48659;hb=71daf6b25bbb86414b47f9c21426a5441c2c3c75;hp=729c9ec0b03958e92db242d1f0e7a50075a913f9;hpb=6ca5e6259460b1541d1b6e6d3f1ac9734901f573;p=bertos.git

diff --git a/drv/kdebug.c b/drv/kdebug.c
index 729c9ec0..f0afc9a8 100755
--- a/drv/kdebug.c
+++ b/drv/kdebug.c
@@ -1,4 +1,4 @@
-/*!
+/**
  * \file
  * <!--
  * Copyright 2003, 2004, 2005 Develer S.r.l. (http://www.develer.com/)
@@ -15,6 +15,18 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.31  2007/06/07 14:25:30  batt
+ *#* Merge from project_ks
+ *#*
+ *#* Revision 1.30  2007/01/28 09:18:06  batt
+ *#* Merge from project_ks.
+ *#*
+ *#* Revision 1.29  2006/11/23 13:19:39  batt
+ *#* Add BitBanged serial debug console.
+ *#*
+ *#* Revision 1.28  2006/07/19 12:56:25  bernie
+ *#* Convert to new Doxygen style.
+ *#*
  *#* Revision 1.27  2006/06/01 12:32:06  marco
  *#* Updated include reference.
  *#*
@@ -48,11 +60,16 @@
 #include <cfg/macros.h> /* for BV() */
 #include <appconfig.h>
 #include <hw_cpu.h>     /* for CLOCK_FREQ */
+#include <hw_ser.h>     /* Required for bus macros overrides */
 
 #include <mware/formatwr.h> /* for _formatted_write() */
 
 #ifdef _DEBUG
 
+#if CPU_HARVARD && !defined(_PROGMEM)
+	#error This module build correctly only in program memory!
+#endif
+
 #if defined(_EMUL)
 	#include <stdio.h>
 	#define KDBG_WAIT_READY()      do { /*nop*/ } while(0)
@@ -60,6 +77,10 @@
 	#define KDBG_MASK_IRQ(old)     do { (void)(old); } while(0)
 	#define KDBG_RESTORE_IRQ(old)  do { /*nop*/ } while(0)
 	typedef char kdbg_irqsave_t; /* unused */
+
+	#if CONFIG_KDEBUG_PORT == 666
+		#error BITBANG debug console missing for this platform
+	#endif
 #elif CPU_I196
 	#include "Util196.h"
 	#define KDBG_WAIT_READY()      do {} while (!(SP_STAT & (SPSF_TX_EMPTY | SPSF_TX_INT)))
@@ -71,6 +92,10 @@
 		} while(0)
 	#define KDBG_RESTORE_IRQ(old)  do { INT_MASK1 |= (old); }
 	typedef uint16_t kdbg_irqsave_t; /* FIXME: unconfirmed */
+
+	#if CONFIG_KDEBUG_PORT == 666
+		#error BITBANG debug console missing for this platform
+	#endif
 #elif CPU_AVR
 	#include <avr/io.h>
 
@@ -78,7 +103,7 @@
 
 		/*
 		 * Support for special bus policies or external transceivers
-		 * on UART0 (to be overridden in "hw.h").
+		 * on UART0 (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
@@ -87,7 +112,7 @@
 		 */
 		#ifndef KDBG_UART0_BUS_INIT
 		#define KDBG_UART0_BUS_INIT  do { \
-				UCSR0B = BV(TXEN); \
+				UCSR0B = BV(TXEN0); \
 			} while (0)
 		#endif
 		#ifndef KDBG_UART0_BUS_RX
@@ -97,7 +122,7 @@
 		#define KDBG_UART0_BUS_TX    do {} while (0)
 		#endif
 
-		#if CPU_AVR_ATMEGA64 || CPU_AVR_ATMEGA128
+		#if CPU_AVR_ATMEGA64 || CPU_AVR_ATMEGA128 || CPU_AVR_ATMEGA168
 			#define UCR UCSR0B
 			#define UDR UDR0
 			#define USR UCSR0A
@@ -108,8 +133,8 @@
 			#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)
+		#define KDBG_WAIT_READY()     do { loop_until_bit_is_set(USR, UDRE0); } while(0)
+		#define KDBG_WAIT_TXDONE()    do { loop_until_bit_is_set(USR, TXC0); } while(0)
 
 		/*
 		 * We must clear the TXC flag before sending a new character to allow
@@ -120,12 +145,12 @@
 		 * character is written to UDR.  On a 485 bus, the transceiver will be put
 		 * in RX mode while still transmitting the last char.
 		 */
-		#define KDBG_WRITE_CHAR(c)    do { USR |= BV(TXC); UDR = (c); } while(0)
+		#define KDBG_WRITE_CHAR(c)    do { USR |= BV(TXC0); UDR = (c); } while(0)
 
 		#define KDBG_MASK_IRQ(old)    do { \
 			(old) = UCR; \
-			UCR |= BV(TXEN); \
-			UCR &= ~(BV(TXCIE) | BV(UDRIE)); \
+			UCR |= BV(TXEN0); \
+			UCR &= ~(BV(TXCIE0) | BV(UDRIE0)); \
 			KDBG_UART0_BUS_TX; \
 		} while(0)
 
@@ -141,7 +166,7 @@
 
 		/*
 		 * Support for special bus policies or external transceivers
-		 * on UART1 (to be overridden in "hw.h").
+		 * 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
@@ -150,7 +175,7 @@
 		 */
 		#ifndef KDBG_UART1_BUS_INIT
 		#define KDBG_UART1_BUS_INIT  do { \
-				UCSR1B = BV(TXEN); \
+				UCSR1B = BV(TXEN1); \
 			} while (0)
 		#endif
 		#ifndef KDBG_UART1_BUS_RX
@@ -160,14 +185,14 @@
 		#define KDBG_UART1_BUS_TX    do {} while (0)
 		#endif
 
-		#define KDBG_WAIT_READY()     do { loop_until_bit_is_set(UCSR1A, UDRE); } while(0)
-		#define KDBG_WAIT_TXDONE()    do { loop_until_bit_is_set(UCSR1A, TXC); } while(0)
-		#define KDBG_WRITE_CHAR(c)    do { UCSR1A |= BV(TXC); UDR1 = (c); } while(0)
+		#define KDBG_WAIT_READY()     do { loop_until_bit_is_set(UCSR1A, UDRE1); } while(0)
+		#define KDBG_WAIT_TXDONE()    do { loop_until_bit_is_set(UCSR1A, TXC1); } while(0)
+		#define KDBG_WRITE_CHAR(c)    do { UCSR1A |= BV(TXC1); UDR1 = (c); } while(0)
 
 		#define KDBG_MASK_IRQ(old)    do { \
 			(old) = UCSR1B; \
-			UCSR1B |= BV(TXEN); \
-			UCSR1B &= ~(BV(TXCIE) | BV(UDRIE)); \
+			UCSR1B |= BV(TXEN1); \
+			UCSR1B &= ~(BV(TXCIE1) | BV(UDRIE1)); \
 			KDBG_UART1_BUS_TX; \
 		} while(0)
 
@@ -178,8 +203,35 @@
 		} 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"
+		#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;
+
+		#define KDBG_DELAY (((CLOCK_FREQ + CONFIG_KDEBUG_BAUDRATE / 2) / CONFIG_KDEBUG_BAUDRATE) + 7) / 14
+
+		static void _kdebug_bitbang_delay(void)
+		{
+			unsigned long i;
+
+			for (i = 0; i < KDBG_DELAY; i++)
+			{
+				NOP;
+				NOP;
+				NOP;
+				NOP;
+				NOP;
+			}
+		}
 	#else
-		#error CONFIG_KDEBUG_PORT should be either 0 or 1
+		#error CONFIG_KDEBUG_PORT should be either 0, 1 or 666
 	#endif
 #elif defined(__MWERKS__) && CPU_DSP56K
 	/* Debugging go through the JTAG interface. The MSL library already
@@ -190,10 +242,50 @@
 	#define KDBG_MASK_IRQ(old)        do { (void)(old); } while (0)
 	#define KDBG_RESTORE_IRQ(old)     do { (void)(old); } while (0)
 	typedef uint8_t kdbg_irqsave_t; /* unused */
+	#if CONFIG_KDEBUG_PORT == 666
+		#error BITBANG debug console missing for this platform
+	#endif
 #else
 	#error Unknown architecture
 #endif
 
+#if CONFIG_KDEBUG_PORT == 666
+	/**
+	 * 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.
+	 * 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)
+	 * \note All interrupts are disabled during debug prints!
+	 */
+	static void _kdebug_bitbang_putchar(char c)
+	{
+		int i;
+		uint16_t data = c;
+
+		/* Add stop bit */
+		data |= 0x0100;
+
+		/* Add start bit*/
+		data <<= 1;
+
+		/* Shift out data */
+		uint16_t shift = 1;
+		for (i = 0; i < 10; i++)
+		{
+			if (data & shift)
+				SER_BITBANG_HIGH;
+			else
+				SER_BITBANG_LOW;
+			_kdebug_bitbang_delay();
+			shift <<= 1;
+		}
+	}
+#endif
+
+
+
 
 void kdbg_init(void)
 {
@@ -208,31 +300,39 @@ void kdbg_init(void)
 	BAUD_RATE = 0x80;
 
 #elif CPU_AVR
+	#if CONFIG_KDEBUG_PORT == 666
+		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;
+
+		#if (CPU_AVR_ATMEGA64 || CPU_AVR_ATMEGA128)
+			#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;
+			#else
+				#error CONFIG_KDEBUG_PORT must be either 0 or 1
+			#endif
 
-	/* Compute the baud rate */
-	uint16_t period = (((CLOCK_FREQ / 16UL) + (CONFIG_KDEBUG_BAUDRATE / 2)) / CONFIG_KDEBUG_BAUDRATE) - 1;
-
-	#if CPU_AVR_ATMEGA64 || CPU_AVR_ATMEGA128
-		#if CONFIG_KDEBUG_PORT == 0
+		#elif CPU_AVR_ATMEGA168
 			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 CPU_AVR_ATMEGA8
+			UBRRH = (uint8_t)(period>>8);
+			UBRRL = (uint8_t)period;
+		#elif CPU_AVR_ATMEGA103
+			UBRR = (uint8_t)period;
+			KDBG_UART0_BUS_INIT;
 		#else
-			#error CONFIG_KDEBUG_PORT must be either 0 or 1
+			#error Unknown CPU
 		#endif
-	#elif CPU_AVR_ATMEGA8
-		UBRRH = (uint8_t)(period>>8);
-		UBRRL = (uint8_t)period;
-	#elif CPU_AVR_ATMEGA103
-		UBRR = (uint8_t)period;
-		KDBG_UART0_BUS_INIT;
-	#else
-		#error Unknown CPU
-	#endif
+	#endif /* CONFIG_KDEBUG_PORT == 666 */
 
 #endif /* !CPU_I196 && !CPU_AVR */
 
@@ -240,7 +340,7 @@ void kdbg_init(void)
 }
 
 
-/*!
+/**
  * Output one character to the debug console
  */
 static void __kputchar(char c, UNUSED_ARG(void *, unused))
@@ -313,7 +413,7 @@ void PGM_FUNC(kputs)(const char * PGM_ATTR str)
 }
 
 
-/*!
+/**
  * Cheap function to print small integers without using printf().
  */
 int kputnum(int num)
@@ -426,7 +526,7 @@ int PGM_FUNC(__check_wall)(long *wall, int size, const char * PGM_ATTR name, con
 
 #if CONFIG_PRINTF
 
-/*!
+/**
  * Dump binary data in hex
  */
 void kdump(const void *_buf, size_t len)