/**
* 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;
}
- u8 buf[8];
//#define WTF
#ifdef WTF
printf("lololololool PADDING WTF :O lolololololo \n");
/* print device info */
lsusb(dev);
+#if 0
/* select configuration */
ret = usb_set_configuration(dev, dev->conf->bConfigurationValue);
printf("=============\nusb_set_configuration(ret: %d) %d\n", ret, dev->conf->bConfigurationValue);
printf("=============\nusb_get_configuration: %d\n", usb_get_configuration(dev));
+#endif
+#if 0
+ u8 buf[8];
memset(buf, 0, 8);
- usb_control_msg(dev, 0x00, SET_INTERFACE, 0, dev->conf->intf->bInterfaceNumber, 8, buf, 0);
+ usb_control_msg(dev, 0x00, SET_INTERFACE, 0, dev->conf->intf->bInterfaceNumber, 0, buf, 0);
printf("=============\nusb_set_interface: %d\n", dev->conf->intf->bInterfaceNumber);
hexdump((void*)buf, 8);
memset(buf, 0, 8);
- usb_control_msg(dev, 0x80, GET_INTERFACE, 0, 0, 8, buf, 0);
+ usb_control_msg(dev, 0x81, GET_INTERFACE, 0, dev->conf->intf->bInterfaceNumber, 8, buf, 0);
printf("=============\nusb_get_interface: %d\n", buf[0]);
hexdump((void*)buf, 8);
+#endif
#if 0
/* add device to device list */
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++) {
ed = ed->next;
} //endpoint
-
+
ifs = ifs->next;
} //interface
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;
else
togl = 0;
/**** send token ****/
- hcdi_enqueue(td);
+ hcdi_enqueue(td, irp->dev->ohci);
free(td);
}
/* next togl */
break;
}
- 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;
return td;
}