Modules/FDD - Trying to fix fdd behavior

[tpg/acess2.git] / Modules / Storage / FDD / fdd.c

diff --git a/Modules/Storage/FDD/fdd.c b/Modules/Storage/FDD/fdd.c
index 42150a9..e507e94 100644 (file)
--- a/Modules/Storage/FDD/fdd.c
+++ b/Modules/Storage/FDD/fdd.c
@@ -6,7 +6,7 @@
 #include <acess.h>
 #include <modules.h>
 #include <fs_devfs.h>
-#include <tpl_drv_disk.h>
+#include <api_drv_disk.h>
 #include <dma.h>
 #include <iocache.h>
 
@@ -107,7 +107,7 @@ Uint        FDD_ReadSectors(Uint64 SectorAddr, Uint Count, void *Buffer, Uint Disk);
  int   FDD_ReadSector(Uint32 disk, Uint64 lba, void *Buffer);
  int   FDD_WriteSector(Uint32 Disk, Uint64 LBA, void *Buffer);
 // --- Helpers
-void   FDD_IRQHandler(int Num);
+void   FDD_IRQHandler(int Num, void *Ptr);
 inline void    FDD_WaitIRQ();
 void   FDD_SensInt(int base, Uint8 *sr0, Uint8 *cyl);
  int   FDD_int_SendByte(int base, Uint8 Byte);
@@ -172,7 +172,7 @@ int FDD_Install(char **Arguments)
        }
        
        // Install IRQ6 Handler
-       IRQ_AddHandler(6, FDD_IRQHandler);
+       IRQ_AddHandler(6, FDD_IRQHandler, NULL);
 
        // Ensure the FDD version is 0x90
        {
@@ -676,7 +676,7 @@ int FDD_int_GetDims(int type, int lba, int *c, int *h, int *s, int *spt)
  * \fn void FDD_IRQHandler(int Num)
  * \brief Handles IRQ6
  */
-void FDD_IRQHandler(int Num)
+void FDD_IRQHandler(int Num, void *Ptr)
 {
        gbFDD_IrqFired = 1;
 }
@@ -707,8 +707,13 @@ int FDD_int_SendByte(int base, Uint8 byte)
 {
        tTime   end = now() + 1000;     // 1s
        
-       while( (inb(base + PORT_MAINSTATUS) & 0xC0) != 0x80 && now() < end )
+       while( (inb(base + PORT_MAINSTATUS) & 0x80) != 0x80 && now() < end )
                Threads_Yield();        //Delay
+
+       if( inb(base + PORT_MAINSTATUS) & 0x40 ) {
+               Log_Warning("FDD", "FDD_int_SendByte: DIO set, is this ok?");
+               return -2;
+       }
        
        if( now() < end )
        {
@@ -731,9 +736,14 @@ int FDD_int_GetByte(int base, Uint8 *value)
 {
        tTime   end = now() + 1000;     // 1s
        
-       while( (inb(base + PORT_MAINSTATUS) & 0xd0) != 0xd0 && now() < end )
+       while( (inb(base + PORT_MAINSTATUS) & 0x80) != 0x80 && now() < end )
                Threads_Yield();
        
+       if( !(inb(base + PORT_MAINSTATUS) & 0x40) ) {
+               Log_Warning("FDD", "FDD_int_GetByte: DIO unset, is this ok?");
+               return -2;
+       }
+
        if( now() < end )
        {
                Uint8   tmp = inb(base + PORT_DATA);
@@ -834,11 +844,13 @@ int FDD_Reset(int id)
        // Recalibrate disks
        LOG("Recalibrate disks (16x seek)");
        retries = 16;
-       while(FDD_int_SeekTrack(0, 0, 1) == 0 && retries --);   // set track
+       while(FDD_int_SeekTrack(0, 0, 1) == 0 && retries --)
+               Threads_Yield();        // set track
        if(retries < 0) LEAVE_RET('i', -1);
 
        retries = 16;
-       while(FDD_int_SeekTrack(0, 1, 1) == 0 && retries --);   // set track
+       while(FDD_int_SeekTrack(0, 1, 1) == 0 && retries --)
+               Threads_Yield();        // set track
        if(retries < 0) LEAVE_RET('i', -1);
        
        LOG("Recalibrating Disk");