Misc Changes

[tpg/acess2.git] / Modules / USB / uhci.c

diff --git a/Modules/USB/uhci.c b/Modules/USB/uhci.c
deleted file mode 100644 (file)
index e8cb7b7..0000000
--- a/Modules/USB/uhci.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/*\r
- * Acess 2 USB Stack\r
- * Universal Host Controller Interface\r
- */\r
-#define DEBUG  1\r
-#include <acess.h>\r
-#include <vfs.h>\r
-#include <drv_pci.h>\r
-#include "usb.h"\r
-#include "uhci.h"\r
-\r
-// === CONSTANTS ===\r
-#define        MAX_CONTROLLERS 4\r
-#define NUM_TDs        1024\r
-\r
-// === PROTOTYPES ===\r
- int   UHCI_Initialise();\r
-void   UHCI_Cleanup();\r
- int   UHCI_IOCtl(tVFS_Node *node, int id, void *data);\r
- int   UHCI_Int_InitHost(tUHCI_Controller *Host);\r
-\r
-// === GLOBALS ===
-//Uint gaFrameList[1024];\r
-tUHCI_TD       gaUHCI_TDPool[NUM_TDs];\r
-tUHCI_Controller       gUHCI_Controllers[MAX_CONTROLLERS];\r
-\r
-// === CODE ===\r
-/**\r
- * \fn int UHCI_Initialise()\r
- * \brief Called to initialise the UHCI Driver\r
- */\r
-int UHCI_Initialise()\r
-{\r
-        int    i=0, id=-1;\r
-        int    ret;\r
-       Uint16  base;\r
-       \r
-       ENTER("");\r
-       \r
-       // Enumerate PCI Bus, getting a maximum of `MAX_CONTROLLERS` devices\r
-       while( (id = PCI_GetDeviceByClass(0x0C03, 0xFFFF, id)) >= 0 && i < MAX_CONTROLLERS )\r
-       {\r
-               gUHCI_Controllers[i].PciId = id;\r
-               // Assign a port range (BAR4, Reserve 32 ports)\r
-               base = PCI_AssignPort( id, 4, 0x20 );\r
-               gUHCI_Controllers[i].IOBase = base;\r
-               \r
-               Log("[USB  ] Controller PCI #%i: IO Base = 0x%x", id, base);\r
-               \r
-               // Initialise Host\r
-               ret = UHCI_Int_InitHost(&gUHCI_Controllers[i]);\r
-               // Detect an error\r
-               if(ret != 0) {\r
-                       LEAVE('i', ret);\r
-                       return ret;\r
-               }\r
-               \r
-               i ++;\r
-       }\r
-       if(i == MAX_CONTROLLERS) {\r
-               Warning("[UHCI ] Over "EXPAND_STR(MAX_CONTROLLERS)" UHCI controllers detected, ignoring rest");\r
-       }\r
-       LEAVE('i', i);\r
-       return i;\r
-}\r
-\r
-/**\r
- * \fn void UHCI_Cleanup()\r
- * \brief Called just before module is unloaded\r
- */\r
-void UHCI_Cleanup()\r
-{\r
-}
-\r
-/**\r
- * \brief Sends a packet to a device endpoint\r
- */\r
-int UHCI_SendPacket(int ControllerId, int Length)\r
-{\r
-       //tUHCI_TD      *td = UHCI_AllocateTD();\r
-       return 0;\r
-}\r
-\r
-// === INTERNAL FUNCTIONS ===\r
-/**\r
- * \fn int UHCI_Int_InitHost(tUCHI_Controller *Host)\r
- * \brief Initialises a UHCI host controller\r
- * \param Host Pointer - Host to initialise\r
- */\r
-int UHCI_Int_InitHost(tUHCI_Controller *Host)\r
-{\r
-       ENTER("pHost", Host);\r
-       \r
-       // Allocate Frame List\r
-       Host->FrameList = (void *) MM_AllocDMA(1, 32, &Host->PhysFrameList);    // 1 Page, 32-bit\r
-       if( !Host->FrameList ) {\r
-               Warning("[UHCI ] Unable to allocate frame list, aborting");\r
-               LEAVE('i', -1);\r
-               return -1;\r
-       }\r
-       LOG("Allocated frame list 0x%x (0x%x)", Host->FrameList, Host->PhysFrameList);\r
-       memsetd( Host->FrameList, 1, 1024 );    // Clear List (Disabling all entries)\r
-       \r
-       //! \todo Properly fill frame list\r
-       \r
-       // Set frame length to 1 ms\r
-       outb( Host->IOBase + SOFMOD, 64 );\r
-       \r
-       // Set Frame List Address\r
-       outd( Host->IOBase + FLBASEADD, Host->PhysFrameList );\r
-       \r
-       // Set Frame Number\r
-       outw( Host->IOBase + FRNUM, 0 );\r
-       \r
-       // Enable Interrupts\r
-       //PCI_WriteWord( Host->PciId, 0xC0, 0x2000 );\r
-       \r
-       LEAVE('i', 0);\r
-       return 0;\r
-}\r