X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FModules%2FUSB%2FCore%2Fusb.c;h=e20f53cd0b8f112d3cdc901f1db9a1922b241fbb;hb=adaa3a0feeecdda90df3e010898a37f1ffa83197;hp=405a508102da7b510d5c55eda4bf03f58c9f4929;hpb=5820336c4ed8897316d3d2cbd2c0f1b6f204f9a8;p=tpg%2Facess2.git

diff --git a/KernelLand/Modules/USB/Core/usb.c b/KernelLand/Modules/USB/Core/usb.c
index 405a5081..e20f53cd 100644
--- a/KernelLand/Modules/USB/Core/usb.c
+++ b/KernelLand/Modules/USB/Core/usb.c
@@ -21,15 +21,12 @@ 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;
@@ -57,9 +54,11 @@ tUSBHub *USB_RegisterHost(tUSBHostDef *HostDef, void *ControllerPtr, int nPorts)
 	host->RootHub.nPorts = nPorts;
 	memset(host->RootHub.Devices, 0, sizeof(void*)*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 +66,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)