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

resolved conflict with type declaration

Browse source
This commit is contained in:
zhitao 2010-12-01 10:19:58 +00:00
parent 0ba9846abd
commit af7b81efdb
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
platform/msb430/dev/msb430-uart1.c
View file

@ -62,8 +62,8 @@ Berlin, 2007
#define U1ME ME2 #define U1ME ME2
#endif #endif
static volatile unsigned char uart_mode = UART_MODE_RESET; volatile unsigned char uart_mode = UART_MODE_RESET;
static volatile unsigned char uart_lockcnt = 0; volatile unsigned char uart_lockcnt = 0;
volatile uint8_t uart_edge = 0; volatile uint8_t uart_edge = 0;
static unsigned char uart_speed_br0[UART_NUM_MODES]; static unsigned char uart_speed_br0[UART_NUM_MODES];