gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix parsing of "osnum=" kargs

Browse Source
This commit is contained in:
NAKAMURA Gou
2014-12-24 11:34:15 +09:00
parent 2baf274dac
commit 037e17c4ed
1 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
kernel/init.c
View File

@ -118,6 +118,27 @@ char *find_command_line(char *name)
return strstr(cmdline, name); return strstr(cmdline, name);
} }
static void parse_kargs(void)
{
kprintf("KCommand Line: %s\n", ihk_mc_get_kernel_args());
if (1) {
char *key = "osnum=";
char *p;
p = find_command_line(key);
if (p != NULL) {
p += strlen(key);
osnum = 0;
while (('0' <= *p) && (*p <= '9')) {
osnum *= 10;
osnum += *p++ - '0';
}
kprintf("osnum: %d\n", osnum);
}
}
}
void pc_init(void) void pc_init(void)
{ {
int i; int i;
@ -134,15 +155,6 @@ void pc_init(void)
APT_TYPE_STALL, APT_TYPE_CYCLE }, // not updated for KNC APT_TYPE_STALL, APT_TYPE_CYCLE }, // not updated for KNC
}; };
p = find_command_line("osnum=");
if (p != NULL) {
while (('0' <= *p) && (*p <= '9')) {
osnum *= 10;
osnum += *p++ - '0';
}
}
dkprintf("osnum: %d\n", osnum);
if (!(p = find_command_line("perfctr"))) { if (!(p = find_command_line("perfctr"))) {
dkprintf("perfctr not initialized.\n"); dkprintf("perfctr not initialized.\n");
@ -189,10 +201,6 @@ static void pc_test(void)
static void rest_init(void) static void rest_init(void)
{ {
char *cmdline;
cmdline = ihk_mc_get_kernel_args();
kprintf("KCommand Line: %s\n", cmdline);
handler_init(); handler_init();
#ifdef USE_DMA #ifdef USE_DMA
@ -245,6 +253,8 @@ int main(void)
kputs("MCK started.\n"); kputs("MCK started.\n");
parse_kargs();
arch_init(); arch_init();
mem_init(); mem_init();