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

lock UART for RS232 in putchar

Browse source
This commit is contained in:
nvt-se 2008-05-27 13:03:19 +00:00
parent bff587e32c
commit 9c9c2573c3
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
platform/msb430/dev/rs232.c
View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* @(#)$Id: rs232.c,v 1.4 2008/03/28 15:59:58 nvt-se Exp $ * @(#)$Id: rs232.c,v 1.5 2008/05/27 13:03:19 nvt-se Exp $
*/ */
/** \addtogroup esbrs232 /** \addtogroup esbrs232
@ -79,11 +79,12 @@ rs232_send(char c)
int int
putchar(int c) putchar(int c)
{ {
if (uart_get_mode() == UART_MODE_RS232) { if (uart_lock(UART_MODE_RS232)) {
/* Loop until the transmission buffer is available. */ /* Loop until the transmission buffer is available. */
UART_WAIT_TX(); UART_WAIT_TX();
/* Transmit the data. */ /* Transmit the data. */
UART_TX = c; UART_TX = c;
uart_unlock(UART_MODE_RS232);
return c; return c;
} else { } else {
return -1; return -1;
@ -108,14 +109,10 @@ rs232_set_speed(enum rs232_speed speed)
void void
rs232_print(char *cptr) rs232_print(char *cptr)
{ {
// lock UART for print operation
if (uart_lock(UART_MODE_RS232)) {
while(*cptr != 0) { while(*cptr != 0) {
rs232_send(*cptr); rs232_send(*cptr);
++cptr; ++cptr;
} }
uart_unlock(UART_MODE_RS232);
}
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void void