diff --git a/src/kernel/dri/dma/dma.c b/src/kernel/core/dma/dma.c similarity index 100% rename from src/kernel/dri/dma/dma.c rename to src/kernel/core/dma/dma.c diff --git a/src/kernel/dri/dma/dma.h b/src/kernel/core/dma/dma.h similarity index 100% rename from src/kernel/dri/dma/dma.h rename to src/kernel/core/dma/dma.h diff --git a/src/kernel/dri/hal/hal.c b/src/kernel/core/hal/hal.c similarity index 100% rename from src/kernel/dri/hal/hal.c rename to src/kernel/core/hal/hal.c diff --git a/src/kernel/dri/hal/hal.h b/src/kernel/core/hal/hal.h similarity index 100% rename from src/kernel/dri/hal/hal.h rename to src/kernel/core/hal/hal.h diff --git a/src/kernel/core/memory/phys_mem.c b/src/kernel/core/memory/phys_mem.c new file mode 100644 index 0000000..e982541 --- /dev/null +++ b/src/kernel/core/memory/phys_mem.c @@ -0,0 +1,6 @@ +/*----------------*\ +|Nanite OS | +|Copyright (C) 2024| +|Tyler McGurrin | +\*----------------*/ +#include "phys_mem.h" \ No newline at end of file diff --git a/src/kernel/core/memory/phys_mem.h b/src/kernel/core/memory/phys_mem.h new file mode 100644 index 0000000..afc031f --- /dev/null +++ b/src/kernel/core/memory/phys_mem.h @@ -0,0 +1,6 @@ +/*----------------*\ +|Nanite OS | +|Copyright (C) 2024| +|Tyler McGurrin | +\*----------------*/ +#pragma once \ No newline at end of file diff --git a/src/kernel/dri/disk/floppy.c b/src/kernel/dri/disk/floppy.c index 628d994..add2b27 100644 --- a/src/kernel/dri/disk/floppy.c +++ b/src/kernel/dri/disk/floppy.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include uint8_t* DMA_BUFFER; diff --git a/src/kernel/main.c b/src/kernel/main.c index 1d9b7aa..5100051 100644 --- a/src/kernel/main.c +++ b/src/kernel/main.c @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include "../libs/version.h" @@ -64,7 +64,8 @@ void __attribute__((section(".entry"))) start(BootParams* bootParams) { printf("Initializing Basic Drivers..."); Serial_Init(DEBUG_COM_PORT, 9600); Keyboard_Init(); - // Floppy_Init(); // This should always be last; its slow as fuck + Floppy_Init(); // This should always be last; its slow as fuck + Floppy_Read_Sector printf("Done!\n"); diff --git a/src/libs/version.h b/src/libs/version.h index fcc2339..7ca9c7e 100644 --- a/src/libs/version.h +++ b/src/libs/version.h @@ -6,5 +6,5 @@ #pragma once #define LOGO " _ _____ _ __________________\n / | / / | / | / / _/_ __/ ____/\n / |/ / /| | / |/ // / / / / __/ \n / /| / ___ |/ /| // / / / / /___ \n/_/ |_/_/ |_/_/ |_/___/ /_/ /_____/ \n" -#define VERSION "RD-00033" +#define VERSION "RD-00034" #define BOOTLOGO " _ ______ ____ ____ ______\n / | / / __ )/ __ \\/ __ /_ __/\n / |/ / __ / / / / / / // / \n / /| / /_/ / /_/ / /_/ // / \n/_/ |_/_____/\\____/\\____//_/ \n"