/**
* Initialize USB stack.
*/
-void usb_init()
+void usb_init(u32 reg)
{
core.drivers = list_create();
core.devices = list_create();
core.nextaddress = 1;
- hcdi_init();
+ hcdi_init(reg);
}
/**
* for the core. usb_add_device expected that
* the device answers to address zero.
*/
-struct usb_device *usb_add_device()
+struct usb_device *usb_add_device(u8 lowspeed, u32 reg)
{
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;
- /* send at first time only 8 bytes */
- dev->bMaxPacketSize0 = 8;
+ dev->fullspeed = lowspeed ? 0 : 1;
+ /* send at first time only 8 bytes for lowspeed devices
+ * 64 bytes for fullspeed
+ */
+ dev->bMaxPacketSize0 = lowspeed ? 8 : 64;
+ dev->ohci = reg;
dev->epSize[0] = 64;
dev->epSize[1] = 64;
return (void*) -1;
}
- /* set MaxPacketSize */
-
+//#define WTF
+#ifdef WTF
+ printf("lololololool PADDING WTF :O lolololololo \n");
+ printf("lololololool PADDING WTF :O lolololololo \n");
+ printf("lololololool PADDING WTF :O lolololololo \n");
+ printf("lololololool PADDING WTF :O lolololololo \n");
+ printf("lololololool PADDING WTF :O lolololololo \n");
+ printf("lololololool PADING WTF :O lolololololo \n");
+ printf("loolololool PADDING WTF :O lolololololo \n");
+ printf("lololololool PADDING WTF :O lolololololo \n");
+ printf("lololololool PADDNG WTF :O lolololololo \n");
+ printf("lololololool PADDING WTF :O lolololololo \n");
+ printf("lololololool PADDINGWTF :O lolololololo \n");
+ printf("lololololool PADDING WTF :O lolololololo \n");
+ printf("lololololool PADDING WTF :Ololololololo \n");
+ printf("lololololool PADDING WTF :O lolololololo \n");
+ printf("lololololool PADDING WTF :O llololololo \n");
+ printf("lololololool PADDING WTF :O loololololo \n");
+ printf("lololololool PADDING WTF :O lolololololo \n");
+ printf("lololololool PADDING WTF :O loloooloo \n");
+ printf("lololololool PADDING WTF :O lolololololo \n");
+ printf("lololololool PADDING WTF :O lolololololo \n");
+ printf("lololololool PADDING WTF :O lolololoolo \n");
+ printf("lololololool PADDING WTF :O lololooolo \n");
+ printf("lololololool PADDING WTF :O loloolololo \n");
+ printf("lololol PADDING WTF :O lolololololo \n");
+ printf("lololololool PADDING WTF :O lolololololo \n");
+ printf("lolololool PADDING WTF :O lololoololo \n");
+ printf("lololololool PADDING WTF :O lolololololo \n");
+ printf("lolololool PADDING WTF :O lolololololo \n");
+ printf("lololololool PADDING WTF :O lolololololo \n");
+ printf("lollllool PADDING WTF :O lolololololo \n");
+ printf("lololololool PADDING WTF :O lolololololo \n");
+ printf("lololololool PADDING WTF :O lolololololo \n");
+ printf("lololololool PADDING WTF :O lolololololo \n");
+ printf("lololololool PADDING WTF :O lolololololo \n");
+ printf("lololololool PADDING WTF :O lolololololo \n");
+ printf("lololololool PADDING WTF :O lolololololo \n");
+ printf("lololololool PADDING WTF :O loloolololo \n");
+ printf("lololololool PADDING WTF lololololo \n");
+ printf("lololololool PADDING WTF :O lolololololo \n");
+ printf("lololololool PADDING WTF :O lolololololo \n");
+#endif
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
+ /* get device descriptor&co */
ret = usb_get_desc_dev(dev);
+ if(ret < 0)
+ return (void*) -1;
- char *man, *prod, *serial;
- if(dev->iManufacturer) {
- man = usb_get_string_simple(dev, dev->iManufacturer);
- } else {
- man = (char*) malloc(11);
- memset(man, '\0', sizeof(man));
- strlcpy(man, "no String", 10);
- }
- if(dev->iProduct) {
- prod = usb_get_string_simple(dev, dev->iProduct);
- } else {
- prod = (char*) malloc(11);
- memset(prod, '\0', sizeof(prod));
- strlcpy(prod, "no String", 10);
- }
- if(dev->iSerialNumber) {
- serial = usb_get_string_simple(dev, dev->iSerialNumber);
- } 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);
-
- /* in the most cases usb devices have just one configuration descriptor */
- ret = usb_get_desc_config_ext(dev, 0);
+ /* print device info */
+ lsusb(dev);
- /* select configuration */
- ret = usb_set_configuration(dev, dev->conf->bConfigurationValue);
- printf("=============\nusb_set_configuration(ret: %d) %d\n", ret, dev->conf->bConfigurationValue);
-
- /*
- udelay(600000);
-
- printf("=============\ninterfaces: %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, 1, buf, sizeof(buf));
- printf("=============\nafter usb_get_desc_interface_%d(ret: %d):\n", i, ret);
- hexdump(buf, sizeof(buf));
- }
- */
+ //HID only!
+#define GET_PROTOCOL 0x03
+#define SET_PROTOCOL 0x0b
+#define GETit 0xa1
+#define SETit 0x21
+ u8 buf[255];
+#if 1
+ /* select configuration */
+ wait_ms(500);
+ ret = usb_set_configuration(dev, 1);
+ printf("=============\nusb_set_configuration(ret: %d): %d\n", ret, dev->conf->bConfigurationValue);
+ wait_ms(500);
+ printf("=============\nusb_get_configuration: %d (should be 1 here)\n", usb_get_configuration(dev));
+#endif
- /*
- 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));
-
- 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));
+ memset(buf, 0, 0xff);
+ usb_control_msg(dev, 0x81, GET_DESCRIPTOR, 0x2200, 0x0, 0x41, buf, 0);
+ printf("wtf request\n");
+ hexdump((void*)buf, 0x41);
#endif
#if 0
- u8 devdescr_size;
-
- /* 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 */
- 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 */
- 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 */
+ /* set protocol */
+ /* see p48 in HID spec */
+ memset(buf, 0, 8);
+ usb_control_msg(dev, SETit, SET_PROTOCOL, 0, 0, 0, buf, 0);
+ printf("=============\nhid_set_protocol %d\n", 0);
+ hexdump((void*)buf, 8);
#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<buf[0]; i+=2)
- printf("%c", buf[i]);
- printf("\n");
+ memset(buf, 0, 8);
+ usb_control_msg(dev, GETit, GET_PROTOCOL, 0, 0, 4, buf, 0);
+ printf("=============\nusb_get_interface: %d\n", buf[0]);
+ hexdump((void*)buf, 8);
#endif
- /*
- usb_control_msg(dev, 0x80, GET_DESCRIPTOR, (STRING<<8) | 2, 0, 0x20, buf, 8, 0);
- printf("String Descriptor [2]: ");
- for (i=2; i<buf[0]; i+=2)
- printf("%c", buf[i]);
- printf("\n");
- */
+#if 0
+ /* I just don't know why on some devices
+ * {s,g}et_{configuration,interface} won't work.
+ * may the setter works and getter are poorly implemented?
+ * however, I try here some interrupt inputs, assuming
+ * the setters are fine*/
- // string descriptoren werden nicht im arbeitsspeicher gehalten -> on demand mit
- // entprechenden funktionen
- // hier muss man noch mehr abholen, konfigurationene, interfaces und endpunkte
+ memset(buf, 0, 8);
+ s8 epnum = dev->conf->intf->endp->bEndpointAddress & 0xf;
+ printf("epnum: 0x%04X\n", epnum);
+ u8 muh = 10;
+ while(muh--) {
+ (void) usb_interrupt_read(dev, epnum, buf, 8, 0);
+ printf("============\nusb_interrupt_read:\n");
+ hexdump((void*)buf, 8);
+ udelay(2000000);
+ }
+#endif
#if 0
/* add device to device list */
return dev;
}
+void lsusb(struct usb_device *dev)
+{
+ printf("=== Device Descriptor === \n");
+ printf("bLength 0x%02X\n", dev->bLength);
+ printf("bDescriptorType 0x%02X\n", dev->bDeviceClass);
+ printf("bcdUSB 0x%04X\n", dev->bcdUSB);
+ printf("bDeviceClass 0x%02X\n", dev->bDeviceClass);
+ printf("bDeviceSubClass 0x%02X\n", dev->bDeviceSubClass);
+ printf("bDeviceProtocoll 0x%02X\n", dev->bDeviceProtocoll);
+ printf("bMaxPacketSize 0x%02X\n", dev->bMaxPacketSize0);
+ printf("idVendor 0x%04X\n", dev->idVendor);
+ printf("idProduct 0x%04X\n", dev->idProduct);
+ printf("bcdDevice 0x%04X\n", dev->bcdDevice);
+ printf("iManufacturer(0x%02X): \"%s\"\n", dev->iManufacturer, dev->iManufacturer ? usb_get_string_simple(dev, dev->iManufacturer) : "no String");
+ printf("iProduct(0x%02X): \"%s\"\n", dev->iProduct, dev->iProduct ? usb_get_string_simple(dev, dev->iProduct) : "no String");
+ printf("iSerialNumber(0x%02X): \"%s\"\n", dev->iSerialNumber, dev->iSerialNumber ? usb_get_string_simple(dev, dev->iSerialNumber) : "no String");
+ printf("bNumConfigurations 0x%02X\n", dev->bNumConfigurations);
+
+ u8 c, i, e;
+ struct usb_conf *conf = dev->conf;
+ for(c=0; c <= dev->bNumConfigurations; c++) {
+ printf(" === Configuration Descriptor %d ===\n", c+1);
+ printf(" bLength 0x%02X\n", conf->bLength);
+ printf(" bDescriptorType 0x%02X\n", conf->bDescriptorType);
+ printf(" wTotalLength 0x%04X\n", conf->wTotalLength);
+ printf(" bNumInterfaces 0x%02X\n", conf->bNumInterfaces);
+ printf(" bConfigurationValue 0x%02X\n", conf->bConfigurationValue);
+ printf(" iConfiguration (0x%02X): \"%s\"\n", conf->iConfiguration, conf->iConfiguration ? usb_get_string_simple(dev, conf->iConfiguration) : "no String");
+ printf(" bmAttributes 0x%02X\n", conf->bmAttributes);
+ printf(" bMaxPower 0x%02X\n", conf->bMaxPower);
+
+ struct usb_intf *ifs = conf->intf;
+ for(i=1; i <= conf->bNumInterfaces; i++) {
+ printf(" === Interface Descriptor %d ===\n", i);
+ printf(" bLength 0x%02X\n", ifs->bLength);
+ printf(" bDescriptorType 0x%02X\n", ifs->bDescriptorType);
+ printf(" bInterfaceNumber 0x%02X\n", ifs->bInterfaceNumber);
+ printf(" bAlternateSetting 0x%02X\n", ifs->bAlternateSetting);
+ printf(" bNumEndpoints 0x%02X\n", ifs->bNumEndpoints);
+ printf(" bInterfaceClass 0x%02X\n", ifs->bInterfaceClass);
+ printf(" bInterfaceSubClass 0x%02X\n", ifs->bInterfaceSubClass);
+ printf(" bInterfaceProtocol 0x%02X\n", ifs->bInterfaceProtocol);
+ printf(" iInterface (0x%02X): \"%s\"\n", ifs->iInterface, ifs->iInterface ? usb_get_string_simple(dev, ifs->iInterface) : "no String");
+
+ struct usb_endp *ed = ifs->endp;
+ for(e=1; e <= ifs->bNumEndpoints; e++) {
+ printf(" === Endpoint Descriptor %d ===\n", e);
+ printf(" bLength 0x%02X\n", ed->bLength);
+ printf(" bDescriptorType 0x%02X\n", ed->bDescriptorType);
+ printf(" bEndpointAddress 0x%02X\n", ed->bEndpointAddress);
+ printf(" bmAttributes 0x%02X\n", ed->bmAttributes);
+ printf(" wMaxPacketSize 0x%02X\n", ed->wMaxPacketSize);
+ printf(" bInterval 0x%02X\n", ed->bInterval);
+
+ ed = ed->next;
+ } //endpoint
+
+ ifs = ifs->next;
+ } //interface
+
+ conf = conf->next;
+ } //configuration
+}
+
/**
* Find currently detached device and remove
* data structures
togl = togl ? 0 : 1;
/**** send token ****/
- hcdi_enqueue(td);
+ hcdi_enqueue(td, irp->dev->ohci);
/***************** Data Stage ***********************/
/**
}
/**** send token ****/
- hcdi_enqueue(td);
+ hcdi_enqueue(td, irp->dev->ohci);
/* pruefe ob noch weitere Pakete vom Device abgeholt werden muessen */
restlength = restlength - irp->epsize;
td->pid = USB_PID_IN;
}
/**** send token ****/
- hcdi_enqueue(td);
+ hcdi_enqueue(td, irp->dev->ohci);
free(td);
break;
case USB_BULK:
- core.stdout("bulk\r\n");
//u8 runloop=1;
//u16 restlength = irp->len;
//char * td_buf_ptr=irp->buffer;
/* schleife die die tds generiert */
while (runloop) {
-
td = usb_create_transfer_descriptor(irp);
td->endpoint = td->endpoint & 0x7F; /* clear direction bit */
td_buf_ptr = td_buf_ptr + irp->epsize;
td->togl = togl;
- if (togl == 0)
- togl = 1;
- else
- togl = 0;
+ togl = togl ? 0 : 1;
/**** send token ****/
- hcdi_enqueue(td);
+ hcdi_enqueue(td, irp->dev->ohci);
free(td);
}
/* next togl */
irp->dev->epTogl[(irp->endpoint & 0x7F)] = togl;
break;
+
+ case USB_INTR:
+ //u8 runloop=1;
+ //u16 restlength = irp->len;
+ //char * td_buf_ptr=irp->buffer;
+
+ /* schleife die die tds generiert */
+ while (runloop && (restlength > 0)) {
+ td = usb_create_transfer_descriptor(irp);
+ /* max packet size for given endpoint */
+ td->actlen = irp->epsize;
+
+ td->pid = USB_PID_IN;
+ /* TODO: USB_PID_OUT */
+
+ /* stop loop if all bytes are send */
+ if (restlength < irp->epsize) {
+ runloop = 0;
+ td->actlen = restlength;
+ }
+
+ td->buffer = td_buf_ptr;
+ /* move pointer for next packet */
+ td_buf_ptr += irp->epsize;
+
+ td->togl = togl;
+ togl = togl ? 0 : 1;
+
+ /**** send token ****/
+ hcdi_enqueue(td, irp->dev->ohci);
+ restlength = restlength - irp->epsize;
+ free(td);
+ }
+ break;
+ irp->dev->epTogl[(irp->endpoint & 0x7F)] = togl;
}
- hcdi_fire();
+ hcdi_fire(irp->dev->ohci);
return 1;
}
td->iso = 0;
td->state = USB_TRANSFER_DESCR_NONE;
td->maxp = irp->epsize;
+ td->fullspeed = irp->dev->fullspeed;
+ td->type = irp->type;
return td;
}
projects / ppcskel.git / blobdiff