X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=rpikern;a=blobdiff_plain;f=src%2Fserial.c;h=ba5faca3e36f0ac10ce126f294c682ad47e90eb5;hp=9d1b2bec3925403db8b27157d3695f194fa7b629;hb=99bdc8838f189f79ba77bfbbf41d7f1b4839ce0f;hpb=36f1048dfeec94c6f305b76082fecec93347b2ec

diff --git a/src/serial.c b/src/serial.c
index 9d1b2be..ba5faca 100644
--- a/src/serial.c
+++ b/src/serial.c
@@ -10,6 +10,7 @@ void init_serial(int baud)
 {
 	uint32_t bdiv_fp6;
 
+	mem_barrier();
 	REG_CR = 0;		/* disable UART */
 
 	/* disable pullups for GPIO 14 & 15 */
@@ -32,26 +33,35 @@ void init_serial(int baud)
 
 	/* enable UART RX&TX */
 	REG_CR = CR_UARTEN | CR_TXEN | CR_RXEN;
+	mem_barrier();
 }
 
 void ser_putchar(int c)
 {
+	if(c == '\n') ser_putchar('\r');
+
+	mem_barrier();
 	while(REG_FR & FR_TXFF);
 	REG_DR = c & 0xff;
+	mem_barrier();
 }
 
 int ser_getchar(void)
 {
+	mem_barrier();
 	while(REG_FR & FR_RXFE);
 	return REG_DR & 0xff;
 }
 
+int ser_pending(void)
+{
+	mem_barrier();
+	return (REG_FR & FR_RXFE) == 0;
+}
+
 void ser_printstr(const char *s)
 {
 	while(*s) {
-		if(*s == '\n') {
-			ser_putchar('\r');
-		}
 		ser_putchar(*s++);
 	}
 }