X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Fkdebug.c;h=1e20615a59cc8d1a16cd0c84e060ec3be03a2e18;hb=2535cb94ec2183791128f8bbd109ca69a960cf78;hp=ee09a74732d5f7b30c5e73d3b3ef0595cdf8a843;hpb=f89fd27fa6c599e806772ba44ec987b8583022e0;p=bertos.git diff --git a/drv/kdebug.c b/drv/kdebug.c old mode 100755 new mode 100644 index ee09a747..1e20615a --- a/drv/kdebug.c +++ b/drv/kdebug.c @@ -1,9 +1,34 @@ -/*! +/** * \file * * * \brief General pourpose debug support for embedded systems (implementation). @@ -13,205 +38,54 @@ * \author Stefano Fedrigo */ -/*#* - *#* $Log$ - *#* 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. - *#* - *#* 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 /* for BV() */ -#include -#include + +#include +#include +#include +#include +#include /* for BV() */ +#include +#warning what about these? +//#include /* for CLOCK_FREQ */ +//#include /* Required for bus macros overrides */ #include /* for _formatted_write() */ +#include #ifdef _DEBUG -#if defined(_EMUL) +#if CPU_HARVARD && !defined(_PROGMEM) + #error This module build correctly only in program memory! +#endif + + +#if OS_HOSTED #include #define KDBG_WAIT_READY() do { /*nop*/ } while(0) - #define KDBG_WRITE_CHAR(c) putchar((c)) + #define KDBG_WRITE_CHAR(c) putc((c), stderr) #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 */ -#elif CPU_I196 - #include "Util196.h" - #define KDBG_WAIT_READY() do {} while (!(SP_STAT & (SPSF_TX_EMPTY | SPSF_TX_INT))) - #define KDBG_WRITE_CHAR(c) do { SBUF = (c); } while(0) - #define KDBG_MASK_IRQ(old) \ - do { \ - (old) = INT_MASK1 & INT1F_TI; \ - INT_MASK1 &= ~INT1F_TI; \ - } while(0) - #define KDBG_RESTORE_IRQ(old) do { INT_MASK1 |= (old); } - typedef uint16_t kdbg_irqsave_t; /* FIXME: unconfirmed */ -#elif CPU_AVR - #include - - #if CONFIG_KDEBUG_PORT == 0 - - /* - * Support for special bus policies or external transceivers - * on UART0 (to be overridden in "hw.h"). - */ - #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 CPU_AVR_ATMEGA64 - #define UCR UCSR0B - #define UDR UDR0 - #define USR UCSR0A - #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. - * - * BUG: if KDBG_WRITE_CHAR() is called after the TXC flag is set by hardware, - * a new TXC could be generated after we've cleared it and before the new - * 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_MASK_IRQ(old) do { \ - (old) = UCR; \ - UCR |= BV(TXEN); \ - UCR &= ~(BV(TXCIE) | BV(UDRIE)); \ - KDBG_UART0_BUS_TX; \ - } while(0) - - #define KDBG_RESTORE_IRQ(old) do { \ - KDBG_WAIT_TXDONE(); \ - KDBG_UART0_BUS_RX; \ - UCR = (old); \ - } while(0) - - typedef uint8_t kdbg_irqsave_t; - - #elif CONFIG_KDEBUG_PORT == 1 - - /* - * Support for special bus policies or external transceivers - * on UART1 (to be overridden in "hw.h"). - */ - #ifndef KDBG_UART1_BUS_INIT - #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) - #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_MASK_IRQ(old) do { \ - (old) = UCSR1B; \ - UCSR1B |= BV(TXEN); \ - UCSR1B &= ~(BV(TXCIE) | BV(UDRIE)); \ - KDBG_UART1_BUS_TX; \ - } while(0) - - #define KDBG_RESTORE_IRQ(old) do { \ - KDBG_WAIT_TXDONE(); \ - KDBG_UART1_BUS_RX; \ - UCSR1B = (old); \ - } while(0) - - typedef uint8_t kdbg_irqsave_t; - #else - #error CONFIG_KDEBUG_PORT should be either 0 or 1 + + #define kdbg_hw_init() do {} while (0) ///< Not needed + + #if CONFIG_KDEBUG_PORT == 666 + #error BITBANG debug console missing for this platform #endif -#elif defined(__MWERKS__) && CPU_DSP56K - /* Debugging go through the JTAG interface. The MSL library already - implements the console I/O correctly. */ - #include - #define KDBG_WAIT_READY() do { } while (0) - #define KDBG_WRITE_CHAR(c) __put_char(c, stdout) - #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 */ #else - #error Unknown architecture + #include CPU_CSOURCE(kdebug) #endif void kdbg_init(void) { -#if CPU_I196 - - /* Set serial port for 19200bps 8N1 */ - INT_MASK1 &= ~(INT1F_TI | INT1F_RI); - SP_CON = SPCF_RECEIVE_ENABLE | SPCF_MODE1; - ioc1_img |= IOC1F_TXD_SEL | IOC1F_EXTINT_SRC; - IOC1 = ioc1_img; - BAUD_RATE = 0x33; - BAUD_RATE = 0x80; - -#elif CPU_AVR - - /* Compute the baud rate */ - uint16_t period = (((CLOCK_FREQ / 16UL) + (CONFIG_KDEBUG_BAUDRATE / 2)) / CONFIG_KDEBUG_BAUDRATE) - 1; - - #if CPU_AVR_ATMEGA64 - #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 - #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 /* !CPU_I196 && !CPU_AVR */ - - kputs("\n\n*** DBG START ***\n"); + /* Init debug hw */ + kdbg_hw_init(); + kputs("\n\n*** BeRTOS DBG START ***\n"); } -/*! +/** * Output one character to the debug console */ static void __kputchar(char c, UNUSED_ARG(void *, unused)) @@ -284,7 +158,7 @@ void PGM_FUNC(kputs)(const char * PGM_ATTR str) } -/*! +/** * Cheap function to print small integers without using printf(). */ int kputnum(int num) @@ -315,15 +189,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 +209,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%p\n"), value); #else (void)value; kputchar('\n'); @@ -378,10 +254,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 @@ -395,7 +271,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)