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

Merge branch 'master' of git://git.devl.org/git/malvira/libmc1322x into bump-libmc1322x

Browse source 
bump libmc1322x to 7bee48243c

Conflicts:
	cpu/mc1322x/board/Makefile.board
	cpu/mc1322x/lib/include/uart.h
	cpu/mc1322x/lib/uart1.c
	cpu/mc1322x/lib/uart2.c
	cpu/mc1322x/src/default_lowlevel.c
This commit is contained in:
Mariano Alvira 2012-11-18 18:27:39 -05:00
commit 2c9a538582
47 changed files with 1008 additions and 235 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -28,7 +28,7 @@
* SUCH DAMAGE.
*
* This file is part of libmc1322x: see http://mc1322x.devl.org
* for details.
* for details.
*
*
*/
@ -57,7 +57,7 @@ void uart2_isr(void) {
u2_rx_buf[u2_rx_tail]= *UART2_UDATA;
u2_rx_tail = u2_rx_tail_next;
} else { //buffer is full, flush the fifo
while (*UART2_URXCON !=0) if (*UART2_UDATA);
while (*UART2_URXCON !=0) { if (*UART2_UDATA) { } }
}
}
return;
@ -73,12 +73,12 @@ void uart2_isr(void) {
#endif
return;
}
*UART2_UDATA = u2_tx_buf[u2_tx_tail];
u2_tx_tail++;
if (u2_tx_tail >= sizeof(u2_tx_buf))
u2_tx_tail = 0;
}
}
void uart2_putc(char c) {