X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Fkdebug.c;h=091f0b7f3fcee7cbd95026e57e711501d709eef6;hb=9250b166f2d62d6e38bca6cea5c6210266a12128;hp=e631eabb4d09683f123e321d79ac84d51719d9a6;hpb=ccb775e4fd44a656db65e0a6e75e815312ff2c61;p=bertos.git diff --git a/drv/kdebug.c b/drv/kdebug.c index e631eabb..091f0b7f 100755 --- a/drv/kdebug.c +++ b/drv/kdebug.c @@ -14,26 +14,45 @@ * \author Stefano Fedrigo */ -/* - * $Log$ - * 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. - * - */ +/*#* + *#* $Log$ + *#* 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 "kdebug.h" #include "hw.h" @@ -45,11 +64,12 @@ #if defined(_EMUL) #include - #define KDBG_WAIT_READY() do {/*nop*/} while(0) + #define KDBG_WAIT_READY() do { /*nop*/ } while(0) #define KDBG_WRITE_CHAR(c) putchar((c)) - #define KDBG_MASK_IRQ(old) do {/*nop*/} while(0) - #define KDBG_RESTORE_IRQ() do {/*nop*/} while(0) -#elif defined(__I196__) + #define KDBG_MASK_IRQ(old) do { (void)(old); } while(0) + #define KDBG_RESTORE_IRQ() do { /*nop*/ } while(0) + typedef kdbg_irqsave_t char; /* 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) @@ -59,9 +79,23 @@ INT_MASK1 &= ~INT1F_TI; \ } while(0) #define KDBG_RESTORE_IRQ(old) do { INT_MASK1 |= (old); } -#elif defined(__AVR__) + typedef kdbg_irqsave_t uint16_t; /* FIXME: unconfirmed */ +#elif CPU_AVR #include #if CONFIG_KDEBUG_PORT == 0 + + /* External 485 transceiver on UART0 (to be overridden in "hw.h"). */ + #if !defined(SER_UART0_485_INIT) + #if defined(SER_UART0_485_RX) || defined(SER_UART0_485_TX) + #error SER_UART0_485_INIT, SER_UART0_485_RX and SER_UART0_485_TX must be defined together + #endif + #define SER_UART0_485_INIT do {} while (0) + #define SER_UART0_485_TX do {} while (0) + #define SER_UART0_485_RX do {} while (0) + #elif !defined(SER_UART0_485_RX) || !defined(SER_UART0_485_TX) + #error SER_UART0_485_INIT, SER_UART0_485_RX and SER_UART0_485_TX must be defined together + #endif + #if defined(__AVR_ATmega64__) #define UCR UCSR0B #define UDR UDR0 @@ -70,26 +104,78 @@ #define UCR UCSRB #define USR UCSRA #endif + #define KDBG_WAIT_READY() do { loop_until_bit_is_set(USR, UDRE); } while(0) - #define KDBG_WRITE_CHAR(c) do { UCR |= BV(TXEN); UDR = (c); } while(0) - #define KDBG_MASK_IRQ(old) do { (old) = UCR & BV(TXCIE); cbi(UCR, TXCIE); } while(0) - #define KDBG_RESTORE_IRQ(old) do { UCR |= (old); } while(0) + #define KDBG_WAIT_TXDONE() do { loop_until_bit_is_set(USR, TXC); } while(0) + /* + * BUG: before sending a new character the TXC flag is cleared to allow + * KDBG_WAIT_TXDONE() to work properly, but, if KDBG_WRITE_CHAR() is called + * after the RXC flag is set by hardware, a new TXC could be generated + * after we clear it and before the new character is put in UDR. In this + * case if a 485 is used the transceiver will be put in RX mode while + * transmitting the last char. + */ + #define KDBG_WRITE_CHAR(c) do { USR |= BV(TXC); UDR = (c); } while(0) + + #define KDBG_MASK_IRQ(old) do { \ + SER_UART0_485_TX; \ + (old) = UCR; \ + UCR |= BV(TXEN); \ + UCR &= ~(BV(TXCIE) | BV(UDRIE)); \ + } while(0) + + #define KDBG_RESTORE_IRQ(old) do { \ + KDBG_WAIT_TXDONE(); \ + SER_UART0_485_RX; \ + UCR = (old); \ + } while(0) + + typedef kdbg_irqsave_t uint8_t; + #elif CONFIG_KDEBUG_PORT == 1 + + /* External 485 transceiver on UART1 (to be overridden in "hw.h"). */ + #ifndef SER_UART1_485_INIT + #if defined(SER_UART1_485_RX) || defined(SER_UART1_485_TX) + #error SER_UART1_485_INIT, SER_UART1_485_RX and SER_UART1_485_TX must be defined together + #endif + #define SER_UART1_485_INIT do {} while (0) + #define SER_UART1_485_TX do {} while (0) + #define SER_UART1_485_RX do {} while (0) + #elif !defined(SER_UART1_485_RX) || !defined(SER_UART1_485_TX) + #error SER_UART1_485_INIT, SER_UART1_485_RX and SER_UART1_485_TX must be defined together + #endif + #define KDBG_WAIT_READY() do { loop_until_bit_is_set(UCSR1A, UDRE); } while(0) - #define KDBG_WRITE_CHAR(c) do { UCSR1B |= BV(TXEN); UDR1 = (c); } while(0) - #define KDBG_MASK_IRQ(old) do { (old) = UCSR1B & BV(TXCIE); cbi(UCSR1B, TXCIE); } while(0) - #define KDBG_RESTORE_IRQ(old) do { UCSR1B |= (old); } 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 { \ + SER_UART1_485_TX; \ + (old) = UCSR1B; \ + UCSR1B |= BV(TXEN); \ + UCSR1B &= ~(BV(TXCIE) | BV(UDRIE)); \ + } while(0) + + #define KDBG_RESTORE_IRQ(old) do { \ + KDBG_WAIT_TXDONE(); \ + SER_UART1_485_RX; \ + UCSR1B = (old); \ + } while(0) + + typedef kdbg_irqsave_t uint8_t; #else #error CONFIG_KDEBUG_PORT should be either 0 or 1 #endif -#elif defined(__MWERKS__) && (defined(__m56800E__) || defined(__m56800__)) +#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() - #define KDBG_WRITE_CHAR(c) do { char ch=c; fwrite(&ch,1,1,stdout); } while (0) - #define KDBG_MASK_IRQ(old) - #define KDBG_RESTORE_IRQ(old) + #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 kdbg_irqsave_t uint8_t; /* unused */ #else #error Unknown architecture #endif @@ -97,7 +183,7 @@ void kdbg_init(void) { -#if defined(__I196__) +#if CPU_I196 /* Set serial port for 19200bps 8N1 */ INT_MASK1 &= ~(INT1F_TI | INT1F_RI); @@ -107,7 +193,7 @@ void kdbg_init(void) BAUD_RATE = 0x33; BAUD_RATE = 0x80; -#elif defined(__AVR__) +#elif CPU_AVR /* Compute the baud rate */ uint16_t period = (((CLOCK_FREQ / 16UL) + (CONFIG_KDEBUG_BAUDRATE / 2)) / CONFIG_KDEBUG_BAUDRATE) - 1; @@ -116,9 +202,11 @@ void kdbg_init(void) #if CONFIG_KDEBUG_PORT == 0 UBRR0H = (uint8_t)(period>>8); UBRR0L = (uint8_t)period; + SER_UART0_485_INIT; #elif CONFIG_KDEBUG_PORT == 1 UBRR1H = (uint8_t)(period>>8); UBRR1L = (uint8_t)period; + SER_UART1_485_INIT; #else #error CONFIG_KDEBUG_PORT must be either 0 or 1 #endif @@ -127,11 +215,12 @@ void kdbg_init(void) UBRRL = (uint8_t)period; #elif defined(__AVR_ATmega103__) UBRR = (uint8_t)period; + SER_UART0_485_INIT; #else #error Unknown arch #endif -#endif /* !__I196__ && !__AVR__ */ +#endif /* !CPU_I196 && !CPU_AVR */ kputs("\n\n*** DBG START ***\n"); } @@ -140,7 +229,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(void *, unused)) { /* Poll while serial buffer is still busy */ KDBG_WAIT_READY(); @@ -156,16 +245,29 @@ static void kputchar(char c, UNUSED(void *, unused)) } +void kputchar(char c) +{ + /* Mask serial TX intr */ + kdbg_irqsave_t irqsave; + KDBG_MASK_IRQ(irqsave); + + __kputchar(c, 0); + + /* Restore serial TX intr */ + KDBG_RESTORE_IRQ(irqsave); +} + + void PGM_FUNC(kprintf)(const char * PGM_ATTR fmt, ...) { va_list ap; /* Mask serial TX intr */ - unsigned char irqsave; + kdbg_irqsave_t irqsave; KDBG_MASK_IRQ(irqsave); va_start(ap, fmt); - PGM_FUNC(_formatted_write)(fmt, kputchar, 0, ap); + PGM_FUNC(_formatted_write)(fmt, __kputchar, 0, ap); va_end(ap); /* Restore serial TX intr */ @@ -178,11 +280,11 @@ void PGM_FUNC(kputs)(const char * PGM_ATTR str) char c; /* Mask serial TX intr */ - unsigned char irqsave; + kdbg_irqsave_t irqsave; KDBG_MASK_IRQ(irqsave); while ((c = PGM_READ_CHAR(str++))) - kputchar(c, 0); + __kputchar(c, 0); KDBG_RESTORE_IRQ(irqsave); } @@ -191,9 +293,9 @@ void PGM_FUNC(kputs)(const char * PGM_ATTR str) int PGM_FUNC(__assert)(const char * PGM_ATTR cond, const char *file, int line) { PGM_FUNC(kputs)(file); - PGM_FUNC(kprintf)(PSTR(":%d: Assertion failed: \""), line); + PGM_FUNC(kprintf)(PSTR(":%d: Assertion failed: "), line); PGM_FUNC(kputs)(cond); - PGM_FUNC(kputs)(PSTR("\"\n")); + PGM_FUNC(kputs)(PSTR("\n")); return 1; }