The unified diff between revisions [253c6510..] and [24d5b9f4..] 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 [253c65100e2208e0b8c93178896f5aab89e4ec0b]
# new_revision [24d5b9f4dff9135787b198fe1127d9c1e3326b9c]
#
# patch "uart.c"
#  from [601012b857324c934c9bc318a55df1029187a16b]
#    to [7a38c486dc1280695e1e62c6d3a76d6c9f849f67]
#
============================================================
--- uart.c	601012b857324c934c9bc318a55df1029187a16b
+++ uart.c	7a38c486dc1280695e1e62c6d3a76d6c9f849f67
@@ -1,6 +1,7 @@
 #include "uart.h"
 #include "types.h"
 #include "interrupt.h"
+#include "event.h"
 
 #define UARTBASE 0xE000C000
 
@@ -37,6 +38,8 @@ void __attribute__((interrupt("IRQ"))) u
 
 void __attribute__((interrupt("IRQ"))) uart_interrupt_handler(void);
 
+#ifdef USE_UART
+
 void init_uart(void)
 {
 	UREG(FDR) = 0x10; /* DivAddVal = 0, MulVal = 1 */
@@ -112,6 +115,7 @@ void __attribute__((interrupt("IRQ"))) u
 			}
 		}
 		uart_rxwrite = local_rxwrite;
+		event_set(EVENT_UART_INPUT);
 		break;
 
 	case 0x2: /* THRE interrupt */
@@ -153,6 +157,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;
@@ -178,3 +207,4 @@ bool getch(char *c) {
 	uart_rxread = (uart_rxread + 1) % UART_RXBUFSIZE;
 	return TRUE;
 }
+#endif