X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Fkdebug.c;h=1bf07e43eda21ded245be6abc51e5ee5c29b78ef;hb=7cdf81c108da99a05becc875182cee065167e91c;hp=03a86430787ad181e27902deecde4337b79800a0;hpb=06f0503a2066ab4fd13529b8ed8906e52b1d672b;p=bertos.git diff --git a/drv/kdebug.c b/drv/kdebug.c index 03a86430..1bf07e43 100755 --- a/drv/kdebug.c +++ b/drv/kdebug.c @@ -1,9 +1,9 @@ /*! * \file * * * \brief General pourpose debug support for embedded systems (implementation). @@ -15,67 +15,36 @@ /*#* *#* $Log$ - *#* Revision 1.18 2004/12/08 08:52:00 bernie - *#* Save some more RAM on AVR. + *#* Revision 1.26 2006/04/27 05:40:27 bernie + *#* Break on assertion failures. *#* - *#* Revision 1.17 2004/10/03 18:41:28 bernie - *#* Restore \version header killed by mistake in previous commit. + *#* Revision 1.25 2005/06/27 21:26:24 bernie + *#* Misc PGM fixes. *#* - *#* Revision 1.16 2004/10/03 18:40:50 bernie - *#* Use new CPU macros. + *#* Revision 1.24 2005/04/12 01:36:37 bernie + *#* Add hack to enable TX line at module initialization. *#* - *#* Revision 1.15 2004/09/14 21:03:46 bernie - *#* Use debug.h instead of kdebug.h. + *#* Revision 1.23 2005/04/11 19:10:27 bernie + *#* Include top-level headers from cfg/ subdir. *#* - *#* Revision 1.14 2004/09/06 21:39:56 bernie - *#* Allow partial redefinition of BUS macros. + *#* Revision 1.22 2005/02/18 11:18:33 bernie + *#* Fixes for Harvard processors from project_ks. *#* - *#* Revision 1.13 2004/08/29 22:04:26 bernie - *#* Convert 485 macros to generic BUS macros; - *#* kputchar(): New public function. + *#* Revision 1.21 2005/02/16 20:29:48 bernie + *#* TRACE(), TRACEMSG(): Reduce code and data footprint. *#* - *#* 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. + *#* Revision 1.20 2005/01/25 08:36:40 bernie + *#* kputnum(): Export. *#* + *#* Revision 1.19 2004/12/31 17:47:45 bernie + *#* Rename UNUSED() to UNUSED_ARG(). *#*/ -#include -#include -#include "hw.h" -#include "config.h" +#include +#include +#include /* for BV() */ +#include +#include #include /* for _formatted_write() */ @@ -107,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) @@ -118,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 @@ -163,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) @@ -226,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; @@ -257,7 +240,7 @@ void kdbg_init(void) /*! * Output one character to the debug console */ -static void __kputchar(char c, UNUSED(void *, unused)) +static void __kputchar(char c, UNUSED_ARG(void *, unused)) { /* Poll while serial buffer is still busy */ KDBG_WAIT_READY(); @@ -286,19 +269,14 @@ void kputchar(char c) } -void PGM_FUNC(kprintf)(const char * PGM_ATTR fmt, ...) +static void PGM_FUNC(kvprintf)(const char * PGM_ATTR fmt, va_list ap) { - #if CONFIG_PRINTF - va_list ap; - /* Mask serial TX intr */ kdbg_irqsave_t irqsave; KDBG_MASK_IRQ(irqsave); - va_start(ap, fmt); PGM_FUNC(_formatted_write)(fmt, __kputchar, 0, ap); - va_end(ap); /* Restore serial TX intr */ KDBG_RESTORE_IRQ(irqsave); @@ -308,6 +286,14 @@ void PGM_FUNC(kprintf)(const char * PGM_ATTR fmt, ...) #endif /* CONFIG_PRINTF */ } +void PGM_FUNC(kprintf)(const char * PGM_ATTR fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + PGM_FUNC(kvprintf)(fmt, ap); + va_end(ap); +} void PGM_FUNC(kputs)(const char * PGM_ATTR str) { @@ -327,7 +313,7 @@ void PGM_FUNC(kputs)(const char * PGM_ATTR str) /*! * Cheap function to print small integers without using printf(). */ -static int kputnum(int num) +int kputnum(int num) { int output_len = 0; int divisor = 10000; @@ -355,26 +341,47 @@ 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; } +/* + * 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(kprintf)(PGM_STR("%s()\n"), name); +} + +void PGM_FUNC(__tracemsg)(const char *name, const char * PGM_ATTR fmt, ...) +{ + va_list ap; + + 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'); @@ -399,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