X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FModules%2FUSB%2FCore%2Fusb_lowlevel.c;h=27bad3e12f9f750c651ab48c98a2fac5d7ac1e9b;hb=d6fe233b0485dfefdd51729025f42cf479e57c16;hp=dce7c33ac75fc1f97b2f435ef90b94cfb0c2bed0;hpb=11dbd684e9a3d907d43d71a3145205f1a86992fb;p=tpg%2Facess2.git

diff --git a/KernelLand/Modules/USB/Core/usb_lowlevel.c b/KernelLand/Modules/USB/Core/usb_lowlevel.c
index dce7c33a..27bad3e1 100644
--- a/KernelLand/Modules/USB/Core/usb_lowlevel.c
+++ b/KernelLand/Modules/USB/Core/usb_lowlevel.c
@@ -14,7 +14,7 @@
 #include <events.h>
 
 // === PROTOTYPES ===
-void	*USB_int_Request(tUSBHost *Host, int Addr, int EndPt, int Type, int Req, int Val, int Indx, int Len, void *Data);
+void	*USB_int_Request(tUSBDevice *Dev, int EndPt, int Type, int Req, int Val, int Indx, int Len, void *Data);
 void	USB_int_WakeThread(void *Thread, void *Data, size_t Length);
  int	USB_int_SendSetupSetAddress(tUSBHost *Host, int Address);
  int	USB_int_ReadDescriptor(tUSBDevice *Dev, int Endpoint, int Type, int Index, int Length, void *Dest);
@@ -22,16 +22,28 @@ char	*USB_int_GetDeviceString(tUSBDevice *Dev, int Endpoint, int Index);
  int	_UTF16to8(Uint16 *Input, int InputLen, char *Dest);
 
 // === CODE ===
