Merge branch 'bob' of https://repo.or.cz/RPi-MMU-example into alice

# Conflicts:
#	.gitignore
#	PL0_test.ld
#	demo_functionality.c
#	interrupt_vector.S
#	interrupts.c
#	kernel.c
#	memory.h

1 files changed, 2 insertions, 8 deletions

diff --git a/uart.c b/uart.c
index 139cfe0..2030538 100644
--- a/uart.c
+++ b/uart.c
@@ -63,22 +63,16 @@ void uart_init()
   mmio_write(UART0_CR, (1 << 0) | (1 << 8) | (1 << 9));
 }
 
-void uart_putc(unsigned char c)
+void putchar(char c)
 {
   // Wait for UART to become ready to transmit.
   while ( mmio_read(UART0_FR) & (1 << 5) ) { }
   mmio_write(UART0_DR, c);
 }
 
-unsigned char uart_getc()
+char getchar(void)
 {
   // Wait for UART to have received something.
   while ( mmio_read(UART0_FR) & (1 << 4) ) { }
   return mmio_read(UART0_DR);
 }
-
-void uart_puts(const char* str)
-{
-  for (size_t i = 0; str[i] != '\0'; i ++)
-    uart_putc((unsigned char)str[i]);
-}