The unified diff between revisions [1dfe3b7e..] and [23a3e9a5..] is displayed below. It can also be downloaded as a raw diff.

This diff has been restricted to the following files: 'uart.c'

#
# old_revision [1dfe3b7eee76f3c8aea3b33932857682ee17701c]
# new_revision [23a3e9a50b4034343e3bd217d2c225dcaec064dd]
#
# patch "uart.c"
#  from [07a014210246046a28c0b690de8dd6dd8af95e2d]
#    to [37a2e0459886f7f9c4e4a5361e21d50902dbe3f7]
#
============================================================
--- uart.c	07a014210246046a28c0b690de8dd6dd8af95e2d
+++ uart.c	37a2e0459886f7f9c4e4a5361e21d50902dbe3f7
@@ -1,11 +1,10 @@
 #include "uart.h"
 #include "types.h"
 #include "interrupt.h"
+#include "event.h"
 
 #define UARTBASE 0xE000C000
 
-#define FP0XVAL (*((volatile unsigned int *) 0x3FFFC014))
-
 #define RBR 0x00
 #define THR 0x00
 #define DLL 0x00
@@ -114,6 +113,7 @@ void __attribute__((interrupt("IRQ"))) u
 			}
 		}
 		uart_rxwrite = local_rxwrite;
+		event_set(EVENT_UART_INPUT);
 		break;
 
 	case 0x2: /* THRE interrupt */
@@ -155,6 +155,31 @@ void putint(unsigned int n) {
 	putstr(s+i);
 }
 
+void putint_s(int n) {
+	char s[12];
+	int i;
+	int neg;
+
+	/* OK, technically, this might not work properly for the most
+	 * negative possible number. Oh well.
+	 */
+	neg = (n < 0);
+	if (neg)
+		n = -n;
+
+	i = 11;
+	s[i] = '\0';
+
+	do {
+		s[--i] = n % 10 + '0';
+	} while ((n /= 10) > 0);
+
+	if (neg)
+		s[--i] = '-';
+
+	putstr(s+i);
+}
+
 void puthex(unsigned int n) {
 	char s[9];
 	int i;
@@ -172,14 +197,11 @@ void puthex(unsigned int n) {
 	putstr(s+i);
 }
 
-char getch(void) {
-	char c;
+bool getch(char *c) {
+	if (uart_rxread == uart_rxwrite)
+		return FALSE;
 
-	while (uart_rxread == uart_rxwrite) {
-		FP0XVAL ^= 0x04000000;
-	}
-
-	c = uart_rxbuf[uart_rxread];
+	*c = uart_rxbuf[uart_rxread];
 	uart_rxread = (uart_rxread + 1) % UART_RXBUFSIZE;
-	return c;
+	return TRUE;
 }