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

Made SLIP code coexist with ordinary serial code. If WITH_UIP=1, the SLIP code is used instead.

Browse source
This commit is contained in:
adamdunkels 2008-02-03 20:59:35 +00:00
parent e68d669265
commit cf5ff2bbb2
3 changed files with 18 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

7
cpu/msp430/dev/uart1.c
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* @(#)$Id: uart1.c,v 1.4 2008/01/08 08:04:09 adamdunkels Exp $
* @(#)$Id: uart1.c,v 1.5 2008/02/03 20:59:35 adamdunkels Exp $
*/
/*
@ -39,8 +39,8 @@
#include "lib/energest.h"
#include "dev/uart1.h"
#include "dev/leds.h"
#include "dev/watchdog.h"
static int (*uart1_input_handler)(unsigned char c);
@ -54,6 +54,7 @@ uart1_set_input(int (*input)(unsigned char c))
void
uart1_writeb(unsigned char c)
{
watchdog_periodic();
/* Loop until the transmission buffer is available. */
while((IFG2 & UTXIFG1) == 0);
@ -61,12 +62,14 @@ uart1_writeb(unsigned char c)
TXBUF1 = c;
}
/*---------------------------------------------------------------------------*/
#if ! WITH_UIP /* If WITH_UIP is defined, putchar() is defined by the SLIP driver */
int
putchar(int c)
{
uart1_writeb((char)c);
return c;
}
#endif /* ! WITH_UIP */
/*---------------------------------------------------------------------------*/
/**
* Initalize the RS232 port.