Merge fat16_inode_t and fat16_node_t, make fs_node_t shared
This commit is contained in:
+2
-3
@@ -58,7 +58,6 @@ void kernel_main() {
|
||||
kernel->kernel_stack = kernel->kernel_rsp = (uint8_t *)memory_allocate(PAGE_SIZE) + PAGE_SIZE;
|
||||
kernel->user_stack = kernel->user_rsp = (uint8_t *)memory_allocate(PAGE_SIZE) + PAGE_SIZE;
|
||||
kernel->cwd = memory_allocate(sizeof(path_t));
|
||||
kernel->root = fs_mount();
|
||||
kernel->fds[kernel->free_fd++] = keyboard_init();
|
||||
kernel->fds[kernel->free_fd++] = vga_init();
|
||||
kernel->code = EXIT_CODE_OK;
|
||||
@@ -66,8 +65,8 @@ void kernel_main() {
|
||||
current_process = kernel;
|
||||
tss.rsp0 = (uint64_t)kernel->kernel_stack;
|
||||
|
||||
fs_node_t *terminal_node = path_open_node(kernel->root, kernel->cwd, "bin/terminal", OPEN_FILE);
|
||||
fs_node_t *shell_node = path_open_node(kernel->root, kernel->cwd, "bin/shell", OPEN_FILE);
|
||||
fs_node_t *terminal_node = path_open_node(kernel->cwd, "bin/terminal", OPEN_FILE);
|
||||
fs_node_t *shell_node = path_open_node(kernel->cwd, "bin/shell", OPEN_FILE);
|
||||
|
||||
ASSERT(terminal_node, "kernel: terminal not found");
|
||||
ASSERT(shell_node, "kernel: shell not found");
|
||||
|
||||
Reference in New Issue
Block a user