X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=usb%2Fcore%2Fusb.c;h=7a495c03caf3baf6e88b332d0c6833b954396b9a;hb=b89d4dcf5ed30bc7aca7cf7dd30b098592afd2f1;hp=0d8edca3cf4787735e91455a62242aa9c0d48ab5;hpb=4bdf4447cdcbb235dc4d22a9c7ec2b481df1156b;p=ppcskel.git

diff --git a/usb/core/usb.c b/usb/core/usb.c
index 0d8edca..7a495c0 100644
--- a/usb/core/usb.c
+++ b/usb/core/usb.c
@@ -34,17 +34,12 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-//wtf??!
-//#ifndef _USB_H_
-//#define _USB_H_
-
-//#include <stdlib.h>
-
 #include "usb.h"
 #include "core.h"
 #include "../host/host.h"
 #include "../usbspec/usb11spec.h"
 #include "../../malloc.h"
+#include "../../string.h"
 
 
 /******************* Device Operations **********************/
@@ -52,7 +47,7 @@
 /**
  * Open a device with verndor- and product-id for a communication.
  */
-usb_device * usb_open(u32 vendor_id, u32 product_id)
+usb_device *usb_open(u32 vendor_id, u32 product_id)
 {
 	usb_device* dev;
 	element * iterator = core.devices->head;
@@ -72,7 +67,7 @@ usb_device * usb_open(u32 vendor_id, u32 product_id)
 /**
  * Open a device with an class code for a communication.
  */
-usb_device * usb_open_class(u8 class)
+usb_device *usb_open_class(u8 class)
 {
 	usb_device* dev;
 	element * iterator = core.devices->head;
@@ -87,40 +82,15 @@ usb_device * usb_open_class(u8 class)
 	return NULL;
 }
 
-/**
- * Close device after a communication.
+/* Close device after a communication.
  */
-u8 usb_close(usb_device *dev)
-{
-
-	return 0;
-}
-
-u8 usb_get_device_descriptor(usb_device *dev, char *buf,u8 size)
-{
-
-	return 0;
-}
-
-u8 usb_set_address(usb_device *dev, u8 address)
-{
-
-	return 0;
-}
-
-u8 usb_set_configuration(usb_device *dev, u8 configuration)
-{
-
-	return 0;
-}
-
-u8 usb_set_altinterface(usb_device *dev, u8 alternate)
+s8 usb_close(usb_device *dev)
 {
 
 	return 0;
 }
 
-u8 usb_reset(usb_device *dev)
+s8 usb_reset(usb_device *dev)
 {
 
 
@@ -133,9 +103,9 @@ u8 usb_reset(usb_device *dev)
 /**
  * Create a control transfer.
  */
-u8 usb_control_msg(usb_device *dev, u8 requesttype, u8 request, u16 value, u16 index, u16 length,char *buf, u16 size, u16 timeout)
+s8 usb_control_msg(usb_device *dev, u8 requesttype, u8 request,
+		u16 value, u16 index, u16 length, u8 *buf, u16 timeout)
 {
-	//usb_control_msg(dev, 0x80, GET_DESCRIPTOR, 1, 0, 8, buf, 8, 0);
 	usb_irp *irp = (usb_irp*)malloc(sizeof(usb_irp));
 	irp->dev = dev;
 	irp->endpoint = 0;
@@ -143,29 +113,14 @@ u8 usb_control_msg(usb_device *dev, u8 requesttype, u8 request, u16 value, u16 i
 	irp->epsize = dev->bMaxPacketSize0;
 	irp->type = USB_CTRL;
 
-#if 0
-	buf[0]=(char)requesttype;
-	buf[1]=(char)request;		 
-	buf[2]=(char)(value >> 8);
-	buf[3]=(char)(value);		
-	buf[4]=(char)(index >> 8);
-	buf[5]=(char)(index);	
-	// lenght buf are the only where the order is inverted
-	buf[6]=(char)(length);
-	buf[7]=(char)(length >> 8);
-#endif
-#if 1
-	//should be the right way around? :O
-	buf[0]=(char)requesttype;
-	buf[1]=(char)request;
-	buf[2]=(char)(value);
-	buf[3]=(char)(value >> 8);
-	buf[4]=(char)(index);
-	buf[5]=(char)(index >> 8);
-	// lenght buf are the only where the order is inverted
-	buf[6]=(char)(length >> 8);
-	buf[7]=(char)(length);
-#endif
+	buf[0]=(u8)requesttype;
+	buf[1]=(u8)request;
+	buf[2]=(u8)(value);
+	buf[3]=(u8)(value >> 8);
+	buf[4]=(u8)(index);
+	buf[5]=(u8)(index >> 8);
+	buf[6]=(u8)(length);
+	buf[7]=(u8)(length >> 8);
 
 	irp->buffer = buf;
 	irp->len = length;
@@ -178,32 +133,120 @@ u8 usb_control_msg(usb_device *dev, u8 requesttype, u8 request, u16 value, u16 i
 }
 
 
-u8 usb_get_string(usb_device *dev, u8 index, u8 langid, char *buf, u8 buflen)
+s8 usb_get_string(usb_device *dev, u8 index, u8 langid, u8 *buf, u8 buflen)
 {
 
 	return 0;
 }
 
 
-u8 usb_get_string_simple(usb_device *dev, u8 index, char *buf, u8 buflen)
+char *usb_get_string_simple(usb_device *dev, u8 index, u8 *buf, u8 size)
 {
+	if(size < 8) {
+		return (char*) -1;
+	}
+	usb_get_descriptor(dev, STRING, index, buf, (u8) 8);
+	size = size >= (buf[0]) ? (buf[0]) : size;
+	usb_get_descriptor(dev, STRING, index, buf, size);
+
+	char *str = (char*)malloc((size/2));
+	memset(str, '\0', (size/2));
+
+	u16 i;
+	for(i=0; i<(size/2)-1; i++) {
+		str[i] = buf[2+(i*2)];
+		printf("%c", str[i]);
+	}
+	printf("\n");
 
+	return str;
+}
+
+s8 usb_get_descriptor(usb_device *dev, u8 type, u8 index, u8 *buf, u8 size)
+{
+	usb_control_msg(dev, 0x80, GET_DESCRIPTOR, (type << 8) | index, 0, size, buf, 0);
 	return 0;
 }
 
-u8 usb_get_descriptor(usb_device *dev, unsigned char type, unsigned char index, void *buf, u8 size)
+/* ask first 8 bytes of device descriptor with this special 
+ * GET Descriptor Request, when device address = 0
+ */
+s8 usb_get_dev_desc_simple(usb_device *dev, u8 *buf, u8 size)
 {
+	if(size < 8) {
+		return -1;
+	}
+	usb_get_descriptor(dev, DEVICE, 0, buf, 8);
 
+	if(!buf[7]) {
+		printf("FU: %d\n", buf[7]);
+		return -2;
+	}
+	dev->bMaxPacketSize0 = buf[7];
 	return 0;
 }
 
+s8 usb_get_dev_desc(usb_device *dev, u8 *buf, u8 size)
+{
+	if (size < 0x12 || usb_get_dev_desc_simple(dev, buf, size) < 0) {
+		return -1;
+	}
+	usb_get_descriptor(dev, DEVICE, 0, buf, size >= buf[0] ? buf[0] : size);
+
+	dev->bLength = buf[0];
+	dev->bDescriptorType = buf[1];
+	dev->bcdUSB = (u16) (buf[3] << 8 | buf[2]);
+	dev->bDeviceClass = buf[4];
+	dev->bDeviceSubClass = buf[5];
+	dev->bDeviceProtocoll = buf[6];
+	dev->idVendor = (u16) (buf[9] << 8) | (buf[8]);
+	dev->idProduct = (u16) (buf[11] << 8) | (buf[10]);
+	dev->bcdDevice = (u16) (buf[13] << 8) | (buf[12]);
+	dev->iManufacturer = buf[14];
+	dev->iProduct = buf[15];
+	dev->iSerialNumber = buf[16];
+	dev->bNumConfigurations = buf[17];
+
+	return 0;
+}
+
+s8 usb_get_configuration(usb_device *dev, u8 index, u8 *buf, u8 size)
+{
+	if(size < 8) {
+		return -1;
+	}
+	usb_get_descriptor(dev, CONFIGURATION, index, buf, 8);
+	usb_get_descriptor(dev, CONFIGURATION, index, buf, size >= buf[0] ? buf[0] : size);
+	return 0;
+}
+
+s8 usb_set_address(usb_device *dev, u8 address)
+{
+	u8 buf[64];
+	usb_control_msg(dev, 0x00, SET_ADDRESS, address, 0, 0, buf, 0);
+	return 0;
+}
+
+s8 usb_set_configuration(usb_device *dev, u8 configuration)
+{
+
+	return 0;
+}
+
+s8 usb_set_altinterface(usb_device *dev, u8 alternate)
+{
+
+	return 0;
+}
+
+
 
 /******************* Bulk Transfer **********************/
 
 /**
  * Write to an a bulk endpoint.
  */
-u8 usb_bulk_write(usb_device *dev, u8 ep, char *buf, u8 size, u8 timeout)
+s8 usb_bulk_write(usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout)
 {
 	usb_irp * irp = (usb_irp*)malloc(sizeof(usb_irp));
 	irp->dev = dev;
@@ -226,7 +269,7 @@ u8 usb_bulk_write(usb_device *dev, u8 ep, char *buf, u8 size, u8 timeout)
 /**
  * Read from an bulk endpoint.
  */
-u8 usb_bulk_read(usb_device *dev, u8 ep, char *buf, u8 size, u8 timeout)
+s8 usb_bulk_read(usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout)
 {
 	usb_irp * irp = (usb_irp*)malloc(sizeof(usb_irp));
 	//irp->devaddress = dev->address;
@@ -251,7 +294,7 @@ u8 usb_bulk_read(usb_device *dev, u8 ep, char *buf, u8 size, u8 timeout)
 /**
  * Write to an interrupt endpoint.
  */
-u8 usb_interrupt_write(usb_device *dev, u8 ep, char *buf, u8 size, u8 timeout)
+s8 usb_interrupt_write(usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout)
 {
 
 	return 0;
@@ -260,7 +303,7 @@ u8 usb_interrupt_write(usb_device *dev, u8 ep, char *buf, u8 size, u8 timeout)
 /**
  * Read from an interrupt endpoint.
  */
-u8 usb_interrupt_read(usb_device *dev, u8 ep, char *buf, u8 size, u8 timeout)
+s8 usb_interrupt_read(usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout)
 {
 
 	return 0;
@@ -272,7 +315,7 @@ u8 usb_interrupt_read(usb_device *dev, u8 ep, char *buf, u8 size, u8 timeout)
 /**
  * Write to an isochron endpoint.
  */
-u8 usb_isochron_write(usb_device *dev, u8 ep, char *buf, u8 size, u8 timeout)
+s8 usb_isochron_write(usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout)
 {
 
 	return 0;
@@ -281,7 +324,7 @@ u8 usb_isochron_write(usb_device *dev, u8 ep, char *buf, u8 size, u8 timeout)
 /**
  * Read from an isochron endpoint.
  */
-u8 usb_isochron_read(usb_device *dev, u8 ep, char *buf, u8 size, u8 timeout)
+s8 usb_isochron_read(usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout)
 {