diff options
| -rw-r--r-- | kernel/cpu/irq.c | 30 | ||||
| -rw-r--r-- | usr/main.c | 8 |
2 files changed, 35 insertions, 3 deletions
diff --git a/kernel/cpu/irq.c b/kernel/cpu/irq.c index 9490489..6e48ab1 100644 --- a/kernel/cpu/irq.c +++ b/kernel/cpu/irq.c @@ -51,6 +51,36 @@ unsigned long c_irq_handler(void) *timer_cs = SYS_TIMER_SC_M0; return 1; } + // Check if System Time Compare 1 Triggered the Interrupt + if (*(volatile unsigned long*)SYS_TIMER_CS & SYS_TIMER_SC_M1 && irqs[SYS_TIMER_1_IRQ].handler != 0) { + volatile unsigned long* timer_cs = (volatile unsigned long*)SYS_TIMER_CS; + volatile unsigned long* timer_chi = (volatile unsigned long*)SYS_TIMER_CHI; + volatile unsigned long* nexttime = (volatile unsigned long*)SYS_TIMER_C1; + add_thread(irqs[SYS_TIMER_1_IRQ].handler, 0, 1); + *nexttime = *timer_chi + *(unsigned long*)irqs[SYS_TIMER_1_IRQ].handler_info; + *timer_cs = SYS_TIMER_SC_M1; + return 1; + } + // Check if System Time Compare 2 Triggered the Interrupt + if (*(volatile unsigned long*)SYS_TIMER_CS & SYS_TIMER_SC_M2 && irqs[SYS_TIMER_2_IRQ].handler != 0) { + volatile unsigned long* timer_cs = (volatile unsigned long*)SYS_TIMER_CS; + volatile unsigned long* timer_chi = (volatile unsigned long*)SYS_TIMER_CHI; + volatile unsigned long* nexttime = (volatile unsigned long*)SYS_TIMER_C2; + add_thread(irqs[SYS_TIMER_2_IRQ].handler, 0, 1); + *nexttime = *timer_chi + *(unsigned long*)irqs[SYS_TIMER_2_IRQ].handler_info; + *timer_cs = SYS_TIMER_SC_M2; + return 1; + } + // Check if System Time Compare 3 Triggered the Interrupt + if (*(volatile unsigned long*)SYS_TIMER_CS & SYS_TIMER_SC_M3 && irqs[SYS_TIMER_3_IRQ].handler != 0) { + volatile unsigned long* timer_cs = (volatile unsigned long*)SYS_TIMER_CS; + volatile unsigned long* timer_chi = (volatile unsigned long*)SYS_TIMER_CHI; + volatile unsigned long* nexttime = (volatile unsigned long*)SYS_TIMER_C3; + add_thread(irqs[SYS_TIMER_3_IRQ].handler, 0, 1); + *nexttime = *timer_chi + *(unsigned long*)irqs[SYS_TIMER_3_IRQ].handler_info; + *timer_cs = SYS_TIMER_SC_M3; + return 1; + } } // Check if CNTV triggered the interrupt else if (source & (1 << 3)) { @@ -66,14 +66,16 @@ void loop(void) void loopt(void) { static char str[13]; - draw_string(0, 9, ulong_to_string(*(volatile unsigned long*)SYS_TIMER_CHI, str)); + draw_string(0, 14, ulong_to_string(*(volatile unsigned long*)SYS_TIMER_CHI, str)); } -static unsigned long TICK_RATE = 5000000; +static unsigned long TICK_RATE_0 = 5000000; +static unsigned long TICK_RATE_1 = 300000; static unsigned long UART_PRIORITY = 2; void main(void) { subscribe_irq(UART_IRQ, handle_data, &UART_PRIORITY); - subscribe_irq(SYS_TIMER_0_IRQ, loopt, &TICK_RATE); + subscribe_irq(SYS_TIMER_0_IRQ, loopt, &TICK_RATE_0); + subscribe_irq(SYS_TIMER_1_IRQ, loopt, &TICK_RATE_1); add_thread(loop, 0, 0); } |