From: John Hodge <tpg@mutabah.net>
Date: Sat, 7 May 2011 13:39:37 +0000 (+0800)
Subject: USB - Still non working, but fiddling with it
X-Git-Tag: rel0.10~118
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=28748642435edf50861a8883322e00795d276d65;p=tpg%2Facess2.git

USB - Still non working, but fiddling with it
---

diff --git a/Modules/USB/Core/uhci.c b/Modules/USB/Core/uhci.c
index e8cb7b71..fb92d545 100644
--- a/Modules/USB/Core/uhci.c
+++ b/Modules/USB/Core/uhci.c
@@ -33,19 +33,22 @@ int UHCI_Initialise()
 {
 	 int	i=0, id=-1;
 	 int	ret;
-	Uint16	base;
 	
 	ENTER("");
 	
 	// Enumerate PCI Bus, getting a maximum of `MAX_CONTROLLERS` devices
 	while( (id = PCI_GetDeviceByClass(0x0C03, 0xFFFF, id)) >= 0 && i < MAX_CONTROLLERS )
 	{
+		// NOTE: Check "protocol" from PCI?
+		
 		gUHCI_Controllers[i].PciId = id;
 		// Assign a port range (BAR4, Reserve 32 ports)
-		base = PCI_AssignPort( id, 4, 0x20 );
-		gUHCI_Controllers[i].IOBase = base;
+		//base = PCI_AssignPort( id, 4, 0x20 );
+		gUHCI_Controllers[i].IOBase = PCI_GetBAR4(id);
+		gUHCI_Controllers[i].IRQNum = PCI_GetIRQ(id);
 		
-		Log("[USB  ] Controller PCI #%i: IO Base = 0x%x", id, base);
+		Log("[USB  ] Controller PCI #%i: IO Base = 0x%x, IRQ %i",
+			id, gUHCI_Controllers[i].IOBase, gUHCI_Controllers[i].IRQNum);
 		
 		// Initialise Host
 		ret = UHCI_Int_InitHost(&gUHCI_Controllers[i]);
@@ -91,10 +94,14 @@ int UHCI_Int_InitHost(tUHCI_Controller *Host)
 {
 	ENTER("pHost", Host);
 	
+	outw( Host->IOBase + USBCMD, 4 );	// GRESET
+	// TODO: Wait for at least 10ms
+	outw( Host->IOBase + USBCMD, 0 );	// GRESET
+	
 	// Allocate Frame List
 	Host->FrameList = (void *) MM_AllocDMA(1, 32, &Host->PhysFrameList);	// 1 Page, 32-bit
 	if( !Host->FrameList ) {
-		Warning("[UHCI ] Unable to allocate frame list, aborting");
+		Log_Warning("UHCI", "Unable to allocate frame list, aborting");
 		LEAVE('i', -1);
 		return -1;
 	}
diff --git a/Modules/USB/Core/uhci.h b/Modules/USB/Core/uhci.h
index df7854b8..d8ace9fa 100644
--- a/Modules/USB/Core/uhci.h
+++ b/Modules/USB/Core/uhci.h
@@ -24,6 +24,11 @@ struct sUHCI_Controller
 	 */
 	Uint16	IOBase;
 	
+	/**
+	 * \brief IRQ Number assigned to the device
+	 */
+	 int	IRQNum;
+	
 	/**
 	 * \brief Frame list
 	 *