deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

mc1322x: block in uart putc if the TX buffer is full. Can also be

Browse source 
configured to drop chars instead with UARTx_DROP_CHARS
This commit is contained in:
Mariano Alvira 2011-07-09 12:46:30 -04:00
parent e80f9eb4b5
commit 6d96721ac4
2 changed files with 38 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
cpu/mc1322x/lib/uart1.c
View file

@ -97,11 +97,29 @@ void uart1_putc(char c) {
if (u1_tx_head >= sizeof(u1_tx_buf))
u1_tx_head = 0;
if (u1_tx_head == u1_tx_tail) { /* drop chars when no room */
#if UART1_DROP_CHARS
if (u1_tx_head) { u1_tx_head -=1; } else { u1_tx_head = sizeof(u1_tx_buf); }
#else
{
uint32_t u1_tx_tail_save=u1_tx_tail;
/* Back up head to show buffer not empty, and enable tx interrupt */
u1_tx_head--;
#if UART1_RX_BUFFERSIZE > 32
*UART1_UCON &= ~(1 << 13); /*enable tx interrupt */
#else
enable_irq(UART1);
#endif
/* Tail will change after one character goes out */
while (u1_tx_tail_save == u1_tx_tail) ;
/* Restore head to character we just stuffed */
u1_tx_head++;
return;
}
#endif /* UART1_DROP_CHARS */
}
#if UART1_RX_BUFFERSIZE > 32
*UART1_UCON &= ~(1 << 13); /*enable tx interrupt */
*UART1_UCON &= ~(1 << 13); /*enable tx interrupt */
#else
enable_irq(UART1);
#endif

20
cpu/mc1322x/lib/uart2.c
View file

@ -97,11 +97,29 @@ void uart2_putc(char c) {
if (u2_tx_head >= sizeof(u2_tx_buf))
u2_tx_head = 0;
if (u2_tx_head == u2_tx_tail) { /* drop chars when no room */
#if UART2_DROP_CHARS
if (u2_tx_head) { u2_tx_head -=1; } else { u2_tx_head = sizeof(u2_tx_buf); }
#else
{
uint32_t u2_tx_tail_save=u2_tx_tail;
/* Back up head to show buffer not empty, and enable tx interrupt */
u2_tx_head--;
#if UART2_RX_BUFFERSIZE > 32
*UART2_UCON &= ~(1 << 13); /*enable tx interrupt */
#else
enable_irq(UART2);
#endif
/* Tail will change after one character goes out */
while (u2_tx_tail_save == u2_tx_tail) ;
/* Restore head to character we just stuffed */
u2_tx_head++;
return;
}
#endif /* UART2_DROP_CHARS */
}
#if UART2_RX_BUFFERSIZE > 32
*UART2_UCON &= ~(1 << 13); /*enable tx interrupt */
*UART2_UCON &= ~(1 << 13); /*enable tx interrupt */
#else
enable_irq(UART2);
#endif