X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Fkdebug.c;h=1bf07e43eda21ded245be6abc51e5ee5c29b78ef;hb=04cdf83948ae2bf7d6404be4d5816707092619f3;hp=ee09a74732d5f7b30c5e73d3b3ef0595cdf8a843;hpb=f89fd27fa6c599e806772ba44ec987b8583022e0;p=bertos.git

diff --git a/drv/kdebug.c b/drv/kdebug.c
index ee09a747..1bf07e43 100755
--- a/drv/kdebug.c
+++ b/drv/kdebug.c
@@ -15,6 +15,18 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.26  2006/04/27 05:40:27  bernie
+ *#* Break on assertion failures.
+ *#*
+ *#* Revision 1.25  2005/06/27 21:26:24  bernie
+ *#* Misc PGM fixes.
+ *#*
+ *#* Revision 1.24  2005/04/12 01:36:37  bernie
+ *#* Add hack to enable TX line at module initialization.
+ *#*
+ *#* Revision 1.23  2005/04/11 19:10:27  bernie
+ *#* Include top-level headers from cfg/ subdir.
+ *#*
  *#* Revision 1.22  2005/02/18 11:18:33  bernie
  *#* Fixes for Harvard processors from project_ks.
  *#*
@@ -28,10 +40,10 @@
  *#* Rename UNUSED() to UNUSED_ARG().
  *#*/
 
-#include <debug.h>
-#include <cpu.h>
-#include <macros.h> /* for BV() */
-#include <config.h>
+#include <cfg/debug.h>
+#include <cfg/cpu.h>
+#include <cfg/macros.h> /* for BV() */
+#include <appconfig.h>
 #include <hw.h>
 
 #include <mware/formatwr.h> /* for _formatted_write() */
@@ -64,9 +76,16 @@
 		/*
 		 * Support for special bus policies or external transceivers
 		 * on UART0 (to be overridden in "hw.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_UART0_BUS_INIT
-		#define KDBG_UART0_BUS_INIT  do {} while (0)
+		#define KDBG_UART0_BUS_INIT  do { \
+				UCSR0B = BV(TXEN); \
+			} while (0)
 		#endif
 		#ifndef KDBG_UART0_BUS_RX
 		#define KDBG_UART0_BUS_RX    do {} while (0)
@@ -75,7 +94,7 @@
 		#define KDBG_UART0_BUS_TX    do {} while (0)
 		#endif
 
-		#if CPU_AVR_ATMEGA64
+		#if CPU_AVR_ATMEGA64 || CPU_AVR_ATMEGA128
 			#define UCR UCSR0B
 			#define UDR UDR0
 			#define USR UCSR0A
@@ -120,9 +139,16 @@
 		/*
 		 * Support for special bus policies or external transceivers
 		 * on UART1 (to be overridden in "hw.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 {} while (0)
+		#define KDBG_UART1_BUS_INIT  do { \
+				UCSR1B = BV(TXEN); \
+			} while (0)
 		#endif
 		#ifndef KDBG_UART1_BUS_RX
 		#define KDBG_UART1_BUS_RX    do {} while (0)
@@ -183,7 +209,7 @@ void kdbg_init(void)
 	/* Compute the baud rate */
 	uint16_t period = (((CLOCK_FREQ / 16UL) + (CONFIG_KDEBUG_BAUDRATE / 2)) / CONFIG_KDEBUG_BAUDRATE) - 1;
 
-	#if CPU_AVR_ATMEGA64
+	#if CPU_AVR_ATMEGA64 || CPU_AVR_ATMEGA128
 		#if CONFIG_KDEBUG_PORT == 0
 			UBRR0H = (uint8_t)(period>>8);
 			UBRR0L = (uint8_t)period;
@@ -315,15 +341,16 @@ static void klocation(const char * PGM_ATTR file, int line)
 	PGM_FUNC(kputs)(file);
 	kputchar(':');
 	kputnum(line);
-	PGM_FUNC(kputs)(PSTR(": "));
+	PGM_FUNC(kputs)(PGM_STR(": "));
 }
 
 int PGM_FUNC(__assert)(const char * PGM_ATTR cond, const char * PGM_ATTR file, int line)
 {
 	klocation(file, line);
-	PGM_FUNC(kputs)(PSTR("Assertion failed: "));
+	PGM_FUNC(kputs)(PGM_STR("Assertion failed: "));
 	PGM_FUNC(kputs)(cond);
 	kputchar('\n');
+	BREAKPOINT;
 	return 1;
 }
 
@@ -334,26 +361,27 @@ int PGM_FUNC(__assert)(const char * PGM_ATTR cond, const char * PGM_ATTR file, i
  */
 void PGM_FUNC(__trace)(const char *name)
 {
-	PGM_FUNC(kprintf)(PSTR("%s()\n"), name);
+	PGM_FUNC(kprintf)(PGM_STR("%s()\n"), name);
 }
 
 void PGM_FUNC(__tracemsg)(const char *name, const char * PGM_ATTR fmt, ...)
 {
 	va_list ap;
 
-	PGM_FUNC(kprintf)(PSTR("%s(): "), name);
+	PGM_FUNC(kprintf)(PGM_STR("%s(): "), name);
 	va_start(ap, fmt);
 	PGM_FUNC(kvprintf)(fmt, ap);
 	va_end(ap);
+	kputchar('\n');
 }
 
 int PGM_FUNC(__invalid_ptr)(void *value, const char * PGM_ATTR name, const char * PGM_ATTR file, int line)
 {
 	klocation(file, line);
-	PGM_FUNC(kputs)(PSTR("Invalid ptr: "));
+	PGM_FUNC(kputs)(PGM_STR("Invalid ptr: "));
 	PGM_FUNC(kputs)(name);
 	#if CONFIG_PRINTF
-		PGM_FUNC(kprintf)(PSTR(" = 0x%x\n"), value);
+		PGM_FUNC(kprintf)(PGM_STR(" = 0x%x\n"), (unsigned int)value);
 	#else
 		(void)value;
 		kputchar('\n');
@@ -378,10 +406,10 @@ int PGM_FUNC(__check_wall)(long *wall, int size, const char * PGM_ATTR name, con
 		if (wall[i] != WALL_VALUE)
 		{
 			klocation(file, line);
-			PGM_FUNC(kputs)(PSTR("Wall broken: "));
+			PGM_FUNC(kputs)(PGM_STR("Wall broken: "));
 			PGM_FUNC(kputs)(name);
 			#if CONFIG_PRINTF
-				PGM_FUNC(kprintf)(PSTR("[%d] (0x%p) = 0x%lx\n"), i, wall + i, wall[i]);
+				PGM_FUNC(kprintf)(PGM_STR("[%d] (0x%p) = 0x%lx\n"), i, wall + i, wall[i]);
 			#else
 				kputchar('\n');
 			#endif