Commit 84461507 authored by Léo Grange's avatar Léo Grange
Browse files

add command line argument 'loglevel'

parent dba1918e

bootloader/bootldr.cfg

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ default=1 
label="Default FiXos ELF kernel"



# command line arguments to kernel (if supported)

args="console=tty1"

args="console=tty1 loglevel=1"



# entry type

type="elf-kernel"
@@ -37,4 +37,4 @@ kernel="/fixos" 
label="FiXos with USB console"

type="elf-kernel"

kernel="/fixos"

args="console=ttyUSB0"
 
args="console=ttyUSB0 loglevel=0"

utils/log.c

+17 −2
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#include "types.h"

#include "strconv.h"

#include <fs/vfs_file.h>

#include <sys/cmdline.h>



// normally provide by GCC, with only builtins calls...

// FIXME replace by in-kernel definition with __builtin_va_*
@@ -14,8 +15,8 @@ static print_callback_t current_kernel_print = NULL; 
// used by print_to_file()

static struct file *current_log_file = NULL;



// dynamic level, default is to display everything

static int printk_dynamic_level = 0;

// dynamic level, default is to display every non debug message

static int printk_dynamic_level = LOG_INFO;



static void print_to_file(const char *str);
@@ -125,3 +126,17 @@ void print_to_file(const char *str) { 


	vfs_write(current_log_file, str, len);

}





// for parsing command-line parameter "loglevel="

static int parse_loglevel(const char *val) {

	if((*val >= '0' && *val <= '7') && val[1] == '\0') {

		printk_dynamic_level = *val - '0';

		return 0;

	}



	printk(LOG_WARNING, "malformed 'loglevel' parameter\n");

	return -1;

}



KERNEL_BOOT_ARG(loglevel, parse_loglevel);