static struct endpoint_descriptor *allocate_endpoint()
{
struct endpoint_descriptor *ep;
- //memalign instead of calloc doesn't work here?! WTF
- ep = (struct endpoint_descriptor *)memalign(sizeof(struct endpoint_descriptor), 16);
+ ep = (struct endpoint_descriptor *)memalign(16, sizeof(struct endpoint_descriptor));
ep->flags = ACCESS_LE(OHCI_ENDPOINT_GENERAL_FORMAT);
ep->headp = ep->tailp = ep->nexted = ACCESS_LE(0);
return ep;
static struct general_td *allocate_general_td(size_t bsize)
{
struct general_td *td;
- td = (struct general_td *)memalign(sizeof(struct general_td), 16);
+ td = (struct general_td *)memalign(16, sizeof(struct general_td));
td->flags = ACCESS_LE(0);
// TODO !! nexttd?
td->nexttd = ACCESS_LE(virt_to_phys(td));
if(bsize == 0) {
td->cbp = td->be = ACCESS_LE(0);
} else {
- //td->cbp = ACCESS_LE(virt_to_phys(memalign(bsize, 16))); //memailgn required here?
+ //td->cbp = ACCESS_LE(virt_to_phys(memalign(16, bsize))); //memailgn required here?
td->cbp = ACCESS_LE(virt_to_phys(malloc(bsize)));
+ memset(phys_to_virt(ACCESS_LE(td->cbp)), 0, bsize);
td->be = ACCESS_LE(ACCESS_LE(td->cbp) + bsize - 1);
}
return td;
* Enqueue a transfer descriptor.
*/
u8 hcdi_enqueue(usb_transfer_descriptor *td) {
- control_quirk(); //required? YES! :O
+ control_quirk(); //required? YES! :O ... erm... or no? :/
+ u32 tmptdbuffer;
static struct endpoint_descriptor dummyconfig;
+ memset(&dummyconfig, 0, 16);
dummyconfig.flags = ACCESS_LE(OHCI_ENDPOINT_GENERAL_FORMAT);
dummyconfig.headp = dummyconfig.tailp = dummyconfig.nexted = ACCESS_LE(0);
printf( "===========================\n"
"===========================\n");
+ printf("td->buffer(1): 0x%08X\n", (void*)td->buffer);
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",
tmptd->flags |= ACCESS_LE(OHCI_TD_DIRECTION_PID_IN);
break;
}
- tmptd->flags |= ACCESS_LE((td->togl) ? OHCI_TD_TOGGLE_1 : OHCI_TD_TOGGLE_0);
+ tmptd->flags |= ACCESS_LE(((td->togl) ? OHCI_TD_TOGGLE_1 : OHCI_TD_TOGGLE_0) /*| OHCI_TD_BUFFER_ROUNDING*/);
+ //tmptd->flags |= ACCESS_LE(OHCI_TD_TOGGLE_1);
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);
sync_after_write(tmptd, sizeof(struct general_td));
sync_after_write((void*) phys_to_virt(ACCESS_LE(tmptd->cbp)), td->actlen);
-
-#define ED_MASK2 ~0 /*((u32)~0x0f) */
#define ED_MASK ((u32)~0x0f)
dummyconfig.headp = ACCESS_LE(virt_to_phys((void*) ((u32)tmptd & ED_MASK)));
set32(OHCI0_HC_CONTROL, OHCI_CTRL_CLE);
write32(OHCI0_HC_COMMAND_STATUS, OHCI_CLF);
- printf("+++++++++++++++++++++++++++++\n");
+ //printf("+++++++++++++++++++++++++++++\n");
/* spin until the controller is done with the control list */
- u32 current = read32(OHCI0_HC_CTRL_CURRENT_ED);
- printf("current: 0x%08X\n", current);
- while(!current) {
- udelay(2);
- current = read32(OHCI0_HC_CTRL_CURRENT_ED);
+ //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);
- current = read32(OHCI0_HC_CTRL_CURRENT_ED);
+ u32 current = read32(OHCI0_HC_CTRL_CURRENT_ED);
printf("current: 0x%08X\n", current);
printf("+++++++++++++++++++++++++++++\n");
udelay(20000);
sync_before_read(&hcca_oh0, 256);
printf("done head (nach sync): 0x%08X\n", ACCESS_LE(hcca_oh0.done_head));
- sync_before_read((void*) phys_to_virt(ACCESS_LE(tmptd->cbp)), td->actlen);
- (void) memcpy((void*) (td->buffer), phys_to_virt(ACCESS_LE(tmptd->cbp)), td->actlen);
+ 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);
+ }
+
+ 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), phys_to_virt(ACCESS_LE(tmptd->cbp))-newlen, td->actlen);
write32(OHCI0_HC_CONTROL, read32(OHCI0_HC_CONTROL)&~OHCI_CTRL_CLE);
dummyconfig.headp = dummyconfig.tailp = dummyconfig.nexted = ACCESS_LE(0);
- //should be free'd after taking it from the done queue
- //however, it fails?! WTF
+
+ write32(OHCI0_HC_CTRL_HEAD_ED, virt_to_phys(0));
+
+
+ /*
+ * TD should be free'd after taking it from the done queue.
+ * but we are very very dirty and do it anyway :p
+ */
+
+ /* only when a buffer is allocated */
#if 0
- printf("WTF1\n");
+ if(td->actlen)
+ free((void*)tmptdbuffer);
free(tmptd);
- printf("WTF0\n");
- free((void*) tmptd->cbp);
- printf("WTF3\n");
#endif
return 0;
}
write32(OHCI0_HC_CONTROL, OHCI_CONTROL_INIT | OHCI_USB_OPER);
/* wake on ConnectStatusChange, matching external hubs */
- set32(OHCI0_HC_RH_STATUS, RH_HS_DRWE);
+ write32(OHCI0_HC_RH_STATUS, /*RH_HS_DRWE |*/ RH_HS_LPSC);
/* Choose the interrupts we care about now, others later on demand */
write32(OHCI0_HC_INT_STATUS, ~0);
write32(OHCI0_HC_INT_ENABLE, OHCI_INTR_INIT);
- irq_restore(cookie);
+ //wtf?
+ wait_ms ((read32(OHCI0_HC_RH_DESCRIPTOR_A) >> 23) & 0x1fe);
configure_ports((u8)1);
+ irq_restore(cookie);
dbg_op_state();
}
setup_port(OHCI0_HC_RH_PORT_STATUS_1, from_init);
setup_port(OHCI0_HC_RH_PORT_STATUS_2, from_init);
+ printf("configure_ports done\n");
}
static void setup_port(u32 reg, u8 from_init)
{
u32 port = read32(reg);
if((port & RH_PS_CCS) && ((port & RH_PS_CSC) || from_init)) {
- if(!from_init)
- write32(reg, RH_PS_CSC);
+ write32(reg, RH_PS_CSC);
- wait_ms(100);
+ wait_ms(120);
/* clear CSC flag, set PES and start port reset (PRS) */
write32(reg, RH_PS_PES);
+ while(!(read32(reg) & RH_PS_PES)) {
+ printf("fu\n");
+ return;
+ }
+
write32(reg, RH_PS_PRS);
/* spin until port reset is complete */
- port = read32(reg);
- while(!(port & RH_PS_PRSC)) {
- udelay(2);
- printf("fuck\n");
- port = read32(reg);
- }
+ while(!(read32(reg) & RH_PS_PRSC)); // hint: it may stuck here
+ printf("loop done\n");
(void) usb_add_device();
}
}
}
+void show_frame_no()
+{
+ sync_before_read(&hcca_oh0, 256);
+ printf("***** frame_no: %d *****\n", ACCESS_LE(hcca_oh0.frame_no));
+}
projects / ppcskel.git / blobdiff