diff --git a/grub.cfg b/grub.cfg index 67bab1e..63ee132 100644 --- a/grub.cfg +++ b/grub.cfg @@ -1,4 +1,3 @@ menuentry "RockOS" { multiboot /boot/rockos - module /boot/origin.elf } \ No newline at end of file diff --git a/kernel/drivers/iso/iso.c b/kernel/drivers/iso/iso.c index 3734362..8feb243 100644 --- a/kernel/drivers/iso/iso.c +++ b/kernel/drivers/iso/iso.c @@ -38,7 +38,7 @@ void read_iso(ide_device_t* dev) { uint32_t lba_path_table = pvd->path_table_l_loc; uint32_t path_table_sz = pvd->path_table_sz_le; uint32_t sectors = path_table_sz / 2048; - if (sectors % 2048 > 0) { + if (sectors % 2048 > 0 || sectors == 0) { sectors++; } @@ -50,7 +50,6 @@ void read_iso(ide_device_t* dev) { return; } - kprintf("iterating path table\n"); iso_path_table_entry_t* path = (iso_path_table_entry_t*)path_table_sec; while ((uint32_t)path - (uint32_t)path_table_sec < 2048) { size_t entry_sz = sizeof(iso_path_table_entry_t) + (path->dir_ident_len - 1); diff --git a/kernel/lib/memory.c b/kernel/lib/memory.c index 992bb72..d6c7fc2 100644 --- a/kernel/lib/memory.c +++ b/kernel/lib/memory.c @@ -31,7 +31,6 @@ int strlen(const char* str) { return len; } - static void* kernel_heap = (void*)0xE0000000; static size_t kernel_heap_sz = 0;