X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=usb%2Fcore%2Fcore.c;h=5583c751629ab5b3b49f88a1064c219b33c88b24;hb=6dfbb32b3c0be5f9a47fb094f378d76f53b0b4b2;hp=789e36e96b2f443bd7c89e7b90af4ec8ebc82b58;hpb=0247dd5b7560b28fd290296b1ceb68a7b2d390ab;p=ppcskel.git diff --git a/usb/core/core.c b/usb/core/core.c index 789e36e..5583c75 100644 --- a/usb/core/core.c +++ b/usb/core/core.c @@ -71,10 +71,10 @@ u8 usb_next_address() void usb_periodic() { // call ever registered driver - usb_driver *drv; - element *iterator = core.drivers->head; + struct usb_driver *drv; + struct element *iterator = core.drivers->head; while (iterator != NULL) { - drv = (usb_driver *) iterator->data; + drv = (struct usb_driver *) iterator->data; drv->check(); iterator = iterator->next; } @@ -86,11 +86,13 @@ void usb_periodic() * for the core. usb_add_device expected that * the device answers to address zero. */ -usb_device *usb_add_device() +struct usb_device *usb_add_device() { - usb_device *dev = (usb_device *) malloc(sizeof(usb_device)); + struct usb_device *dev = (struct usb_device *) malloc(sizeof(struct usb_device)); + dev->conf = (struct usb_conf *) malloc(sizeof(struct usb_conf)); dev->address = 0; - dev->bMaxPacketSize0 = 8; /* send at first time only 8 bytes */ + /* send at first time only 8 bytes */ + dev->bMaxPacketSize0 = 8; dev->epSize[0] = 64; dev->epSize[1] = 64; @@ -100,72 +102,179 @@ usb_device *usb_add_device() dev->epTogl[1] = 0; dev->epTogl[2] = 0; - char buf[64]; +#define LEN 128 + u8 buf[LEN]; memset(buf, 0, sizeof(buf)); - /* ask first 8 bytes of device descriptor with this special - * GET Descriptor Request, when device address = 0 - */ + s8 ret; + memset(buf, 0, sizeof(buf)); + ret = usb_get_desc_dev_simple(dev, buf, sizeof(buf)); +#ifdef _DU_CORE_ADD + printf("=============\nbuf: 0x%08X\nafter usb_get_dev_desc_simple(ret: %d):\n", buf, ret); + hexdump(buf, sizeof(buf)); +#endif + if(ret < 0) { + return (void*) -1; + } + + /* set MaxPacketSize */ + + u8 address = usb_next_address(); + ret = usb_set_address(dev, address); + dev->address = address; +#ifdef _DU_CORE_ADD + printf("set address to %d\n", dev->address); +#endif + + memset(buf, 0, sizeof(buf)); + ret = usb_get_desc_dev(dev, buf, sizeof(buf)); +#ifdef _DU_CORE_ADD + printf("=============\nbuf: 0x%08X\nafter usb_get_dev_desc(ret: %d):\n", buf, ret); + hexdump(buf, sizeof(buf)); +#endif + + char *man, *prod, *serial; + if(dev->iManufacturer) { + memset(buf, 0, sizeof(buf)); + man = usb_get_string_simple(dev, dev->iManufacturer, buf, sizeof(buf)); + } else { + man = (char*) malloc(11); + memset(man, '\0', sizeof(man)); + strlcpy(man, "no String", 10); + } + if(dev->iProduct) { + memset(buf, 0, sizeof(buf)); + prod = usb_get_string_simple(dev, dev->iProduct, buf, sizeof(buf)); + } else { + prod = (char*) malloc(11); + memset(prod, '\0', sizeof(prod)); + strlcpy(prod, "no String", 10); + } + if(dev->iSerialNumber) { + memset(buf, 0, sizeof(buf)); + serial = usb_get_string_simple(dev, dev->iSerialNumber, buf, sizeof(buf)); + } else { + serial = (char*) malloc(11); + memset(serial, '\0', sizeof(serial)); + strlcpy(serial, "no String", 10); + } + + + printf( "bLength 0x%02X\n" + "bDescriptorType 0x%02X\n" + "bcdUSB 0x%02X\n" + "bDeviceClass 0x%02X\n" + "bDeviceSubClass 0x%02X\n" + "bDeviceProtocoll 0x%02X\n" + "idVendor 0x%04X\n" + "idProduct 0x%04X\n" + "bcdDevice 0x%04X\n" + "iManufacturer(0x%02X): \"%s\"\n" + "iProduct(0x%02X): \"%s\"\n" + "iSerialNumber(0x%02X): \"%s\"\n" + "bNumConfigurations 0x%02X\n", dev->bLength, dev->bDeviceClass, + dev->bcdUSB, dev->bDescriptorType, dev->bDeviceSubClass, + dev->bDeviceProtocoll, dev->idVendor, dev->idProduct, dev->bcdDevice, + dev->iManufacturer, man, + dev->iProduct, prod, + dev->iSerialNumber, serial, + dev->bNumConfigurations); + + memset(buf, 0, sizeof(buf)); + /* in the most cases usb devices have just one configuration descriptor */ + ret = usb_get_desc_configuration(dev, 0, buf, sizeof(buf)); + printf("=============\nbuf: 0x%08X\nafter usb_get_desc_configuration(ret: %d):\n", buf, ret); + hexdump(buf, sizeof(buf)); + + printf("interfaces: %d\n", dev->conf->bNumInterfaces); + u8 i; + for(i = 1; i <= dev->conf->bNumInterfaces; i++) { + memset(buf, 0, sizeof(buf)); + ret = usb_get_desc_interface(dev, i, buf, sizeof(buf)); + printf("=============\nbuf: 0x%08X\nafter usb_get_desc_interface_%d(ret: %d):\n", buf, i, ret); + hexdump(buf, sizeof(buf)); + } + + /* - * see page 253 in usb_20.pdf - * - * bmRequestType = 0x80 = 10000000B - * bRequest = GET_DESCRIPTOR - * wValue = DEVICE (Descriptor Type) - * wIndex = 0 - * wLength = 8 (in Bytes!?) - */ - usb_control_msg(dev, 0x80, GET_DESCRIPTOR, DEVICE << 8, 0, 8, buf, 8, 0); - //usb_control_msg(dev, 0x80, GET_DESCRIPTOR, DEVICE, 0, 64, buf, 8, 0); + usb_get_descriptor(dev, DEVICE, 0, buf, 8); + memset(buf, 0, 8); + usb_get_descriptor(dev, DEVICE, 0, buf, size >= buf[0] ? buf[0] : size); + */ +#if 0 + memset(buf, 0, sizeof(buf)); + usb_control_msg(dev, 0x80, GET_DESCRIPTOR, (DEVICE << 8) | 0, 0, 8, buf, 0); + printf("=============\nbuf: 0x%08X\nafter usb control msg:\n", buf); + hexdump(buf, sizeof(buf)); - printf("===========\nafter usb control msg:\n"); + memset(buf, 0, sizeof(buf)); + usb_control_msg(dev, 0x80, GET_DESCRIPTOR, (DEVICE << 8) | 0, 0, buf[0], buf, 0); + printf("=============\nbuf: 0x%08X\nafter usb control msg:\n", buf); hexdump(buf, sizeof(buf)); + memset(buf, 0, sizeof(buf)); + usb_get_string_simple(dev, 1, buf); + printf("=============\nbuf: 0x%08X\nafter usb control msg:\n", buf); + hexdump(buf, sizeof(buf)); +#endif + #if 0 u8 devdescr_size; - u8 address = usb_next_address(); - dev->bMaxPacketSize0 = (u8) buf[7] ? (u8) buf[7] : 1; //dirty? /* setup real ep0 fifo size */ - devdescr_size = (u8) buf[0]; /* save real length of device descriptor */ + + /* setup real ep0 fifo size */ + dev->bMaxPacketSize0 = (u8) buf[7]; + if(!(u8)buf[7]) { + printf("FU\n"); + return (void*)1; + } + + /* save real length of device descriptor */ + devdescr_size = (u8) buf[0]; /* define new adress */ - usb_control_msg(dev, 0x00, SET_ADDRESS, address << 8, 0, 0, buf, 8, 0); + memset(buf, 0, sizeof(buf)); + usb_control_msg(dev, 0x00, SET_ADDRESS, address, 0, 0, buf, 8, 0); dev->address = address; + printf("=============\nbuf: 0x%08X\nafter usb control msg:\n", buf); + hexdump(buf, sizeof(buf)); + printf("address: %d\n", address); + /* get complete device descriptor */ - usb_control_msg(dev, 0x80, GET_DESCRIPTOR, 1, 0, devdescr_size, buf, 8, - 0); + memset(buf, 0, sizeof(buf)); + usb_control_msg(dev, 0x80, GET_DESCRIPTOR, DEVICE<<8, 0, devdescr_size, buf, 8, 0); + + printf("=============\nbuf: 0x%08X\nafter usb control msg:\n", buf); + hexdump(buf, sizeof(buf)); /* save only really neccessary values for this small usbstack */ - dev->bDeviceClass = (u8) buf[4]; - dev->bDeviceSubClass = (u8) buf[5]; - dev->bDeviceProtocoll = (u8) 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]); - - printf( "bDeviceClass 0x%02X\n" - "bDeviceSubClass 0x%02X\n" - "bDeviceProtocoll 0x%02X\n" - "idVendor 0x%04X\n" - "idProduct 0x%04X\n" - "bcdDevice 0x%04X\n", dev->bDeviceClass, - dev->bDeviceSubClass, dev->bDeviceProtocoll, - dev->idVendor, dev->idProduct, dev->bcdDevice); - /* for lewurms keyboard it should be: - * bDeviceClass 0 - * bDeviceSubClass 0 - * bDeviceClass 0 - * idVendor 0x049f - * idProduct 0x000e - * bcdDevice 1.00 - */ +#endif +#if 0 + memset(buf, 0, sizeof(buf)); + usb_control_msg(dev, 0x80, GET_DESCRIPTOR, (STRING<<8)|2, 0, 0x1a, buf, 8, 0); + hexdump(buf, sizeof(buf)); + printf("String Descriptor [1]: "); + u8 i; + for (i=2; i on demand mit // entprechenden funktionen // hier muss man noch mehr abholen, konfigurationene, interfaces und endpunkte +#if 0 /* add device to device list */ element *tmp = (element *) malloc(sizeof(element)); tmp->data = (void *) dev; @@ -181,7 +290,7 @@ usb_device *usb_add_device() * Find currently detached device and remove * data structures */ -u8 usb_remove_device(usb_device * dev) +u8 usb_remove_device(struct usb_device * dev) { // FIXME!!!! dieser quatsch ist nur temporaer free(core.devices->head); @@ -193,10 +302,10 @@ u8 usb_remove_device(usb_device * dev) /** * Register new driver at usb stack. */ -u8 usb_register_driver(usb_driver * dev) +u8 usb_register_driver(struct usb_driver * dev) { /* add driver to driver list */ - element *tmp = (element *) malloc(sizeof(element)); + struct element *tmp = (struct element *) malloc(sizeof(struct element)); tmp->data = (void *) dev; tmp->next = NULL; list_add_tail(core.drivers, tmp); @@ -220,10 +329,10 @@ u8 usb_register_driver(usb_driver * dev) void usb_probe_driver() { // call ever registered driver - usb_driver *drv; - element *iterator = core.drivers->head; + struct usb_driver *drv; + struct element *iterator = core.drivers->head; while (iterator != NULL) { - drv = (usb_driver *) iterator->data; + drv = (struct usb_driver *) iterator->data; drv->probe(); iterator = iterator->next; } @@ -232,7 +341,7 @@ void usb_probe_driver() /** * Not implemented. */ -usb_irp *usb_get_irp() +struct usb_irp *usb_get_irp() { return 0; } @@ -240,7 +349,7 @@ usb_irp *usb_get_irp() /** * Not implemented. */ -u8 usb_remove_irp(usb_irp * irp) +u8 usb_remove_irp(struct usb_irp *irp) { return 1; @@ -252,21 +361,18 @@ u8 usb_remove_irp(usb_irp * irp) * In the usbstack they are transported with the * usb_transfer_descriptor data structure. */ -u16 usb_submit_irp(usb_irp *irp) +u16 usb_submit_irp(struct usb_irp *irp) { - usb_transfer_descriptor *td; + struct usb_transfer_descriptor *td; u8 runloop = 1; u16 restlength = irp->len; - char *td_buf_ptr = irp->buffer; - char mybuf[64]; + u8 *td_buf_ptr = irp->buffer; + u8 mybuf[64]; - //u8 togl=irp->dev->epTogl[(irp->endpoint & 0x7F)]; u8 togl = irp->dev->epTogl[(irp->endpoint & 0x7F)]; - //u8 togl=0; switch (irp->type) { case USB_CTRL: - /* alle requests mit dem gleichen algorithmus zerteilen * das einzige ist der spezielle get_Device_descriptor request * bei dem eine laenge von 64 angegeben ist. @@ -274,118 +380,110 @@ u16 usb_submit_irp(usb_irp *irp) * dann reichen die ersten 8 byte. */ - /***************** Setup Stage ***********************/ + /***************** Setup Stage ***********************/ td = usb_create_transfer_descriptor(irp); td->pid = USB_PID_SETUP; td->buffer = irp->buffer; /* control message are always 8 bytes */ td->actlen = 8; - memcpy(mybuf, td->buffer, td->actlen); togl = 0; - td->togl = togl; /* start with data0 */ - if (togl == 0) - togl = 1; - else - togl = 0; - /**** send token ****/ + /* start with data0 */ + td->togl = togl; + togl = togl ? 0 : 1; + + /**** send token ****/ hcdi_enqueue(td); -#if 0 - break; - memcpy(td->buffer, mybuf, td->actlen); -#endif - /***************** Data Stage ***********************/ - /** - * You can see at bit 7 of bmRequestType if this stage is used, - * default requests are always 8 byte greate, from - * host to device. Stage 3 is only neccessary if the request - * expected datas from the device. - * bit7 - 1 = from device to host -> yes we need data stage - * bit7 - 0 = from host to device -> no send zero packet - * - * nach einem setup token kann nur ein IN token in stage 3 folgen - * nie aber ein OUT. Ein Zero OUT wird nur als Bestaetigung benoetigt. - * - * - * bit7 = 1 - * Device to Host - * - es kommen noch Daten mit PID_IN an - * - host beendet mit PID_OUT DATA1 Zero - * bit7 - 0 - * Host zu Device (wie set address) - * - device sendet ein PID_IN DATA1 Zero Packet als bestaetigung - */ - usb_device_request *setup = (usb_device_request *) irp->buffer; + /***************** Data Stage ***********************/ + /** + * You can see at bit 7 of bmRequestType if this stage is used, + * default requests are always 8 byte greate, from + * host to device. Stage 3 is only neccessary if the request + * expected datas from the device. + * bit7 - 1 = from device to host -> yes we need data stage + * bit7 - 0 = from host to device -> no send zero packet + * + * nach einem setup token kann nur ein IN token in stage 3 folgen + * nie aber ein OUT. Ein Zero OUT wird nur als Bestaetigung benoetigt. + * + * + * bit7 = 1 + * Device to Host + * - es kommen noch Daten mit PID_IN an + * - host beendet mit PID_OUT DATA1 Zero + * bit7 - 0 + * Host zu Device (wie set address) + * - device sendet ein PID_IN DATA1 Zero Packet als bestaetigung + */ + memcpy(mybuf, irp->buffer, td->actlen); + usb_device_request *setup = (usb_device_request *) mybuf; u8 bmRequestType = setup->bmRequestType; + free(td); - if (bmRequestType & 0x80) { /* check bit 7 of bmRequestType */ - + /* check bit 7 of bmRequestType */ + if (bmRequestType & 0x80) { /* schleife die die tds generiert */ - while (runloop) { + while (runloop && (restlength > 0)) { td = usb_create_transfer_descriptor(irp); td->actlen = irp->epsize; /* stop loop if all bytes are send */ - if (restlength <= irp->epsize) { + if (restlength < irp->epsize) { runloop = 0; td->actlen = restlength; } td->buffer = td_buf_ptr; /* move pointer for next packet */ - td_buf_ptr = td_buf_ptr + irp->epsize; + td_buf_ptr += irp->epsize; td->pid = USB_PID_IN; td->togl = togl; - if (togl == 0) - togl = 1; - else - togl = 0; + togl = togl ? 0 : 1; /* wenn device descriptor von adresse 0 angefragt wird werden nur * die ersten 8 byte abgefragt */ - if (setup->bRequest == GET_DESCRIPTOR && (setup->wValue >> 8) == 1 + if (setup->bRequest == GET_DESCRIPTOR && (setup->wValue & 0xff) == 1 && td->devaddress == 0) { - runloop = 0; /* stop loop */ + /* stop loop */ + runloop = 0; } - /**** send token ****/ - printf("togl: %d\n", togl); + /**** send token ****/ hcdi_enqueue(td); /* pruefe ob noch weitere Pakete vom Device abgeholt werden muessen */ restlength = restlength - irp->epsize; + free(td); } } - /***************** Status Stage ***********************/ + /***************** Status Stage ***********************/ /* Zero packet for end */ td = usb_create_transfer_descriptor(irp); td->togl = 1; /* zero data packet = always DATA1 packet */ td->actlen = 0; td->buffer = NULL; - /** - * bit7 = 1, host beendet mit PID_OUT DATA1 Zero - * bit7 = 0, device sendet ein PID_IN DATA1 Zero Packet als bestaetigung - */ - if (bmRequestType & 0x80) { /* check bit 7 of bmRequestType */ + /** + * bit7 = 1, host beendet mit PID_OUT DATA1 Zero + * bit7 = 0, device sendet ein PID_IN DATA1 Zero Packet als bestaetigung + */ + /* check bit 7 of bmRequestType */ + if (bmRequestType & 0x80) { td->pid = USB_PID_OUT; } else { td->pid = USB_PID_IN; } - /**** send token ****/ - printf("togl: %d\n", togl); + /**** send token ****/ hcdi_enqueue(td); free(td); - - break; - case USB_BULK: + case USB_BULK: core.stdout("bulk\r\n"); //u8 runloop=1; //u16 restlength = irp->len; @@ -423,7 +521,6 @@ u16 usb_submit_irp(usb_irp *irp) else togl = 0; /**** send token ****/ - printf("togl: %d\n", togl); hcdi_enqueue(td); free(td); } @@ -435,6 +532,7 @@ u16 usb_submit_irp(usb_irp *irp) break; } + hcdi_fire(); return 1; } @@ -444,10 +542,10 @@ u16 usb_submit_irp(usb_irp *irp) /** * Create a transfer descriptor with an parent irp. */ -usb_transfer_descriptor *usb_create_transfer_descriptor(usb_irp * irp) +struct usb_transfer_descriptor *usb_create_transfer_descriptor(struct usb_irp * irp) { - usb_transfer_descriptor *td = - (usb_transfer_descriptor *) malloc(sizeof(usb_transfer_descriptor)); + struct usb_transfer_descriptor *td = + (struct usb_transfer_descriptor *) malloc(sizeof(struct usb_transfer_descriptor)); td->devaddress = irp->dev->address; td->endpoint = irp->endpoint;