diff options
Diffstat (limited to 'src/kernel/fs/install.c')
| -rw-r--r-- | src/kernel/fs/install.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/kernel/fs/install.c b/src/kernel/fs/install.c index c098266..d5f62b2 100644 --- a/src/kernel/fs/install.c +++ b/src/kernel/fs/install.c @@ -6,16 +6,18 @@ #include <mlibc/stdlib.h> #include <kernel/acpi/acpi.h> #include <kernel/io/io.h> +#include <kernel/timer/timer.h> -void install_melvix() { - info("You're booting from a CD, Melvix will only run after an install"); - asm volatile ("cli"); - struct ATA_INTERFACE *primary_master = new_ATA(1, 0x1F0); +void install_melvix() +{ + info("You're booting from a CD, Melvix will only run after an installation"); + asm ("cli"); + struct ata_interface *primary_master = new_ata(1, 0x1F0); if (marfs_init(primary_master) != 0) { panic("No HDD found!"); } - struct marfs_SUPERBLOCK *currentSB = marfs_read_superblock(); + struct marfs_superblock *currentSB = marfs_read_superblock(); if (currentSB->signature == 0x1083B99F34B59645) { // WEEEOOOWEEEOOO panic("Melvix seems to be already installed!"); } @@ -26,7 +28,7 @@ void install_melvix() { // Copy MBR info("Copying MBR... "); char *stage1_p[] = {"BOOT", "HDD1.BIN"}; - struct ISO9660_entity *stage1_e = ISO9660_get(stage1_p, 2); + struct iso9660_entity *stage1_e = ISO9660_get(stage1_p, 2); if (!stage1_e) panic("Couldn't find the first HDD bootloader!"); uint8_t *stage1 = ISO9660_read(stage1_e); @@ -40,7 +42,7 @@ void install_melvix() { // Copy second stage info("Copying second stage..."); char *stage2_p[] = {"BOOT", "HDD2.BIN"}; - struct ISO9660_entity *stage2_e = ISO9660_get(stage2_p, 2); + struct iso9660_entity *stage2_e = ISO9660_get(stage2_p, 2); if (!stage2_e) panic("Couldn't find the second HDD bootloader!"); uint8_t *stage2 = ISO9660_read(stage2_e); @@ -50,16 +52,17 @@ void install_melvix() { // Copy the kernel info("Copying the kernel... "); char *kernel_p[] = {"BOOT", "KERNEL.BIN"}; - struct ISO9660_entity *kernel_e = ISO9660_get(kernel_p, 2); + struct iso9660_entity *kernel_e = ISO9660_get(kernel_p, 2); if (!kernel_e) panic("WTH Kernel not found!?"); uint8_t *kernel = kmalloc(kernel_e->length + 2048); - ATAPI_granular_read(1 + (kernel_e->length / 2048), kernel_e->LBA, kernel); + ATAPI_granular_read(1 + (kernel_e->length / 2048), kernel_e->lba, kernel); marfs_new_file(kernel_e->length, kernel, 0, 0, 0); kfree(kernel); kfree(kernel_e); info("Installation successful!"); serial_write("Installation successful!\nRebooting...\n"); + timer_wait(200); acpi_poweroff(); }
\ No newline at end of file |