Aren/toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some module loading silliness

Browse Source
This commit is contained in:
Kevin Lange 2014-04-10 23:08:07 -07:00
parent cf2bad7886
commit 75a7d5e7f2
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kernel/main.c
View File

@ -142,10 +142,13 @@ int kmain(struct multiboot *mboot, uint32_t mboot_mag, uintptr_t esp) {
debug_print(NOTICE, "Loading a module: 0x%x:0x%x", module_start, module_end);
module_data_t * mod_info = (module_data_t *)module_load_direct((void *)(module_start), module_size);
debug_print(NOTICE, "Loaded: %s", mod_info->mod_info->name);
if (mod_info) {
debug_print(NOTICE, "Loaded: %s", mod_info->mod_info->name);
}
}
}
/* Map /dev to a device mapper */
map_vfs_directory("/dev");

17
modules/debug_shell.c
View File

@ -772,15 +772,6 @@ static void debug_shell_run(void * data, char * name) {
current_process->fds->entries[2] = tty;
/* Initialize the shell commands map */
if (!shell_commands_map) {
shell_commands_map = hashmap_create(10);
struct shell_command * sh = &shell_commands[0];
while (sh->name) {
hashmap_set(shell_commands_map, sh->name, sh);
sh++;
}
}
int retval = 0;
while (1) {
@ -815,6 +806,14 @@ static void debug_shell_run(void * data, char * name) {
}
int debug_shell_start(void) {
/* Setup shell commands */
shell_commands_map = hashmap_create(10);
struct shell_command * sh = &shell_commands[0];
while (sh->name) {
hashmap_set(shell_commands_map, sh->name, sh);
sh++;
}
int i = create_kernel_tasklet(debug_shell_run, "[kttydebug]", NULL);
debug_print(NOTICE, "Started tasklet with pid=%d", i);