diff options
| author | Christian Cunningham <cc@localhost> | 2021-12-08 17:28:15 -0700 |
|---|---|---|
| committer | Christian Cunningham <cc@localhost> | 2021-12-08 17:28:15 -0700 |
| commit | 15b93ed9c47691ae0b7241100509159a38c36049 (patch) | |
| tree | 475f29aea3abdadfc7338178283f152d08949c23 | |
| parent | 70875c2c095576489cb88836a7e176c83c298f03 (diff) | |
Standardized Format
| -rw-r--r-- | src/boot.S | 1 | ||||
| -rw-r--r-- | src/cpu/irq.c | 2 | ||||
| -rw-r--r-- | src/sys/core.c | 8 |
3 files changed, 9 insertions, 2 deletions
@@ -55,7 +55,6 @@ reset: irq: push {r0,r1,r2,r3,r4,r5,r6,r7,r8,r9,r10,r11,r12,lr} - //bl a_irq_handler bl c_irq_handler pop {r0,r1,r2,r3,r4,r5,r6,r7,r8,r9,r10,r11,r12,lr} subs pc, lr, #4 diff --git a/src/cpu/irq.c b/src/cpu/irq.c index 2673cc8..c00ce8c 100644 --- a/src/cpu/irq.c +++ b/src/cpu/irq.c @@ -15,7 +15,7 @@ void c_irq_handler(void) { if(load32(IRQ_PENDING2) & (1 << 25)) { if(load32(UART0_MIS) & (1<<4)) { unsigned long data = load32(UART0_DR); - // Tab to toggle timer + // Ctrl+Tab to toggle timer if(data == 0x14) { unsigned long timer_status; asm volatile("mrc p15, 0, %0, c14, c3, 1" : "=r"(timer_status)); diff --git a/src/sys/core.c b/src/sys/core.c index 1a6332f..3bb9651 100644 --- a/src/sys/core.c +++ b/src/sys/core.c @@ -1,5 +1,6 @@ #include "../drivers/uart.a.h" #include "../drivers/uart.h" +#include "../graphics/draw.h" #include "../util/time.h" #include "../util/mutex.h" #include "../sys/core.h" @@ -12,6 +13,8 @@ char* os_info_v = "?"; char* os_info_v = VERSION; #endif +extern void init_graphics(void); + static char* irq_on = " \033[92mEnabled\033[0m"; static char* irq_off = " \033[91mDisabled\033[0m"; @@ -40,6 +43,11 @@ void sysinit() { routing_core0cntv_to_core0irq(); // Enable timer enable_cntv(); + + // Graphics Initialize + //init_graphics(); + //draw_box(0x01FE, 0, 0, 640, 480); + //draw_box(0xFFFF, 2, 2, 10, 10); } // Checks IRQ status |