diff options
author | Marvin Borner | 2021-04-28 23:12:17 +0200 |
---|---|---|
committer | Marvin Borner | 2021-04-28 23:12:17 +0200 |
commit | 04104fc051d44f4f9b3328f29b4be91fa4060f34 (patch) | |
tree | 1677c1739c44bd7c7e8722ea00ca3c6b45158c85 /kernel/features | |
parent | 895a58b1b57a0ae8028576404a90f12e0133cf5f (diff) |
Started conversion to Grub (#17)
Yes, the CI won't like this.
Diffstat (limited to 'kernel/features')
-rw-r--r-- | kernel/features/io.c | 4 | ||||
-rw-r--r-- | kernel/features/mm.c | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/kernel/features/io.c b/kernel/features/io.c index ac599e2..eb4b7a5 100644 --- a/kernel/features/io.c +++ b/kernel/features/io.c @@ -208,7 +208,7 @@ void io_unblock_pid(u32 pid) proc_yield(); } -CLEAR void io_install(struct boot_info *boot) +CLEAR void io_install(void) { for (u32 i = 0; i < IO_MAX; i++) io_listeners[i] = list_new(); @@ -230,6 +230,6 @@ CLEAR void io_install(struct boot_info *boot) timer_install(); logger_install(); - fb_install(boot->vid); + fb_install(); bus_install(); } diff --git a/kernel/features/mm.c b/kernel/features/mm.c index a3812bd..39a6316 100644 --- a/kernel/features/mm.c +++ b/kernel/features/mm.c @@ -719,10 +719,10 @@ void memory_user_hook(void) } } -CLEAR void memory_install(struct boot_info *boot) +CLEAR void memory_install(void) { - struct mem_info *mem_info = boot->mem; - struct vid_info *vid_info = boot->vid; + struct mem_info *mem_info = NULL; + struct vid_info *vid_info = NULL; for (struct mmap_boot *p = mem_info->start; (u32)(p - mem_info->start) < mem_info->size; p++) { @@ -774,10 +774,10 @@ CLEAR void memory_install(struct boot_info *boot) // Map framebuffer memory_map_identity(&kernel_dir, memory_range_around((u32)vid_info->vbe, 0x1000), MEMORY_NONE); - fb_map_buffer(virtual_kernel_dir(), vid_info); + /* fb_map_buffer(virtual_kernel_dir(), vid_info); */ // Map TSS - memory_map_identity(&kernel_dir, memory_range_around(boot->tss, 0x1000), MEMORY_NONE); + //memory_map_identity(&kernel_dir, memory_range_around(boot->tss, 0x1000), MEMORY_NONE); // Unmap NULL byte/page struct memory_range zero = memory_range(0, PAGE_SIZE); |