-void *USB_int_Request(tUSBHost *Host, int Addr, int EndPt, int Type, int Req, int Val, int Indx, int Len, void *Data)
+void *USB_int_Request(tUSBDevice *Device, int EndPt, int Type, int Req, int Val, int Indx, int Len, void *Data)
 {
+	tUSBHost	*Host = Device->Host;
 	void	*hdl;
 	// TODO: Sanity check (and check that Type is valid)
 	struct sDeviceRequest	req;
-	 int	dest = Addr * 16 + EndPt;	// TODO: Validate
 	tThread	*thisthread = Proc_GetCurThread();
+	void *dest_hdl;
+
+	ENTER("pDevice xEndPt iType iReq iVal iIndx iLen pData",
+		Device, EndPt, Type, Req, Val, Indx, Len, Data);
 	
-	ENTER("pHost xdest iType iReq iVal iIndx iLen pData",
-		Host, dest, Type, Req, Val, Indx, Len, Data);
+	if( EndPt < 0 || EndPt >= 16 ) {
+		LEAVE('n');
+		return NULL;
+	}
+
+	dest_hdl = Device->EndpointHandles[EndPt];
+	if( !dest_hdl ) {
+		LEAVE('n');
+		return NULL;
+	}
 	
 	req.ReqType = Type;
 	req.Request = Req;
@@ -41,36 +53,22 @@ void *USB_int_Request(tUSBHost *Host, int Addr, int EndPt, int Type, int Req, in
 
 	Threads_ClearEvent(THREAD_EVENT_SHORTWAIT);
 
-	LOG("SETUP");	
-	hdl = Host->HostDef->ControlSETUP(Host->Ptr, dest, 0, &req, sizeof(req));
-
-	// TODO: Data toggle?
-	// TODO: Multi-packet transfers
-	if( Len > 0 )
-	{
-		if( Type & 0x80 )
-		{
-			LOG("IN");
-			hdl = Host->HostDef->ControlIN(Host->Ptr, dest, 1, NULL, NULL, Data, Len);
-	
-			LOG("OUT (Status)");
-			hdl = Host->HostDef->ControlOUT(Host->Ptr, dest, 1, USB_int_WakeThread, thisthread, NULL, 0);
-		}
-		else
-		{
-			LOG("OUT");
-			Host->HostDef->ControlOUT(Host->Ptr, dest, 1, NULL, NULL, Data, Len);
-			
-			// Status phase (DataToggle=1)
-			LOG("IN (Status)");
-			hdl = Host->HostDef->ControlIN(Host->Ptr, dest, 1, USB_int_WakeThread, thisthread, NULL, 0);
-		}
+	LOG("Send");
+	if( Type & 0x80 ) {
+		// Inbound data
+		hdl = Host->HostDef->SendControl(Host->Ptr, dest_hdl, USB_int_WakeThread, thisthread, 0,
+			&req, sizeof(req),
+			NULL, 0,
+			Data, Len
+			);
 	}
-	else
-	{
-		// Zero length, IN status
-		LOG("IN (Status)");
-		hdl = Host->HostDef->ControlIN(Host->Ptr, dest, 1, USB_int_WakeThread, thisthread, NULL, 0);
+	else {
+		// Outbound data
+		hdl = Host->HostDef->SendControl(Host->Ptr, dest_hdl, USB_int_WakeThread, thisthread, 1,
+			&req, sizeof(req),
+			Data, Len,
+			NULL, 0
+			);
 	}
 	LOG("Wait...");
 	Threads_WaitEvents(THREAD_EVENT_SHORTWAIT);
@@ -86,19 +84,22 @@ void USB_int_WakeThread(void *Thread, void *Data, size_t Length)
 
 int USB_int_SendSetupSetAddress(tUSBHost *Host, int Address)
 {
-	USB_int_Request(Host, 0, 0, 0x00, 5, Address & 0x7F, 0, 0, NULL);
+	USB_int_Request(Host->RootHubDev, 0, 0x00, 5, Address & 0x7F, 0, 0, NULL);
 	return 0;
 }
 
 int USB_int_ReadDescriptor(tUSBDevice *Dev, int Endpoint, int Type, int Index, int Length, void *Dest)
 {
-	const int	ciMaxPacketSize = 0x400;
 	struct sDeviceRequest	req;
-	 int	bToggle = 0;
-	 int	dest = Dev->Address*16 + Endpoint;
+	void	*dest_hdl;
+	
+	dest_hdl = Dev->EndpointHandles[Endpoint];
+	if( !dest_hdl ) {
+		return -1;
+	}
 
-	ENTER("pDev xdest iType iIndex iLength pDest",
-		Dev, dest, Type, Index, Length, Dest);
+	ENTER("pDev xEndpoint iType iIndex iLength pDest",
+		Dev, Endpoint, Type, Index, Length, Dest);
 
 	req.ReqType = 0x80;
 	req.ReqType |= ((Type >> 8) & 0x3) << 5;	// Bits 5/6
@@ -109,36 +110,19 @@ int USB_int_ReadDescriptor(tUSBDevice *Dev, int Endpoint, int Type, int Index, i
 	req.Index = LittleEndian16( 0 );	// TODO: Language ID / Interface
 	req.Length = LittleEndian16( Length );
 
-	LOG("SETUP");	
-	Dev->Host->HostDef->ControlSETUP(Dev->Host->Ptr, dest, 0, &req, sizeof(req));
-	
-	bToggle = 1;
-	while( Length > ciMaxPacketSize )
-	{
-		LOG("IN (%i rem)", Length - ciMaxPacketSize);
-		Dev->Host->HostDef->ControlIN(
-			Dev->Host->Ptr, dest,
-			bToggle, NULL, NULL,
-			Dest, ciMaxPacketSize
-			);
-		bToggle = !bToggle;
-		Length -= ciMaxPacketSize;
-	}
-
-	LOG("IN (final)");
-	Dev->Host->HostDef->ControlIN( Dev->Host->Ptr, dest, bToggle, NULL, NULL, Dest, Length );
-
 	Threads_ClearEvent(THREAD_EVENT_SHORTWAIT);
-	LOG("OUT (Status)");
-	Dev->Host->HostDef->ControlOUT(
-		Dev->Host->Ptr, dest, 1,
-		USB_int_WakeThread, Proc_GetCurThread(),
-		NULL, 0
+	
+	LOG("Send");
+	Dev->Host->HostDef->SendControl(Dev->Host->Ptr, dest_hdl, USB_int_WakeThread, Proc_GetCurThread(), 0,
+		&req, sizeof(req),
+		NULL, 0,
+		Dest, Length
 		);
 
 	LOG("Waiting");
+	// TODO: Detect errors?
 	Threads_WaitEvents(THREAD_EVENT_SHORTWAIT);
-
+	
 	LEAVE('i', 0);
 	return 0;
 }