From 6987737813acc74451ed6340dd0f58b4d13a15ad Mon Sep 17 00:00:00 2001 From: Tyler McGurrin Date: Wed, 4 Jun 2025 08:38:20 -0400 Subject: [PATCH] Floppy Driver is basically done, just gotta implement DMA and then it should be all done! --- src/kernel/dri/disk/floppy.c | 8 ++++---- src/kernel/main.c | 2 +- src/libs/version.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/kernel/dri/disk/floppy.c b/src/kernel/dri/disk/floppy.c index 313ca42..d789981 100644 --- a/src/kernel/dri/disk/floppy.c +++ b/src/kernel/dri/disk/floppy.c @@ -24,7 +24,7 @@ void Floppy_Handler() { // IRQ Handler FloppyIRQRecived = 1; - Serial_Printf(DEBUG_COM_PORT, "Recived IRQ From Floppy Drive.\n"); + Serial_Printf(DEBUG_COM_PORT, "FLOPPY:> Recived IRQ From FDC.\n"); } void Floppy_IRQ_Wait() @@ -296,13 +296,13 @@ void Floppy_Motor_Control(bool enable) { if(enable == true) { outb (FLOPPY_DOR, FLOPPY_DOR_MASK_DRIVE0_MOTOR | FLOPPY_DOR_MASK_RESET); - Serial_Printf(DEBUG_COM_PORT, "Starting FDD Motor."); + Serial_Printf(DEBUG_COM_PORT, "FLOPPY:> Starting FDD Motor.\n"); int i; while(i >= 500) i++; } else { - outb (FLOPPY_DOR, FLOPPY_DOR_MASK_DRIVE0_MOTOR | FLOPPY_DOR_MASK_RESET); - Serial_Printf(DEBUG_COM_PORT, "Stopping FDD Motor."); + Floppy_Reset(); + Serial_Printf(DEBUG_COM_PORT, "FLOPPY:> Stopping FDD Motor, FDC Reseting.\n"); } } diff --git a/src/kernel/main.c b/src/kernel/main.c index d413b32..809f3a3 100644 --- a/src/kernel/main.c +++ b/src/kernel/main.c @@ -75,7 +75,7 @@ void __attribute__((section(".entry"))) start(BootParams* bootParams) { printf("Done!\n"); masterFDDType = Master_FDD_Detect(); slaveFDDType = Slave_FDD_Detect(); - Print_Storage_Types(masterFDDType, slaveFDDType); + Floppy_Init(); diff --git a/src/libs/version.h b/src/libs/version.h index e04efe7..852be07 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-00028" +#define VERSION "RD-00029" #define BOOTLOGO " _ ______ ____ ____ ______\n / | / / __ )/ __ \\/ __ /_ __/\n / |/ / __ / / / / / / // / \n / /| / /_/ / /_/ / /_/ // / \n/_/ |_/_____/\\____/\\____//_/ \n"