aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--kernel/cpu/irq.c1
-rw-r--r--kernel/drivers/uart.c4
-rw-r--r--usr/main.c1
3 files changed, 3 insertions, 3 deletions
diff --git a/kernel/cpu/irq.c b/kernel/cpu/irq.c
index 09b3346..f718b7e 100644
--- a/kernel/cpu/irq.c
+++ b/kernel/cpu/irq.c
@@ -114,6 +114,7 @@ unsigned long c_fiq_handler(void)
if (source & (1 << 3) && irqs[LOCAL_TIMER_IRQ].handler != 0) {
add_thread(irqs[LOCAL_TIMER_IRQ].handler, 0, 1);
write_cntv_tval(cntfrq);
+ return 1;
}
return 0;
}
diff --git a/kernel/drivers/uart.c b/kernel/drivers/uart.c
index 2107a6f..33f9e82 100644
--- a/kernel/drivers/uart.c
+++ b/kernel/drivers/uart.c
@@ -31,8 +31,8 @@ void uart_init(void)
// Clear pending interrupts
store32(0x7FF, UART0_ICR);
// Set to 3Mhz
- store32(10, UART0_IBRD);
- store32(20, UART0_FBRD);
+ store32(9, UART0_IBRD);
+ store32(49, UART0_FBRD);
// Enable FIFO and 8 bit transmission
store32((1<<4)|(1<<5)|(1<<6), UART0_LCRH);
// Mask all interrupts
diff --git a/usr/main.c b/usr/main.c
index 85491e1..415d6c9 100644
--- a/usr/main.c
+++ b/usr/main.c
@@ -59,5 +59,4 @@ void main(void)
subscribe_irq(GPIO_BANK_1_IRQ, gptest, &gpinfo);
add_thread(loop, 0, 8);
add_thread(consumer, 0, 3);
- uart_string("00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000");
}