Moar cleanupe

diff --git a/Modules/Storage/FDD/fdd.c b/Modules/Storage/FDD/fdd.c
index d56a527..86cef01 100644 (file)
--- a/Modules/Storage/FDD/fdd.c
+++ b/Modules/Storage/FDD/fdd.c
@@ -81,18 +81,20 @@ enum FloppyCommands {
 // === PROTOTYPES ===\r
 // --- Filesystem\r
  int   FDD_Install(char **Arguments);\r
+void   FDD_UnloadModule();\r
+// --- VFS Methods\r
 char   *FDD_ReadDir(tVFS_Node *Node, int pos);\r
 tVFS_Node      *FDD_FindDir(tVFS_Node *dirNode, char *Name);\r
  int   FDD_IOCtl(tVFS_Node *Node, int ID, void *Data);\r
 Uint64 FDD_ReadFS(tVFS_Node *node, Uint64 off, Uint64 len, void *buffer);\r
-// --- 1st Level Disk Access\r
+// --- Functions for IOCache/DrvUtil\r
 Uint   FDD_ReadSectors(Uint64 SectorAddr, Uint Count, void *Buffer, Uint Disk);\r
 // --- Raw Disk Access\r
  int   FDD_ReadSector(Uint32 disk, Uint64 lba, void *Buffer);\r
  int   FDD_WriteSector(Uint32 Disk, Uint64 LBA, void *Buffer);\r
 // --- Helpers\r
 void   FDD_IRQHandler(int Num);\r
-void   FDD_WaitIRQ();\r
+inline void    FDD_WaitIRQ();\r
 void   FDD_SensInt(int base, Uint8 *sr0, Uint8 *cyl);\r
 void   FDD_int_SendByte(int base, char byte);\r
  int   FDD_int_GetByte(int base);\r
@@ -188,6 +190,22 @@ int FDD_Install(char **Arguments)
        return MODULE_ERR_OK;\r
 }\r
 \r
+/**\r
+ * \brief Prepare the module for removal\r
+ */\r
+void FDD_UnloadModule()\r
+{\r
+        int    i;\r
+       //DevFS_DelDevice( &gFDD_DriverInfo );\r
+       LOCK(&glFDD);\r
+       for(i=0;i<4;i++) {\r
+               Time_RemoveTimer(gFDD_Devices[i].timer);\r
+               FDD_int_StopMotor(i);\r
+       }\r
+       RELEASE(&glFDD);\r
+       //IRQ_Clear(6);\r
+}\r
+\r
 /**\r
  * \fn char *FDD_ReadDir(tVFS_Node *Node, int pos)\r
  * \brief Read Directory\r
@@ -549,7 +567,7 @@ void FDD_IRQHandler(int Num)
  * \fn FDD_WaitIRQ()\r
  * \brief Wait for an IRQ6\r
  */\r
-void FDD_WaitIRQ()\r
+inline void FDD_WaitIRQ()\r
 {\r
        // Wait for IRQ\r
        while(!gbFDD_IrqFired)  Threads_Yield();\r
@@ -583,8 +601,9 @@ void FDD_int_SendByte(int base, char byte)
         }\r
         inb(0x80);     //Delay\r
     }\r
+       \r
        #if WARN\r
-               Warning("FDD_int_SendByte - Timeout sending byte 0x%x to base 0x%x\n", byte, base);\r
+       Warning("FDD_int_SendByte - Timeout sending byte 0x%x to base 0x%x\n", byte, base);\r
        #endif\r
 }\r
 \r
@@ -703,20 +722,3 @@ void FDD_int_StopMotor(int disk)
        outb( cPORTBASE[ disk>>1 ] + PORT_DIGOUTPUT, state );\r
     gFDD_Devices[disk].motorState = 0;\r
 }\r
-\r
-/**\r
- * \fn void ModuleUnload()\r
- * \brief Prepare the module for removal\r
- */\r
-void ModuleUnload()\r
-{\r
-        int    i;\r
-       //DevFS_DelDevice( &gFDD_DriverInfo );\r
-       LOCK(&glFDD);\r
-       for(i=0;i<4;i++) {\r
-               Time_RemoveTimer(gFDD_Devices[i].timer);\r
-               FDD_int_StopMotor(i);\r
-       }\r
-       RELEASE(&glFDD);\r
-       //IRQ_Clear(6);\r
-}\r