From c2ef64149849fcae608b1c6010303eca86229d22 Mon Sep 17 00:00:00 2001 From: Miguel Date: Sun, 9 Sep 2018 13:21:47 +0200 Subject: cleaning logs, docs, interrupts --- kernel/log.c | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) (limited to 'kernel/log.c') diff --git a/kernel/log.c b/kernel/log.c index b0eeab5..952c271 100644 --- a/kernel/log.c +++ b/kernel/log.c @@ -24,7 +24,7 @@ static void log_string(char *str) } } -void log(char *module_name, int prio, char *format_string, ...) +void log(bool color,char *module_name, int prio, char *format_string, ...) { #ifdef FOOLOS_LOG_OFF return; @@ -45,27 +45,10 @@ void log(char *module_name, int prio, char *format_string, ...) tfp_vsprintf(buf_info,format_string,va); va_end(va); - tfp_sprintf(buf_log,"\033[36;40m%s\033[31;40m %s:\033[37;40m %s\n",buf_time,module_name,buf_info); + if(color) tfp_sprintf(buf_log,"\033[36;40m%s\033[31;40m %s:\033[37;40m %s\n",buf_time,module_name,buf_info); + else tfp_sprintf(buf_log,"%s %s: %s\n",buf_time,module_name,buf_info); spinlock_spin(SPINLOCK_LOG); log_string(buf_log); spinlock_release(SPINLOCK_LOG); } - -/* -void panic(char *module_name, char *format_string) -{ - char buf_log[256]; - tfp_sprintf(buf_log,"\033[41;37m\n !! KERNEL PANIC !! %s: %s\n\n\033[37;40m",module_name,message); - - //PANIC DIRECTLY TO STDOUT// - syscall_write(1,buf_log,strlen(buf_log)); - log_string(buf_log); - - while(1) - { - asm volatile("cli"); - asm volatile("hlt"); - } -} -*/ -- cgit v1.2.3