X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=inline;f=Modules%2FUSB%2FCore%2Fusb.c;fp=Modules%2FUSB%2FCore%2Fusb.c;h=ca86a2b492d70595abed2e77c03abae8ea0dfc65;hb=3e39f3e998538521830c10da09fe14c7a7dc66bd;hp=f090f634642f19f3f0a92bde7d96403b81c4d18c;hpb=1352659ea47c594347a84dac566a4123580ddd56;p=tpg%2Facess2.git

diff --git a/Modules/USB/Core/usb.c b/Modules/USB/Core/usb.c
index f090f634..ca86a2b4 100644
--- a/Modules/USB/Core/usb.c
+++ b/Modules/USB/Core/usb.c
@@ -1,6 +1,9 @@
 /*
  * Acess 2 USB Stack
- * USB Packet Control
+ * - By John Hodge (thePowersGang)
+ *
+ * usb.c
+ * - USB Packet Control
  */
 #define DEBUG	1
 #include <acess.h>
@@ -8,6 +11,7 @@
 #include <drv_pci.h>
 #include "usb.h"
 #include "usb_proto.h"
+#include "usb_lowlevel.h"
 
 // === IMPORTS ===
 extern tUSBHost	*gUSB_Hosts;
@@ -21,11 +25,6 @@ void	USB_DeviceDisconnected(tUSBHub *Hub, int Port);
 void	*USB_GetDeviceDataPtr(tUSBInterface *Dev);
 void	USB_SetDeviceDataPtr(tUSBInterface *Dev, void *Ptr);
  int	USB_int_AllocateAddress(tUSBHost *Host);
- int	USB_int_SendSetupSetAddress(tUSBHost *Host, int Address);
- int	USB_int_ReadDescriptor(tUSBDevice *Dev, int Endpoint, int Type, int Index, int Length, void *Dest);
-char	*USB_int_GetDeviceString(tUSBDevice *Dev, int Endpoint, int Index);
-
- int	_UTF16to8(Uint16 *Input, int InputLen, char *Dest);
 
 // === CODE ===
 tUSBHub *USB_RegisterHost(tUSBHostDef *HostDef, void *ControllerPtr, int nPorts)
@@ -233,165 +232,3 @@ void USB_int_DeallocateAddress(tUSBHost *Host, int Address)
 	Host->AddressBitmap[Address/8] &= ~(1 << (Address%8));
 }
 
