Kernel - Fixing and breaking SMP related stuff

[tpg/acess2.git] / Modules / USB / Core / usb.c

diff --git a/Modules/USB/Core/usb.c b/Modules/USB/Core/usb.c
index ab9a489..b319580 100644 (file)
--- a/Modules/USB/Core/usb.c
+++ b/Modules/USB/Core/usb.c
@@ -1,6 +1,9 @@
 /*
- * Acess 2 USB Stack
- * USB Packet Control
+ * Acess2 USB Stack
+ * - By John Hodge (thePowersGang)
+ *
+ * usb.c
+ * - USB Structure
  */
 #define DEBUG  1
 #include <acess.h>
@@ -8,23 +11,98 @@
 #include <drv_pci.h>
 #include "usb.h"
 
+// === IMPORTS ===
+extern tUSBHost        *gUSB_Hosts;
+extern tUSBDriver gUSBHub_Driver;
+
+// === STRUCTURES ===
+
+// === PROTOTYPES ===
+tUSBHub        *USB_RegisterHost(tUSBHostDef *HostDef, void *ControllerPtr, int nPorts);
+
+// === GLOBALS ===
+tUSBDriver     *gpUSB_InterfaceDrivers = &gUSBHub_Driver;
 
 // === CODE ===
-void USB_RegisterHost(tUSBHost *HostDef, void *ControllerPtr)
+tUSBHub *USB_RegisterHost(tUSBHostDef *HostDef, void *ControllerPtr, int nPorts)
 {
-       // TODO:
+       tUSBHost        *host;
+       
+       host = malloc(sizeof(tUSBHost) + nPorts*sizeof(void*));
+       if(!host) {
+               // Oh, bugger.
+               return NULL;
+       }
+       host->HostDef = HostDef;
+       host->Ptr = ControllerPtr;
+       memset(host->AddressBitmap, 0, sizeof(host->AddressBitmap));
+
+       host->RootHubDev.ParentHub = NULL;
+       host->RootHubDev.Host = host;
+       host->RootHubDev.Address = 0;
+
+//     host->RootHubIf.Next = NULL;
+       host->RootHubIf.Dev = &host->RootHubDev;
+       host->RootHubIf.Driver = NULL;
+       host->RootHubIf.Data = NULL;
+       host->RootHubIf.nEndpoints = 0;
+
+       host->RootHub.Interface = &host->RootHubIf;
+       host->RootHub.nPorts = nPorts;
+       memset(host->RootHub.Devices, 0, sizeof(void*)*nPorts);
+
+       // TODO: Lock
+       host->Next = gUSB_Hosts;
+       gUSB_Hosts = host;
+
+       return &host->RootHub;
 }
 
-int USB_int_SendSetupSetAddress(tUSBHost *Host, void *Ptr, int Address)
+// --- Drivers ---
+void USB_RegisterDriver(tUSBDriver *Driver)
 {
-       Uint8   data[8];
-       data[0] = 0;    // bmRequestType
-       data[1] = 5;    // SET_ADDRESS
-       data[2] = Address & 0x7F;       // wValue (low)
-       data[3] = 0;    // wValue (high)
-       data[4] = 0;    // wLength
-       data[6] = 0;    // wLength
+       Log_Warning("USB", "TODO: Implement USB_RegisterDriver");
+}
+
+tUSBDriver *USB_int_FindDriverByClass(Uint32 ClassCode)
+{
+       ENTER("xClassCode", ClassCode);
+       for( tUSBDriver *ret = gpUSB_InterfaceDrivers; ret; ret = ret->Next )
+       {
+               LOG(" 0x%x & 0x%x == 0x%x?", ClassCode, ret->Match.Class.ClassMask, ret->Match.Class.ClassCode);
+               if( (ClassCode & ret->Match.Class.ClassMask) == ret->Match.Class.ClassCode )
+               {
+                       LOG("Found '%s'", ret->Name);
+                       LEAVE('p', ret);
+                       return ret;
+               }
+       }
+       LEAVE('n');
+       return NULL;
+}
+
+// --- Hub Registration ---
+// NOTE: Doesn't do much nowdays
+tUSBHub *USB_RegisterHub(tUSBInterface *Device, int PortCount)
+{
+       tUSBHub *ret;
        
-       // Addr 0:0, Data Toggle = 0, no interrupt
-       return Host->SendSETUP(Ptr, 0, 0, 0, FALSE, data, 8) == NULL;
+       ret = malloc(sizeof(tUSBHub) + sizeof(ret->Devices[0])*PortCount);
+       ret->Interface = Device;
+       ret->nPorts = PortCount;
+       memset(ret->Devices, 0, sizeof(ret->Devices[0])*PortCount);
+       return ret;
 }
+
+void USB_RemoveHub(tUSBHub *Hub)
+{
+       for( int i = 0; i < Hub->nPorts; i ++ )
+       {
+               if( Hub->Devices[i] )
+               {
+                       USB_DeviceDisconnected( Hub, i );
+               }
+       }
+       free(Hub);
+}
+