X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Fkdebug.c;h=27e365116552155a5a85789215fd0f4e4a621eb2;hb=89055a8545877865c37fbe0f590e7d429ae00c4a;hp=a8159022c061159c5bcdca5ba930672f1f61eaef;hpb=e6501d0243737373dbbd18210c94a92953bd44af;p=bertos.git

diff --git a/drv/kdebug.c b/drv/kdebug.c
index a8159022..27e36511 100755
--- a/drv/kdebug.c
+++ b/drv/kdebug.c
@@ -15,6 +15,15 @@
 
 /*#*
  *#* $Log$
+ *#* 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.
+ *#*
  *#* Revision 1.21  2005/02/16 20:29:48  bernie
  *#* TRACE(), TRACEMSG(): Reduce code and data footprint.
  *#*
@@ -23,68 +32,12 @@
  *#*
  *#* Revision 1.19  2004/12/31 17:47:45  bernie
  *#* Rename UNUSED() to UNUSED_ARG().
- *#*
- *#* Revision 1.18  2004/12/08 08:52:00  bernie
- *#* Save some more RAM on AVR.
- *#*
- *#* 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.
- *#*
- *#* Revision 1.12  2004/08/25 14:12:08  rasky
- *#* Aggiornato il comment block dei log RCS
- *#*
- *#* Revision 1.11  2004/08/24 16:19:08  bernie
- *#* kputchar(): New public function; Add missing dummy inlines for \!_DEBUG.
- *#*
- *#* Revision 1.10  2004/08/04 15:57:50  rasky
- *#* Cambiata la putchar per kdebug per DSP56k: la nuova funzione e' quella piu' a basso livello (assembly)
- *#*
- *#* Revision 1.9  2004/08/02 20:20:29  aleph
- *#* Merge from project_ks
- *#*
- *#* Revision 1.8  2004/07/30 14:26:33  rasky
- *#* Semplificato l'output dell'ASSERT
- *#* Aggiunta ASSERT2 con stringa di help opzionalmente disattivabile
- *#*
- *#* Revision 1.7  2004/07/30 14:15:53  rasky
- *#* Nuovo supporto unificato per detect della CPU
- *#*
- *#* Revision 1.6  2004/07/18 21:49:28  bernie
- *#* Add ATmega8 support.
- *#*
- *#* Revision 1.5  2004/06/27 15:20:26  aleph
- *#* Change UNUSED() macro to accept two arguments: type and name;
- *#* Add macro GNUC_PREREQ to detect GCC version during build;
- *#* Some spacing cleanups and typo fix
- *#*
- *#* Revision 1.4  2004/06/06 18:09:51  bernie
- *#* Import DSP56800 changes; Print broken wall bricks in hex.
- *#*
- *#* Revision 1.3  2004/06/03 11:27:09  bernie
- *#* Add dual-license information.
- *#*
- *#* Revision 1.2  2004/05/23 18:21:53  bernie
- *#* Trim CVS logs and cleanup header info.
- *#*
  *#*/
 
-#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 <cfg/config.h>
 #include <hw.h>
 
 #include <mware/formatwr.h> /* for _formatted_write() */
@@ -117,9 +70,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)
@@ -173,9 +133,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)
@@ -296,7 +263,7 @@ void kputchar(char c)
 }
 
 
-void PGM_FUNC(kvprintf)(const char * PGM_ATTR fmt, va_list ap)
+static void PGM_FUNC(kvprintf)(const char * PGM_ATTR fmt, va_list ap)
 {
 #if CONFIG_PRINTF
 	/* Mask serial TX intr */
@@ -380,18 +347,21 @@ int PGM_FUNC(__assert)(const char * PGM_ATTR cond, const char * PGM_ATTR file, i
 	return 1;
 }
 
-void PGM_FUNC(__trace)(const char * PGM_ATTR name)
+/*
+ * Unfortunately, there's no way to get __func__ in
+ * program memory, so we waste quite a lot of RAM in
+ * AVR and other Harvard processors.
+ */
+void PGM_FUNC(__trace)(const char *name)
 {
-	PGM_FUNC(kputs)(name);
-	PGM_FUNC(kputs)(PSTR("()\n"));
+	PGM_FUNC(kprintf)(PSTR("%s()\n"), name);
 }
 
-void PGM_FUNC(__tracemsg)(const char * PGM_ATTR name, const char * PGM_ATTR fmt, ...)
+void PGM_FUNC(__tracemsg)(const char *name, const char * PGM_ATTR fmt, ...)
 {
 	va_list ap;
 
-	PGM_FUNC(kputs)(name);
-	PGM_FUNC(kputs)(PSTR("(): "));
+	PGM_FUNC(kprintf)(PSTR("%s(): "), name);
 	va_start(ap, fmt);
 	PGM_FUNC(kvprintf)(fmt, ap);
 	va_end(ap);