-void *USB_int_Request(tUSBHost *Host, int Addr, int EndPt, int Type, int Req, int Val, int Indx, int Len, void *Data)
-{
-	void	*hdl;
-	// TODO: Sanity check (and check that Type is valid)
-	struct sDeviceRequest	req;
-	req.ReqType = Type;
-	req.Request = Req;
-	req.Value = LittleEndian16( Val );
-	req.Index = LittleEndian16( Indx );
-	req.Length = LittleEndian16( Len );
-	
-	hdl = Host->HostDef->SendSETUP(Host->Ptr, Addr, EndPt, 0, NULL, &req, sizeof(req));
-
-	// TODO: Data toggle?
-	// TODO: Correct sequence? (Some OUT requests need an IN)
-	if( Type & 0x80 )
-	{
-		hdl = Host->HostDef->SendIN(Host->Ptr, Addr, EndPt, 0, NULL, Data, Len);
-		while( Host->HostDef->IsOpComplete(Host->Ptr, hdl) == 0 )
-			Time_Delay(1);
-	}
-	else
-	{
-		hdl = Host->HostDef->SendOUT(Host->Ptr, Addr, EndPt, 0, NULL, Data, Len);
-	}
-	return hdl;
-}
-
-int USB_int_SendSetupSetAddress(tUSBHost *Host, int Address)
-{
-	void	*hdl;
-	struct sDeviceRequest	req;
-	req.ReqType = 0;	// bmRequestType
-	req.Request = 5;	// SET_ADDRESS
-	// TODO: Endian
-	req.Value = LittleEndian16( Address & 0x7F );	// wValue
-	req.Index = LittleEndian16( 0 );	// wIndex
-	req.Length = LittleEndian16( 0 );	// wLength
-	
-	// Addr 0:0, Data Toggle = 0, no interrupt
-	hdl = Host->HostDef->SendSETUP(Host->Ptr, 0, 0, 0, NULL, &req, sizeof(req));
-	if(!hdl)
-		return 1;
-
-	hdl = Host->HostDef->SendIN(Host->Ptr, 0, 0, 0, NULL, NULL, 0);
-	
-	while( Host->HostDef->IsOpComplete(Host->Ptr, hdl) == 0 )
-		Time_Delay(1);
-	
-	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;
-	void	*final;
-
-	req.ReqType = 0x80;
-	req.Request = 6;	// GET_DESCRIPTOR
-	req.Value = LittleEndian16( ((Type & 0xFF) << 8) | (Index & 0xFF) );
-	req.Index = LittleEndian16( 0 );	// TODO: Language ID
-	req.Length = LittleEndian16( Length );
-	
-	Dev->Host->HostDef->SendSETUP(
-		Dev->Host->Ptr, Dev->Address, Endpoint,
-		0, NULL,
-		&req, sizeof(req)
-		);
-	
-	bToggle = 1;
-	while( Length > ciMaxPacketSize )
-	{
-		Dev->Host->HostDef->SendIN(
-			Dev->Host->Ptr, Dev->Address, Endpoint,
-			bToggle, NULL,
-			Dest, ciMaxPacketSize
-			);
-		bToggle = !bToggle;
-		Length -= ciMaxPacketSize;
-	}
-
-	final = Dev->Host->HostDef->SendIN(
-		Dev->Host->Ptr, Dev->Address, Endpoint,
-		bToggle, INVLPTR,
-		Dest, Length
-		);
-
-	while( Dev->Host->HostDef->IsOpComplete(Dev->Host->Ptr, final) == 0 )
-		Time_Delay(1);
-
-	return 0;
-}
-
-char *USB_int_GetDeviceString(tUSBDevice *Dev, int Endpoint, int Index)
-{
-	struct sDescriptor_String	str;
-	 int	src_len, new_len;
-	char	*ret;
-	
-	USB_int_ReadDescriptor(Dev, Endpoint, 3, Index, sizeof(str), &str);
-//	if(str.Length > sizeof(str)) {
-//		// IMPOSSIBLE!
-//		Log_Error("USB", "String is %i bytes, which is over prealloc size (%i)",
-//			str.Length, sizeof(str)
-//			);
-//	}
-	src_len = (str.Length - 2) / sizeof(str.Data[0]);
-
-	new_len = _UTF16to8(str.Data, src_len, NULL);	
-	ret = malloc( new_len + 1 );
-	_UTF16to8(str.Data, src_len, ret);
-	ret[new_len] = 0;
-	return ret;
-}
-
-int _UTF16to8(Uint16 *Input, int InputLen, char *Dest)
-{
-	 int	str_len, cp_len;
-	Uint32	saved_bits = 0;
-	str_len = 0;
-	for( int i = 0; i < InputLen; i ++)
-	{
-		Uint32	cp;
-		Uint16	val = Input[i];
-		if( val >= 0xD800 && val <= 0xDBFF )
-		{
-			// Multibyte - Leading
-			if(i + 1 > InputLen) {
-				cp = '?';
-			}
-			else {
-				saved_bits = (val - 0xD800) << 10;
-				saved_bits += 0x10000;
-				continue ;
-			}
-		}
-		else if( val >= 0xDC00 && val <= 0xDFFF )
-		{
-			if( !saved_bits ) {
-				cp = '?';
-			}
-			else {
-				saved_bits |= (val - 0xDC00);
-				cp = saved_bits;
-			}
-		}
-		else
-			cp = val;
-
-		cp_len = WriteUTF8((Uint8*)Dest, cp);
-		if(Dest)
-			Dest += cp_len;
-		str_len += cp_len;
-
-		saved_bits = 0;
-	}
-	
-	return str_len;
-}
-