The unified diff between revisions [1dfe3b7e..] and [68c54ace..] is displayed below. It can also be downloaded as a raw diff.
# # old_revision [1dfe3b7eee76f3c8aea3b33932857682ee17701c] # new_revision [68c54ace6787b0823a233e780455f7371665a228] # # patch "main.c" # from [cc6bdc935c17a517544beb8e177fc1093fff5249] # to [d5ad069a51eff072171a593f4f480b1e8aab11bb] # # patch "uart.c" # from [07a014210246046a28c0b690de8dd6dd8af95e2d] # to [601012b857324c934c9bc318a55df1029187a16b] # # patch "uart.h" # from [2d08795e26e7e976bded494c773936c5f91d1b69] # to [0b8aacd8b3674937065175bb8fd6ce1feafd477e] # ============================================================ --- main.c cc6bdc935c17a517544beb8e177fc1093fff5249 +++ main.c d5ad069a51eff072171a593f4f480b1e8aab11bb @@ -172,7 +172,8 @@ int main(void) { while (1) { char c; putstr("prompt> "); - c = getch(); + while (!getch(&c)) + FP0XVAL ^= 0x04000000; if (c == 0x0a) continue; putch(c); ============================================================ --- uart.c 07a014210246046a28c0b690de8dd6dd8af95e2d +++ uart.c 601012b857324c934c9bc318a55df1029187a16b @@ -4,8 +4,6 @@ #define UARTBASE 0xE000C000 -#define FP0XVAL (*((volatile unsigned int *) 0x3FFFC014)) - #define RBR 0x00 #define THR 0x00 #define DLL 0x00 @@ -172,14 +170,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; } ============================================================ --- uart.h 2d08795e26e7e976bded494c773936c5f91d1b69 +++ uart.h 0b8aacd8b3674937065175bb8fd6ce1feafd477e @@ -1,11 +1,13 @@ #ifndef __UART_H #define __UART_H +#include "types.h" + void init_uart(void); void putch(char c); void putstr(char *s); void putint(unsigned int n); void puthex(unsigned int n); -char getch(void); +bool getch(char *c); #endif /* __UART_H */