printf("********************************************************\n");
}
-
-
-/**
- * Enqueue a transfer descriptor.
- */
-u8 first = 1;
-u8 hcdi_enqueue(usb_transfer_descriptor *td) {
- printf( "===========================\n"
- "===========================\n");
- control_quirk(); //required? YES! :O ... erm... or no? :/ ... in fact I have no idea
- u32 tmptdbuffer;
-
- static struct endpoint_descriptor dummyconfig;
- if(first) {
- first = 0;
- memset(&dummyconfig, 0, 16);
- dummyconfig.flags = ACCESS_LE(OHCI_ENDPOINT_GENERAL_FORMAT);
- dummyconfig.headp = dummyconfig.tailp = dummyconfig.nexted = ACCESS_LE(0);
- dummyconfig.flags |= ACCESS_LE(OHCI_ENDPOINT_LOW_SPEED |
- OHCI_ENDPOINT_SET_DEVICE_ADDRESS(td->devaddress) |
- OHCI_ENDPOINT_SET_ENDPOINT_NUMBER(td->endpoint) |
- OHCI_ENDPOINT_SET_MAX_PACKET_SIZE(td->maxp));
- write32(OHCI0_HC_CTRL_HEAD_ED, virt_to_phys(&dummyconfig));
- } else {
- sync_before_read(&dummyconfig, 16);
- dummyconfig.flags |= ACCESS_LE(OHCI_ENDPOINT_SKIP);
- printf("HALTED set?: %d\n", ACCESS_LE(dummyconfig.headp)&OHCI_ENDPOINT_HALTED);
- sync_after_write(&dummyconfig, 16);
-
- udelay(2000);
- dummyconfig.headp = ACCESS_LE(0);
- sync_after_write(&dummyconfig, 16);
- }
-
- sync_before_read(&hcca_oh0, 256);
- printf("done head (nach sync): 0x%08X\n", ACCESS_LE(hcca_oh0.done_head));
- printf("HCCA->frame_no: %d\nhcca->hccapad1: %d\n",
- ((ACCESS_LE(hcca_oh0.frame_no) & 0xffff)>>16),
- ACCESS_LE(hcca_oh0.frame_no)&0x0000ffff );
-
- struct general_td *tmptd = allocate_general_td(td->actlen);
- (void) memcpy((void*) (phys_to_virt(ACCESS_LE(tmptd->cbp))), td->buffer, td->actlen);
-
- tmptd->flags &= ACCESS_LE(~OHCI_TD_DIRECTION_PID_MASK);
- switch(td->pid) {
+static void general_td_fill(struct general_td *dest, usb_transfer_descriptor *src)
+{
+ (void) memcpy((void*) (phys_to_virt(ACCESS_LE(dest->cbp))), src->buffer, src->actlen);
+ dest->flags &= ACCESS_LE(~OHCI_TD_DIRECTION_PID_MASK);
+ switch(src->pid) {
case USB_PID_SETUP:
printf("pid_setup\n");
- tmptd->flags |= ACCESS_LE(OHCI_TD_DIRECTION_PID_SETUP);
- tmptd->flags |= ACCESS_LE(OHCI_TD_TOGGLE_0);
- tmptd->flags |= ACCESS_LE(OHCI_TD_BUFFER_ROUNDING);
+ dest->flags |= ACCESS_LE(OHCI_TD_DIRECTION_PID_SETUP);
+ dest->flags |= ACCESS_LE(OHCI_TD_TOGGLE_0);
+ dest->flags |= ACCESS_LE(OHCI_TD_BUFFER_ROUNDING);
break;
case USB_PID_OUT:
printf("pid_out\n");
- tmptd->flags |= ACCESS_LE(OHCI_TD_DIRECTION_PID_OUT);
- tmptd->flags |= ACCESS_LE(OHCI_TD_BUFFER_ROUNDING);
+ dest->flags |= ACCESS_LE(OHCI_TD_DIRECTION_PID_OUT);
+ dest->flags |= ACCESS_LE(OHCI_TD_BUFFER_ROUNDING);
/*
* TODO: just temporary solution!
* there can be also regular PID_OUT pakets
*/
- tmptd->flags |= ACCESS_LE(OHCI_TD_TOGGLE_1);
+ dest->flags |= ACCESS_LE(OHCI_TD_TOGGLE_1);
break;
case USB_PID_IN:
printf("pid_in\n");
- tmptd->flags |= ACCESS_LE(OHCI_TD_DIRECTION_PID_IN);
- tmptd->flags |= ACCESS_LE(OHCI_TD_BUFFER_ROUNDING);
+ dest->flags |= ACCESS_LE(OHCI_TD_DIRECTION_PID_IN);
+ dest->flags |= ACCESS_LE(OHCI_TD_BUFFER_ROUNDING);
/*
* let the endpoint do the togglestuff!
* TODO: just temporary solution!
* there can be also inregular PID_IN pakets (@Status Stage)
*/
- tmptd->flags |= ACCESS_LE(OHCI_TD_TOGGLE_CARRY);
+ dest->flags |= ACCESS_LE(OHCI_TD_TOGGLE_CARRY);
#if 0
/* should be done by HC!
* first pid_in start with DATA0 */
*/
- dummyconfig.headp = ACCESS_LE( td->togl ?
+ dummyconfig.headp = ACCESS_LE( src->togl ?
ACCESS_LE(dummyconfig.headp) | OHCI_ENDPOINT_TOGGLE_CARRY :
ACCESS_LE(dummyconfig.headp) & ~OHCI_ENDPOINT_TOGGLE_CARRY);
#endif
break;
}
- tmptd->flags |= ACCESS_LE(OHCI_TD_SET_DELAY_INTERRUPT(7));
+ dest->flags |= ACCESS_LE(OHCI_TD_SET_DELAY_INTERRUPT(7));
+ sync_after_write(dest, sizeof(struct general_td));
+ sync_after_write((void*) phys_to_virt(ACCESS_LE(dest->cbp)), src->actlen);
+}
- printf("tmptd hexdump (before) 0x%08X:\n", tmptd);
- hexdump(tmptd, sizeof(struct general_td));
- //save buffer adress here; HC may change tmptd->cbp
- tmptdbuffer = (u32) phys_to_virt(ACCESS_LE(tmptd->cbp));
- printf("tmptd->cbp hexdump (before) 0x%08X:\n", phys_to_virt(ACCESS_LE(tmptd->cbp)));
- hexdump((void*) phys_to_virt(ACCESS_LE(tmptd->cbp)), td->actlen);
+static void dump_address(void *addr, u32 size, const char* str)
+{
+ sync_before_read(addr, size);
+ printf("%s hexdump @ 0x%08X:\n", str, addr);
+ hexdump(addr, size);
+}
- sync_after_write(tmptd, sizeof(struct general_td));
- sync_after_write((void*) phys_to_virt(ACCESS_LE(tmptd->cbp)), td->actlen);
+/**
+ * Enqueue a transfer descriptor.
+ */
+u8 first = 0;
+u8 hcdi_enqueue(usb_transfer_descriptor *td) {
+ static struct general_td *tSetup,*tData;
+ static u32 tSetupbuffer, tDatabuffer, tStatusbuffer;
+ static u32 tSetupblen, tDatablen, tStatusblen;
+
+ if(first == 0) {
+ printf("step 0\n");
+ tSetup = allocate_general_td(td->actlen);
+ general_td_fill(tSetup, td);
+ tSetupbuffer = (u32) phys_to_virt(ACCESS_LE(tSetup->cbp));
+ tSetupblen = td->actlen;
+ first++;
+ return 0;
+ }
+ if(first == 1) {
+ printf("step 1\n");
+ tData = allocate_general_td(td->actlen);
+ general_td_fill(tData, td);
+ tDatabuffer = (u32) phys_to_virt(ACCESS_LE(tData->cbp));
+ tDatablen = td->actlen;
+ first++;
+ return 0;
+ }
+ struct general_td *tStatus = allocate_general_td(td->actlen);
+ general_td_fill(tStatus, td);
+ tStatusbuffer = (u32) phys_to_virt(ACCESS_LE(tStatus->cbp));
+ tStatusblen = td->actlen;
+ printf( "===========================\n"
+ "===========================\n");
+ control_quirk(); //required? YES! :O ... erm... or no? :/ ... in fact I have no idea
+
+ static struct endpoint_descriptor dummyconfig;
+ if(first) {
+ first = 0;
+ memset(&dummyconfig, 0, 16);
+ dummyconfig.flags = ACCESS_LE(OHCI_ENDPOINT_GENERAL_FORMAT);
+ dummyconfig.headp = dummyconfig.tailp = dummyconfig.nexted = ACCESS_LE(0);
+ dummyconfig.flags |= ACCESS_LE(OHCI_ENDPOINT_LOW_SPEED |
+ OHCI_ENDPOINT_SET_DEVICE_ADDRESS(td->devaddress) |
+ OHCI_ENDPOINT_SET_ENDPOINT_NUMBER(td->endpoint) |
+ OHCI_ENDPOINT_SET_MAX_PACKET_SIZE(td->maxp));
+ write32(OHCI0_HC_CTRL_HEAD_ED, virt_to_phys(&dummyconfig));
+ } else {
+ sync_before_read(&dummyconfig, 16);
+ printf("HALTED set?: %d\n", ACCESS_LE(dummyconfig.headp)&OHCI_ENDPOINT_HALTED);
+ dummyconfig.headp = ACCESS_LE(0);
+ sync_after_write(&dummyconfig, 16);
+ }
#define ED_MASK ((u32)~0x0f)
- dummyconfig.flags &= ACCESS_LE(~OHCI_ENDPOINT_SKIP);
- dummyconfig.headp |= ACCESS_LE(virt_to_phys((void*) ((u32)tmptd & ED_MASK)));
+ dummyconfig.headp |= ACCESS_LE(virt_to_phys((void*) ((u32)tSetup & ED_MASK)));
+ tSetup->nexttd = ACCESS_LE(virt_to_phys((void*) ((u32)tData & ED_MASK)));
+ tData->nexttd = ACCESS_LE(virt_to_phys((void*) ((u32)tStatus & ED_MASK)));
+
+ dump_address(tSetup, sizeof(struct general_td), "tSetup(before)");
+ dump_address((void*) phys_to_virt(ACCESS_LE(tSetup->cbp)), tSetupblen, "tSetup->cbp(before)");
+
+ dump_address(tData, sizeof(struct general_td), "tData(before)");
+ dump_address((void*) phys_to_virt(ACCESS_LE(tData->cbp)), tDatablen, "tData->cbp(before)");
+
+ dump_address(tStatus, sizeof(struct general_td), "tStatus(before)");
+ dump_address((void*) phys_to_virt(ACCESS_LE(tStatus->cbp)), tStatusblen, "tStatus->cbp(before)");
- printf("dummyconfig hexdump (before) 0x%08X:\n", &dummyconfig);
- hexdump((void*) &dummyconfig, 16);
+ dump_address(&dummyconfig, sizeof(struct endpoint_descriptor), "dummyconfig(before)");
sync_after_write(&dummyconfig, 16);
+ sync_after_write(tSetup, sizeof(struct general_td));
+ sync_after_write(tData, sizeof(struct general_td));
+ sync_after_write(tStatus, sizeof(struct general_td));
- printf("OHCI_CTRL_CLE: 0x%08X || ", read32(OHCI0_HC_CONTROL)&OHCI_CTRL_CLE);
- printf("OHCI_CLF: 0x%08X\n", read32(OHCI0_HC_COMMAND_STATUS)&OHCI_CLF);
+ /* trigger control list */
set32(OHCI0_HC_CONTROL, OHCI_CTRL_CLE);
write32(OHCI0_HC_COMMAND_STATUS, OHCI_CLF);
- //printf("+++++++++++++++++++++++++++++\n");
- /* spin until the controller is done with the control list */
- //printf("current: 0x%08X\n", current);
-
//don't use this quirk stuff here!
#if 1
while(!read32(OHCI0_HC_CTRL_CURRENT_ED)) {
}
#endif
- udelay(20000);
+ udelay(1000000);
u32 current = read32(OHCI0_HC_CTRL_CURRENT_ED);
printf("current: 0x%08X\n", current);
printf("+++++++++++++++++++++++++++++\n");
- udelay(20000);
-
- sync_before_read(tmptd, sizeof(struct general_td));
- printf("tmptd hexdump (after) 0x%08X:\n", tmptd);
- hexdump(tmptd, sizeof(struct general_td));
- dbg_td_flag(ACCESS_LE(tmptd->flags));
+ udelay(10000000);
- sync_before_read((void*) phys_to_virt(ACCESS_LE(tmptd->cbp)), td->actlen);
- printf("tmptd->cbp hexdump (after) 0x%08X:\n", phys_to_virt(ACCESS_LE(tmptd->cbp)));
- hexdump((void*) phys_to_virt(ACCESS_LE(tmptd->cbp)), td->actlen);
+ dump_address(tSetup, sizeof(struct general_td), "tSetup(after)");
+ dump_address((void*) phys_to_virt(ACCESS_LE(tSetup->cbp)), tSetupblen, "tSetup->cbp(after)");
+ dump_address((void*) tSetupbuffer, tSetupblen, "tSetupbuffer");
+ dbg_td_flag(ACCESS_LE(tSetup->flags));
- sync_before_read(&dummyconfig, 16);
- printf("dummyconfig hexdump (after) 0x%08X:\n", &dummyconfig);
- hexdump((void*) &dummyconfig, 16);
+ dump_address(tData, sizeof(struct general_td), "tData(after)");
+ dump_address((void*) phys_to_virt(ACCESS_LE(tData->cbp)), tDatablen, "tData->cbp(after)");
+ dump_address((void*) tDatabuffer, tDatablen, "tDatabuffer");
+ dbg_td_flag(ACCESS_LE(tData->flags));
- sync_before_read(&hcca_oh0, 256);
- printf("done head (nach sync): 0x%08X\n", ACCESS_LE(hcca_oh0.done_head));
-
- struct general_td* donetd = phys_to_virt(ACCESS_LE(hcca_oh0.done_head)&~1);
- sync_before_read(donetd, 16);
- printf("done head hexdump: 0x%08X\n", donetd);
- hexdump((void*) donetd, 16);
-
- u32 newlen = 0;
- if(td->actlen) {
- sync_before_read((void*) tmptdbuffer, td->actlen);
- newlen = (u32)phys_to_virt(ACCESS_LE(tmptd->cbp)) - tmptdbuffer;
- printf("WOOOOT newlen: %d\n", newlen);
- hexdump((void*) tmptdbuffer, newlen);
- printf("OLD length: %d\n", td->actlen);
- hexdump((void*) tmptdbuffer, td->actlen);
- }
+ dump_address(tStatus, sizeof(struct general_td), "tStatus(after)");
+ //dump_address((void*) phys_to_virt(ACCESS_LE(tStatus->cbp)), tStatusblen, "tStatus->cbp(after)");
+ //dump_address((void*) tStatusbuffer, tStatusblen, "tStatusbuffer");
+ dbg_td_flag(ACCESS_LE(tStatus->flags));
- sync_before_read((void*) (phys_to_virt(ACCESS_LE(tmptd->cbp))-newlen), td->actlen);
- printf("td->buffer: 0x%08X\np2v(A_L(tmptd->cbp: 0x%08X\ntd->actlen: %d\n", (void*) (td->buffer), phys_to_virt(ACCESS_LE(tmptd->cbp)), td->actlen);
- (void) memcpy((void*) (td->buffer), (void*) tmptdbuffer, td->actlen);
+ dump_address(&dummyconfig, sizeof(struct endpoint_descriptor), "dummyconfig(after)");
+ /* disable control list */
write32(OHCI0_HC_CONTROL, read32(OHCI0_HC_CONTROL)&~OHCI_CTRL_CLE);
/*
/* only when a buffer is allocated */
#if 0
if(td->actlen)
- free((void*)tmptdbuffer);
- free(tmptd);
+ free((void*)tStatusbuffer);
+ free(tStatus);
#endif
return 0;
}