diff options
author | Jon Santmyer <jon@jonsantmyer.com> | 2024-05-22 13:00:41 -0400 |
---|---|---|
committer | Jon Santmyer <jon@jonsantmyer.com> | 2024-05-22 13:00:41 -0400 |
commit | ace65b453151845bc361f21f3e5b651c35f9f126 (patch) | |
tree | 262ebd29b0ca1d8584f0b6f1efa7a00d9f4f3e43 /boot/cmdline.c | |
parent | f004c1ade8d617a82cea2fe249434cccb47a2358 (diff) | |
download | jove-kernel-ace65b453151845bc361f21f3e5b651c35f9f126.tar.gz jove-kernel-ace65b453151845bc361f21f3e5b651c35f9f126.tar.bz2 jove-kernel-ace65b453151845bc361f21f3e5b651c35f9f126.zip |
Diffstat (limited to 'boot/cmdline.c')
-rw-r--r-- | boot/cmdline.c | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/boot/cmdline.c b/boot/cmdline.c index aa6aa05..5a68466 100644 --- a/boot/cmdline.c +++ b/boot/cmdline.c @@ -1,15 +1,18 @@ -#include "cmdline.h" +#include "commandline.h" +#include "klib/hash.h" +#include "klib/rbtree.h" +#include "string.h" #include "boot.h" -#include "mem/memory.h" -#include "lib/string.h" -#include "io/log.h" +#include "memory.h" +#include "print.h" -static struct HashTable s_cmdline_kernel; +static rbtree_t s_cmdline_kernel; const char* cmdline_get(const char *key) { - const char** value = hashtable_get(&s_cmdline_kernel, key, const char*); + intmax_t hash = string_hash(key); + char** value = rbtree_find(&s_cmdline_kernel, hash); if(value == NULL) return NULL; return *value; } @@ -17,7 +20,7 @@ cmdline_get(const char *key) void cmdline_kernel_setup(void) { - hashtable_news(&s_cmdline_kernel, const char*); + rbtree_new(&s_cmdline_kernel, char*); size_t cmdi = 0; const char *cmdline = boot_kernel_cmdline; @@ -28,23 +31,23 @@ cmdline_kernel_setup(void) size_t keyi = cmdi; while(cmdline[keyi] != '=' && cmdline[keyi] != 0) keyi++; if(cmdline[keyi] == 0 || keyi == 0) { - klogf("kernel cmdline is empty or malformed; skipping.\n"); + kwarnf("kernel cmdline is empty or malformed; skipping.\n"); break; } size_t keylen = keyi - cmdi; - char *key = mem_alloc(keylen); + char *key = kmalloc(keylen); memcpy(key, &cmdline[cmdi], keylen); size_t valuei = keyi + 1; while(cmdline[valuei] != ' ' && cmdline[valuei] != 0) valuei++; size_t valuelen = (valuei - keyi) - 1; - char *value = mem_alloc(valuelen); + char *value = kmalloc(valuelen); if(valuelen != 0) memcpy(value, &cmdline[keyi + 1], valuelen); - klogf("%s = %s\n", key, value); - hashtable_insert(&s_cmdline_kernel, key, &value); + kdbgf("%s = %s\n", key, value); + rbtree_insert(&s_cmdline_kernel, string_hash(key), &value); cmdi = valuei + 1; } } |