From 2088e98a9def43b169038d51aa4f808e8dbe5365 Mon Sep 17 00:00:00 2001 From: Christian Cunningham Date: Mon, 28 Feb 2022 23:05:31 -0700 Subject: Remove old drawer routines --- src/util/status.c | 143 +++++++++++++++++++++++++++--------------------------- 1 file changed, 71 insertions(+), 72 deletions(-) (limited to 'src/util/status.c') diff --git a/src/util/status.c b/src/util/status.c index a54e7c0..7e173b8 100644 --- a/src/util/status.c +++ b/src/util/status.c @@ -1,8 +1,9 @@ #include #include -#include #include #include +#include +#include #include #include #include @@ -22,125 +23,123 @@ void output_irq_status(void) // Check GPU Interrupt Routing unsigned long g_val = load32(GPU_INTERRUPTS_ROUTING); - write_c10(&g_Drawer, g_val & 0b11, 0x1EA1A1); - write_c10(&g_Drawer, (g_val >> 2) & 0b11, 0x1EA1A1); + draw_cletter(0, 1, (g_val & 0b11) + 0x30, 0x1EA1A1); + draw_cletter(1, 1, ((g_val >> 2) & 0b11) + 0x30, 0x1EA1A1); - write_string(&g_Drawer, " "); - write_chex32(&g_Drawer, ib_val, 0x1EA1A1); - write_chex32(&g_Drawer, i1_val, 0x1EA1A1); - write_chex32(&g_Drawer, i2_val, 0x1EA1A1); - write_chex32(&g_Drawer, f_val, 0x1EA1A1); - write_char(&g_Drawer, '\n'); + draw_chex32(4, 1, ib_val, 0x1EA1A1); + draw_chex32(4+9, 1, i1_val, 0x1EA1A1); + draw_chex32(4+9*2, 1, i2_val, 0x1EA1A1); + draw_chex32(4+9*3, 1, f_val, 0x1EA1A1); // Check UART IRQ if (i2_val & (1<<25)) { - write_cstring(&g_Drawer, "UART ", 0x00FF00); + draw_cstring(0, 2, "UART", 0x00FF00); } else if (f_val == 57) { - write_cstring(&g_Drawer, "UART ", 0xFFA500); + draw_cstring(0, 2, "UART", 0xFFA500); } else { - write_cstring(&g_Drawer, "UART ", 0xFF0000); + draw_cstring(0, 2, "UART", 0xFF0000); } // Check UART IRQ if (i1_val & (1<<0)) { - write_cstring(&g_Drawer, "STIMERCMP ", 0x00FF00); + draw_cstring(5, 2, "STIMERCMP", 0x00FF00); } else { - write_cstring(&g_Drawer, "STIMERCMP ", 0xFF0000); + draw_cstring(5, 2, "STIMERCMP", 0xFF0000); } if (load32(CORE0_TIMER_IRQCNTL) & 0xF) { - write_cstring(&g_Drawer, "LTIMER ", 0x00FF00); + draw_cstring(4+9+2, 2, "LTIMER", 0x00FF00); } else if (load32(CORE0_TIMER_IRQCNTL) & 0xF0) { - write_cstring(&g_Drawer, "LTIMER ", 0xFFA500); + draw_cstring(4+9+2, 2, "LTIMER", 0xFFA500); } else { - write_cstring(&g_Drawer, "LTIMER ", 0xFF0000); + draw_cstring(4+9+2, 2, "LTIMER", 0xFF0000); } } void status(void) { - unsigned int x = g_Drawer.x; - unsigned int y = g_Drawer.y; - g_Drawer.x = 0; - g_Drawer.y = 0; // OS Info - write_cstring(&g_Drawer, os_name, 0xFF0000); - write_cstring(&g_Drawer, " v", 0x00FFFF); - write_cstring(&g_Drawer, os_info_v, 0x00FFFF); - write_cstring(&g_Drawer, " # TStacks: ", 0xFFDF00); - draw_string(g_Drawer.x, g_Drawer.y, " "); - write_c10(&g_Drawer, sched_stack_count, 0xFFDF00); + draw_cstring(0, 0, " v ", 0x00FFFF); + draw_cstring(0, 0, os_name, 0xFF0000); + draw_cstring(10, 0, os_info_v, 0x00FFFF); + draw_cstring(16, 0, "# TStacks:", 0xFFDF00); + draw_string(27, 0, " "); + char* st_str = u32_to_str(sched_stack_count); + draw_cstring(27, 0, st_str, 0xFFDF00); + kfree(st_str); // GPU IRQ Statuses - write_string(&g_Drawer, "\n"); output_irq_status(); // Timer Status - write_cstring(&g_Drawer, "\nTIMER", 0x00FF00); + draw_cstring(0, 3, "TIMER", 0x00FF00); // Output the frequency - write_string(&g_Drawer, " @ "); + draw_string(6, 3, "@"); unsigned long frq = read_cntfrq()/1000; - write_10(&g_Drawer, frq); - write_string(&g_Drawer, " kHz "); + char* frq_str = u32_to_str(frq); + unsigned long fs_len = strlen(frq_str)+1; + draw_string(8, 3, frq_str); + kfree(frq_str); + draw_string(8+fs_len, 3, "kHz"); // Output the value unsigned long v = read_cntv_tval(); - write_10(&g_Drawer, v); - write_string(&g_Drawer, " | "); - write_hex32(&g_Drawer, v); + char* v_str = u32_to_str(v); + unsigned long vs_len = strlen(v_str) + 1; + draw_string(8+fs_len+4, 3, v_str); + draw_string(8+fs_len+4 +vs_len, 3, " "); + kfree(v_str); + draw_letter(8+fs_len+4 +vs_len+1, 3, '|'); + draw_hex32(8+fs_len+7+vs_len, 3, v); // Video Status - write_cstring(&g_Drawer, "\nVIDEO ", 0x00FF00); - write_10(&g_Drawer, gwidth); - write_string(&g_Drawer, "x"); - write_10(&g_Drawer, gheight); - if(gisrgb) { - write_string(&g_Drawer, " RGB"); - } else { - write_string(&g_Drawer, " BGR"); - } + draw_cstring(0, 4, "VIDEO", 0x00FF00); + char* gwidth_str; + gwidth_str = u32_to_str(gwidth); + unsigned long gs_len = strlen(gwidth_str) + 1; + draw_string(6, 4, gwidth_str); + kfree(gwidth_str); + draw_letter(6+gs_len-1, 4, 'x'); + gwidth_str = u32_to_str(gheight); + unsigned long gs_len1 = strlen(gwidth_str) + 1; + draw_string(6+gs_len, 4, gwidth_str); + kfree(gwidth_str); + if(gisrgb) + draw_string(6+gs_len+gs_len1, 4, "RGB"); + else + draw_string(6+gs_len+gs_len1, 4, "BGR"); // Core Stacks - g_Drawer.x = 0; - g_Drawer.y = 5; - write_string(&g_Drawer, "SVC IRQ FIQ User/SYS\n"); - g_Drawer.x = 0; - g_Drawer.y = 6; + draw_string(0, 5, "SVC IRQ FIQ User/SYS\n"); unsigned long sp = (unsigned long)getsvcstack(); - write_hex32(&g_Drawer, sp); - write_char(&g_Drawer, ' '); + draw_hex32(0, 6, sp); sp = (unsigned long)getirqstack(); - write_hex32(&g_Drawer, sp); - write_char(&g_Drawer, ' '); + draw_hex32(9, 6, sp); sp = (unsigned long)getfiqstack(); - write_hex32(&g_Drawer, sp); - write_char(&g_Drawer, ' '); + draw_hex32(9*2, 6, sp); sp = (unsigned long)getsysstack(); - write_hex32(&g_Drawer, sp); - write_char(&g_Drawer, '\n'); + draw_hex32(9*3, 6, sp); // Report Core that updated status unsigned long coren; asm volatile ( "mrc p15, #0, %0, c0, c0, #5\n" "and %0, %0, #3" : "=r"(coren) :: "cc"); - write_string(&g_Drawer, "Status Updated by Core #"); - write_10(&g_Drawer, coren); + draw_string(0, 7, "Status Updated by Core #"); + draw_hex32(24, 7, coren); // Report Sys Timer Stataus - write_string(&g_Drawer, "\nSys Timer Status "); + draw_string(0, 8, "Sys Timer Status"); coren = *(volatile unsigned long*)SYS_TIMER_CS; - write_10(&g_Drawer, coren); - write_string(&g_Drawer, ":"); + draw_hex32(17, 8, coren); + draw_string(17+8, 8, ":"); unsigned long long tval = get_time(); - write_hex32(&g_Drawer, (tval >> 32)); - write_hex32(&g_Drawer, tval); - write_string(&g_Drawer, ":"); + draw_hex32(17+8, 8, (tval >> 32)); + draw_hex32(17+8+8, 8, tval); coren = *(volatile unsigned long*)SYS_TIMER_C0; - write_10(&g_Drawer, coren); - write_string(&g_Drawer, " | "); - draw_string(g_Drawer.x, g_Drawer.y, " "); - write_10(&g_Drawer, ((unsigned long)tval)/1000000); - - g_Drawer.x = x; - g_Drawer.y = y; + draw_hex32(19+14+8+1, 8, coren); + draw_string(19+14+9+8, 8, "|"); + draw_string(19+14+18, 8, " "); + char* t_str = u32_to_str(((unsigned long)tval)/1000000); + draw_string(19+14+18, 8, t_str); + kfree(t_str); } -- cgit v1.2.1