{
usb_device *dev = (usb_device *) malloc(sizeof(usb_device));
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;
* wIndex = 0
* wLength = 64 // in fact just 8 bytes
*/
- //usb_control_msg(dev, 0x80, GET_DESCRIPTOR, DEVICE << 8, 0, 64, buf, 8, 0);
- // length == 8 => no STALL?! :O
usb_control_msg(dev, 0x80, GET_DESCRIPTOR, DEVICE << 8, 0, 64, buf, 8, 0);
- printf("===========\nafter usb control msg:\n");
+ printf("=============\nbuf: 0x%08X\nafter usb control msg:\n", buf);
hexdump(buf, sizeof(buf));
-#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);
+ 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, 64);
+ 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];
"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
- */
+#if 1
+ memset(buf, 0, 64);
+ 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");
+#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");
+ */
// string descriptoren werden nicht im arbeitsspeicher gehalten -> 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;
char *td_buf_ptr = irp->buffer;
char 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.
* 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)) {
+ printf("restlength: %d\t irp->epsize: %d\n", restlength, irp->epsize);
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 & 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;
else
togl = 0;
/**** send token ****/
- printf("togl: %d\n", togl);
hcdi_enqueue(td);
free(td);
}
break;
}
+ hcdi_fire();
return 1;
}
projects / ppcskel.git / blobdiff