mirror of
https://github.com/oliverschmidt/contiki.git
synced 2024-08-06 20:28:57 +00:00
resolved conflict with type declaration
This commit is contained in:
parent
0ba9846abd
commit
af7b81efdb
@ -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];
|
||||||
|
Loading…
Reference in New Issue
Block a user