X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=usb%2Fcore%2Fusb.c;h=6a7562e60a90afdbe84b46ffc3331e59dfed2586;hb=e8dd6b27d501339472cb5c8e0c94f3d2484e7810;hp=0fd585bb82f28672cc0907ad7d750a742c6465ff;hpb=a204ad45104f591103933dd145d2601c3880ca3f;p=ppcskel.git

diff --git a/usb/core/usb.c b/usb/core/usb.c
index 0fd585b..6a7562e 100644
--- a/usb/core/usb.c
+++ b/usb/core/usb.c
@@ -41,18 +41,20 @@
 #include "../../malloc.h"
 #include "../../string.h"
 
+#define cleargbuf() memset(gbuf, 0, 0xffff)
+/* internal global buffer */
+static u8 gbuf[0xffff];
 
 /******************* Device Operations **********************/
-
 /**
  * Open a device with verndor- and product-id for a communication.
  */
-usb_device *usb_open(u32 vendor_id, u32 product_id)
+struct usb_device *usb_open(u32 vendor_id, u32 product_id)
 {
-	usb_device* dev;
-	element * iterator = core.devices->head;
+	struct usb_device* dev;
+	struct element * iterator = core.devices->head;
 	while(iterator != NULL) {
-		dev = (usb_device*)iterator->data;
+		dev = (struct usb_device*)iterator->data;
 		
 		if(dev->idVendor==vendor_id&&dev->idProduct==product_id)
 			return dev;
@@ -67,12 +69,12 @@ 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)
+struct usb_device *usb_open_class(u8 class)
 {
-	usb_device* dev;
-	element * iterator = core.devices->head;
+	struct usb_device* dev;
+	struct element * iterator = core.devices->head;
 	while(iterator != NULL) {
-		dev = (usb_device*)iterator->data;
+		dev = (struct usb_device*)iterator->data;
 		
 		if(dev->bDeviceClass==class)
 			return dev;
@@ -84,51 +86,13 @@ usb_device *usb_open_class(u8 class)
 
 /* Close device after a communication.
  */
-s8 usb_close(usb_device *dev)
+s8 usb_close(struct usb_device *dev)
 {
 
 	return 0;
 }
 
-/* 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);
-	return 0;
-}
-
-s8 usb_get_dev_desc(usb_device *dev, u8 *buf, u8 size, u8 dev_desc_size)
-{
-	printf("WTF SIZE: 0x%X\n", size>= dev_desc_size ? dev_desc_size : size);
-	usb_get_descriptor(dev, DEVICE, 0, buf, size >= dev_desc_size ? dev_desc_size : 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;
-}
-
-s8 usb_reset(usb_device *dev)
+s8 usb_reset(struct usb_device *dev)
 {
 
 
@@ -141,10 +105,10 @@ s8 usb_reset(usb_device *dev)
 /**
  * Create a control transfer.
  */
-s8 usb_control_msg(usb_device *dev, u8 requesttype, u8 request,
+s8 usb_control_msg(struct usb_device *dev, u8 requesttype, u8 request,
 		u16 value, u16 index, u16 length, u8 *buf, u16 timeout)
 {
-	usb_irp *irp = (usb_irp*)malloc(sizeof(usb_irp));
+	struct usb_irp *irp = (struct usb_irp*)malloc(sizeof(struct usb_irp));
 	irp->dev = dev;
 	irp->endpoint = 0;
 	
@@ -170,36 +134,194 @@ s8 usb_control_msg(usb_device *dev, u8 requesttype, u8 request,
 	return 0;
 }
 
+s8 usb_get_descriptor(struct 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;
+}
+
+s8 usb_get_string(struct usb_device *dev, u8 index, u8 langid)
+{
+
+	return 0;
+}
+
+char *usb_get_string_simple(struct usb_device *dev, u8 index)
+{
+	cleargbuf();
+	usb_get_descriptor(dev, STRING, index, gbuf, (u8) 8);
+	usb_get_descriptor(dev, STRING, index, gbuf, gbuf[0]);
+
+	char *str = (char*)malloc((gbuf[0]/2));
+	memset(str, '\0', (gbuf[0]/2));
+
+	u16 i;
+	for(i=0; i<(gbuf[0]/2)-1; i++) {
+		str[i] = gbuf[2+(i*2)];
+	}
+
+	return str;
+}
 
-s8 usb_get_string(usb_device *dev, u8 index, u8 langid, u8 *buf, u8 buflen)
+/* ask first 8 bytes of device descriptor with this special 
+ * GET Descriptor Request, when device address = 0
+ */
+s8 usb_get_desc_dev_simple(struct usb_device *dev)
 {
+	cleargbuf();
+	usb_get_descriptor(dev, DEVICE, 0, gbuf, 8);
 
+	if(!gbuf[7]) {
+		printf("FU: %d\n", gbuf[7]);
+		return -2;
+	}
+	dev->bMaxPacketSize0 = gbuf[7];
 	return 0;
 }
 
+s8 usb_get_desc_dev(struct usb_device *dev)
+{
+	cleargbuf();
+	if (usb_get_desc_dev_simple(dev) < 0) {
+		return -1;
+	}
+	usb_get_descriptor(dev, DEVICE, 0, gbuf, gbuf[0]);
+
+	dev->bLength = gbuf[0];
+	dev->bDescriptorType = gbuf[1];
+	dev->bcdUSB = (u16) (gbuf[3] << 8 | gbuf[2]);
+	dev->bDeviceClass = gbuf[4];
+	dev->bDeviceSubClass = gbuf[5];
+	dev->bDeviceProtocoll = gbuf[6];
+	dev->idVendor = (u16) (gbuf[9] << 8) | (gbuf[8]);
+	dev->idProduct = (u16) (gbuf[11] << 8) | (gbuf[10]);
+	dev->bcdDevice = (u16) (gbuf[13] << 8) | (gbuf[12]);
+	dev->iManufacturer = gbuf[14];
+	dev->iProduct = gbuf[15];
+	dev->iSerialNumber = gbuf[16];
+	dev->bNumConfigurations = gbuf[17];
+
+	u8 i;
+	struct usb_conf *conf = dev->conf = (struct usb_conf*) malloc(sizeof(struct usb_conf));
+	for(i=0; i <= dev->bNumConfigurations; i++) {
+		if(i!=0) {
+			conf = (struct usb_conf*) malloc(sizeof(struct usb_conf));
+		}
+		usb_get_desc_config_ext(dev, i, conf);
+	}
 
-s8 usb_get_string_simple(usb_device *dev, u8 index, u8 *buf, u8 size)
+	return 0;
+}
+
+s8 usb_get_desc_configuration(struct usb_device *dev, u8 index, struct usb_conf *conf)
 {
-	usb_get_descriptor(dev, STRING, index, buf, (u8) 8);
-	usb_get_descriptor(dev, STRING, index, buf, size >= buf[0] ? (u8) buf[0] : size);
+	cleargbuf();
+	usb_get_descriptor(dev, CONFIGURATION, index, gbuf, 8);
+	usb_get_descriptor(dev, CONFIGURATION, index, gbuf, gbuf[0]);
+
+	conf->bLength = gbuf[0];
+	conf->bDescriptorType = gbuf[1];
+	conf->wTotalLength = (u16) (gbuf[3] << 8 | gbuf[2]);
+	conf->bNumInterfaces = gbuf[4];
+	conf->bConfigurationValue = gbuf[5];
+	conf->iConfiguration = gbuf[6];
+	conf->bmAttributes = gbuf[7];
+	conf->bMaxPower = gbuf[8];
+	conf->intf = NULL;
+
 	return 0;
 }
 
-s8 usb_get_descriptor(usb_device *dev, u8 type, u8 index, u8 *buf, u8 size)
+/* returns more information about CONFIGURATION, including
+ * INTERFACE(s) and ENDPOINT(s)
+ * usb_get_desc_configuration() must be called for this device before
+ */
+s8 usb_get_desc_config_ext(struct usb_device *dev, u8 index, struct usb_conf *conf)
 {
-	usb_control_msg(dev, 0x80, GET_DESCRIPTOR, (type << 8) | index, 0, size, buf, 0);
+	cleargbuf();
+
+	usb_get_desc_configuration(dev, index, conf);
+	usb_get_descriptor(dev, CONFIGURATION, index, gbuf, dev->conf->wTotalLength);
+
+	u8 i,j,off=9;
+	struct usb_intf *ifs = dev->conf->intf = (struct usb_intf*) malloc(sizeof(struct usb_intf));
+	for(i=1; i <= dev->conf->bNumInterfaces; i++) {
+		if(i!=1) {
+			ifs->next = (struct usb_intf*) malloc(sizeof(struct usb_intf));
+			ifs = ifs->next;
+		}
+		ifs->bLength = gbuf[off+0];
+		ifs->bDescriptorType = gbuf[off+1];
+		ifs->bInterfaceNumber = gbuf[off+2];
+		ifs->bAlternateSetting = gbuf[off+3];
+		ifs->bNumEndpoints = gbuf[off+4];
+		ifs->bInterfaceClass = gbuf[off+5];
+		ifs->bInterfaceSubClass = gbuf[off+6];
+		ifs->bInterfaceProtocol = gbuf[off+7];
+		ifs->iInterface = gbuf[off+8];
+
+		off += 9;
+
+		struct usb_endp *ep = ifs->endp = (struct usb_endp*) malloc(sizeof(struct usb_endp));
+		for(j=1; j <= ifs->bNumEndpoints; j++) {
+			/* skip HID Device Descriptor (see lsusb) */
+			if(gbuf[off+1] == 33) {
+				j--;
+				off += 9;
+				continue;
+			}
+
+			if(j!=1) {
+				ep->next = (struct usb_endp*) malloc(sizeof(struct usb_endp));
+				ep = ep->next;
+			}
+
+			ep->bLength = gbuf[off+0];
+			ep->bDescriptorType = gbuf[off+1];
+			ep->bEndpointAddress = gbuf[off+2];
+			ep->bmAttributes = gbuf[off+3];
+			ep->wMaxPacketSize = (u16) ((gbuf[off+5] << 8) | (gbuf[off+4]));
+			ep->bInterval = gbuf[off+6];
+
+			off += 7;
+		}
+	}
+
+	printf("=============\nafter usb_get_desc_config_ext:\n");
+	hexdump((void*) gbuf, dev->conf->wTotalLength);
+	return 0;
+}
+
+s8 usb_set_address(struct usb_device *dev, u8 address)
+{
+	cleargbuf();
+	usb_control_msg(dev, 0x00, SET_ADDRESS, address, 0, 0, gbuf, 0);
+	return 0;
+}
+
+s8 usb_set_configuration(struct usb_device *dev, u8 configuration)
+{
+	cleargbuf();
+	usb_control_msg(dev, 0x00, SET_CONFIGURATION, configuration, 0, 0, gbuf, 0);
 	return 0;
 }
 
+s8 usb_set_altinterface(struct usb_device *dev, u8 alternate)
+{
+
+	return 0;
+}
+
+
 
 /******************* Bulk Transfer **********************/
 
 /**
  * Write to an a bulk endpoint.
  */
-s8 usb_bulk_write(usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout)
+s8 usb_bulk_write(struct usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout)
 {
-	usb_irp * irp = (usb_irp*)malloc(sizeof(usb_irp));
+	struct usb_irp * irp = (struct usb_irp*)malloc(sizeof(struct usb_irp));
 	irp->dev = dev;
 	//irp->devaddress = dev->address;
 	
@@ -220,9 +342,9 @@ s8 usb_bulk_write(usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout)
 /**
  * Read from an bulk endpoint.
  */
-s8 usb_bulk_read(usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout)
+s8 usb_bulk_read(struct usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout)
 {
-	usb_irp * irp = (usb_irp*)malloc(sizeof(usb_irp));
+	struct usb_irp * irp = (struct usb_irp*)malloc(sizeof(struct usb_irp));
 	//irp->devaddress = dev->address;
 	irp->dev = dev;
 	
@@ -245,7 +367,7 @@ s8 usb_bulk_read(usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout)
 /**
  * Write to an interrupt endpoint.
  */
-s8 usb_interrupt_write(usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout)
+s8 usb_interrupt_write(struct usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout)
 {
 
 	return 0;
@@ -254,7 +376,7 @@ s8 usb_interrupt_write(usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout)
 /**
  * Read from an interrupt endpoint.
  */
-s8 usb_interrupt_read(usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout)
+s8 usb_interrupt_read(struct usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout)
 {
 
 	return 0;
@@ -266,7 +388,7 @@ s8 usb_interrupt_read(usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout)
 /**
  * Write to an isochron endpoint.
  */
-s8 usb_isochron_write(usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout)
+s8 usb_isochron_write(struct usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout)
 {
 
 	return 0;
@@ -275,7 +397,7 @@ s8 usb_isochron_write(usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout)
 /**
  * Read from an isochron endpoint.
  */
-s8 usb_isochron_read(usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout)
+s8 usb_isochron_read(struct usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout)
 {