starnakin/42_KFS
1
2
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wip: vbe still not working but let us cook

Browse Source
This commit is contained in:
0x35c
2024-12-06 14:25:03 +01:00
parent 2a281522cf
commit daf510687a
5 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/multiboot.c
View File

@ -9,6 +9,7 @@
#include "vbe.h"
uint32_t multiboot_page_table[1024] __attribute__((aligned(PAGE_SIZE)));
uint32_t vbe_page_table[1024] __attribute__((aligned(PAGE_SIZE)));
multiboot_memory_map_t *mmap_addr;
multiboot_uint32_t mmap_length;
@ -27,22 +28,25 @@ static void init_mmap(multiboot_info_t *mbd_virt, size_t *pt_index)
*pt_index += i;
}
static void init_vbe(multiboot_info_t *mbd_virt, size_t *pt_index)
static void init_vbe(multiboot_info_t *mbd_virt)
{
const uint32_t framebuffer_size = mbd_virt->framebuffer_height *
mbd_virt->framebuffer_width *
CEIL(mbd_virt->framebuffer_bpp, 4);
uint32_t i = 0;
for (; i < CEIL(framebuffer_size, PAGE_SIZE); i++)
multiboot_page_table[i + *pt_index] =
for (; i < CEIL(framebuffer_size, PAGE_SIZE); i++) {
if (i % 1024 == 0)
page_directory[800 + i / 1024] =
((uint32_t)vbe_page_table - HEAP_END) | 0x03;
vbe_page_table[i % 1024] =
((mbd_virt->framebuffer_addr + i * PAGE_SIZE) & PAGE_MASK) |
INIT_FLAGS;
display.buff = (uint32_t *)GET_PAGE_ADDR(1023, *pt_index) +
}
display.buff = (uint32_t *)GET_PAGE_ADDR(800 + i - 1 / 1024, 0) +
(mbd_virt->framebuffer_addr % PAGE_SIZE);
display.height = mbd_virt->framebuffer_height;
display.width = mbd_virt->framebuffer_width;
display.bpp = mbd_virt->framebuffer_bpp;
*pt_index += i;
}
void init_multiboot(multiboot_info_t *mbd, uint32_t magic)
@ -64,5 +68,5 @@ void init_multiboot(multiboot_info_t *mbd, uint32_t magic)
(multiboot_info_t *)(GET_PAGE_ADDR(1023, 0) +
(uint32_t)mbd % PAGE_SIZE);
init_mmap(mbd_virt, &pt_index);
init_vbe(mbd, &pt_index);
init_vbe(mbd_virt);
}