X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FModules%2FUSB%2FCore%2Fusb.c;h=3234a778b4bd7b7fa972d2909731bdd3a5637086;hb=d9334c3a1eb0295eb13d088991182c57a4d3cabf;hp=405a508102da7b510d5c55eda4bf03f58c9f4929;hpb=51ab5f489bc356940c95cc936fd0508e8f07ea97;p=tpg%2Facess2.git

diff --git a/KernelLand/Modules/USB/Core/usb.c b/KernelLand/Modules/USB/Core/usb.c
index 405a5081..3234a778 100644
--- a/KernelLand/Modules/USB/Core/usb.c
+++ b/KernelLand/Modules/USB/Core/usb.c
@@ -21,20 +21,17 @@ extern tUSBDriver gUSBHub_Driver;
 tUSBHub	*USB_RegisterHost(tUSBHostDef *HostDef, void *ControllerPtr, int nPorts);
 
 // === GLOBALS ===
+tMutex	glUSB_Hosts;
+tUSBHost	*gUSB_Hosts = NULL;
+tMutex	glUSB_InterfaceDrivers;
 tUSBDriver	*gpUSB_InterfaceDrivers = &gUSBHub_Driver;
 
 // === CODE ===
-void USB_RegisterDriver(tUSBDriver *Driver)
-{
-	Driver->Next = gpUSB_InterfaceDrivers;
-	gpUSB_InterfaceDrivers = Driver;
-}
-
 tUSBHub *USB_RegisterHost(tUSBHostDef *HostDef, void *ControllerPtr, int nPorts)
 {
 	tUSBHost	*host;
 	
-	host = malloc(sizeof(tUSBHost) + nPorts*sizeof(void*));
+	host = malloc(sizeof(tUSBHost) + nPorts*sizeof(tUSBHubPort));
 	if(!host) {
 		// Oh, bugger.
 		return NULL;
@@ -46,6 +43,8 @@ tUSBHub *USB_RegisterHost(tUSBHostDef *HostDef, void *ControllerPtr, int nPorts)
 	host->RootHubDev.ParentHub = NULL;
 	host->RootHubDev.Host = host;
 	host->RootHubDev.Address = 0;
+	ASSERT(HostDef->InitControl);
+	host->RootHubDev.EndpointHandles[0] = HostDef->InitControl(ControllerPtr, 0, 64);
 
 //	host->RootHubIf.Next = NULL;
 	host->RootHubIf.Dev = &host->RootHubDev;
@@ -55,11 +54,13 @@ tUSBHub *USB_RegisterHost(tUSBHostDef *HostDef, void *ControllerPtr, int nPorts)
 
 	host->RootHub.Interface = &host->RootHubIf;
 	host->RootHub.nPorts = nPorts;
-	memset(host->RootHub.Devices, 0, sizeof(void*)*nPorts);
+	memset(host->RootHub.Ports, 0, sizeof(tUSBHubPort)*nPorts);
 
-	// TODO: Lock
+	// Append to list
+	Mutex_Acquire( &glUSB_Hosts );
 	host->Next = gUSB_Hosts;
 	gUSB_Hosts = host;
+	Mutex_Release( &glUSB_Hosts );
 
 	return &host->RootHub;
 }
@@ -67,7 +68,12 @@ tUSBHub *USB_RegisterHost(tUSBHostDef *HostDef, void *ControllerPtr, int nPorts)
 // --- Drivers ---
 void USB_RegisterDriver(tUSBDriver *Driver)
 {
-	Log_Warning("USB", "TODO: Implement USB_RegisterDriver");
+	Mutex_Acquire( &glUSB_InterfaceDrivers );
+	Driver->Next = gpUSB_InterfaceDrivers;
+	gpUSB_InterfaceDrivers = Driver;
+	Mutex_Release( &glUSB_InterfaceDrivers );
+	
+	// TODO: Recheck devices that didn't have a driver
 }
 
 tUSBDriver *USB_int_FindDriverByClass(Uint32 ClassCode)
@@ -93,10 +99,10 @@ tUSBHub *USB_RegisterHub(tUSBInterface *Device, int PortCount)
 {
 	tUSBHub	*ret;
 	
-	ret = malloc(sizeof(tUSBHub) + sizeof(ret->Devices[0])*PortCount);
+	ret = malloc(sizeof(tUSBHub) + sizeof(ret->Ports[0])*PortCount);
 	ret->Interface = Device;
 	ret->nPorts = PortCount;
-	memset(ret->Devices, 0, sizeof(ret->Devices[0])*PortCount);
+	memset(ret->Ports, 0, sizeof(ret->Ports[0])*PortCount);
 	return ret;
 }
 
@@ -104,7 +110,7 @@ void USB_RemoveHub(tUSBHub *Hub)
 {
 	for( int i = 0; i < Hub->nPorts; i ++ )
 	{
-		if( Hub->Devices[i] )
+		if( Hub->Ports[i].Dev )
 		{
 			USB_DeviceDisconnected( Hub, i );
 		}