X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=usb%2Fhost%2Fohci.c;h=53570930b137c5e9a335f27315dd6d5e7f649f8c;hb=10ae92fb831b7e593570d2f3b4b45512316ec643;hp=de069cec8748e1385a31f988ca842500c19754fa;hpb=1251730ea1fb1ff03fc53b4f63ad39eaaea697bb;p=ppcskel.git diff --git a/usb/host/ohci.c b/usb/host/ohci.c index de069ce..5357093 100644 --- a/usb/host/ohci.c +++ b/usb/host/ohci.c @@ -31,7 +31,8 @@ static struct ohci_hcca hcca_oh0; static struct endpoint_descriptor *allocate_endpoint() { struct endpoint_descriptor *ep; - ep = (struct endpoint_descriptor *)calloc(sizeof(struct endpoint_descriptor), 16); + //memalign instead of calloc doesn't work here?! WTF + ep = (struct endpoint_descriptor *)memalign(sizeof(struct endpoint_descriptor), 16); ep->flags = ACCESS_LE(OHCI_ENDPOINT_GENERAL_FORMAT); ep->headp = ep->tailp = ep->nexted = ACCESS_LE(0); return ep; @@ -40,13 +41,15 @@ static struct endpoint_descriptor *allocate_endpoint() static struct general_td *allocate_general_td(size_t bsize) { struct general_td *td; - td = (struct general_td *)calloc(sizeof(struct general_td), 16); + td = (struct general_td *)memalign(sizeof(struct general_td), 16); td->flags = ACCESS_LE(0); - td->nexttd = ACCESS_LE(virt_to_phys(td)); + //td->nexttd = ACCESS_LE(virt_to_phys(td)); + td->nexttd = ACCESS_LE(0); if(bsize == 0) { td->cbp = td->be = ACCESS_LE(0); } else { - td->cbp = ACCESS_LE(virt_to_phys(malloc(bsize))); + td->cbp = ACCESS_LE(virt_to_phys(memalign(bsize, 16))); //memailgn required here? + //td->cbp = ACCESS_LE(virt_to_phys(malloc(bsize))); td->be = ACCESS_LE(ACCESS_LE(td->cbp) + bsize - 1); } return td; @@ -54,8 +57,8 @@ static struct general_td *allocate_general_td(size_t bsize) static void control_quirk() { - static struct endpoint_descriptor *ed; /* empty ED */ - static struct general_td *td; /* dummy TD */ + static struct endpoint_descriptor *ed = 0; /* empty ED */ + static struct general_td *td = 0; /* dummy TD */ u32 head; u32 current; u32 status; @@ -102,8 +105,8 @@ static void control_quirk() * Load the special empty ED and tell the controller to * process the control list. */ - sync_after_write(ed, 64); - sync_after_write(td, 64); + sync_after_write(ed, 16); + sync_after_write(td, 16); write32(OHCI0_HC_CTRL_HEAD_ED, virt_to_phys(ed)); status = read32(OHCI0_HC_CONTROL); @@ -150,17 +153,21 @@ static void dbg_op_state() /** * Enqueue a transfer descriptor. */ +u8 first = 0; u8 hcdi_enqueue(usb_transfer_descriptor *td) { control_quirk(); printf( "===========================\n" - "===========================\n" - "done head (vor sync): 0x%08X\n", ACCESS_LE(hcca_oh0.done_head)); + "===========================\n"); 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) & 0xffff0000)>>16), + ACCESS_LE(hcca_oh0.frame_no)&0xffff ); + if(hcca_oh0.done_head) printf("WWWWWWWWOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTT\n"); struct general_td *tmptd = allocate_general_td(td->actlen); - (void) memcpy((void*) (phys_to_virt(ACCESS_LE(tmptd->cbp))), td->buffer, td->actlen); /* throws dsi exception after some time :X */ + (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) { @@ -179,33 +186,32 @@ u8 hcdi_enqueue(usb_transfer_descriptor *td) { } tmptd->flags |= ACCESS_LE((td->togl) ? OHCI_TD_TOGGLE_1 : OHCI_TD_TOGGLE_0); - printf("tmptd hexump (before):\n"); + printf("tmptd hexdump (before) 0x%08X:\n", tmptd); hexdump(tmptd, sizeof(struct general_td)); - printf("tmptd-cbp hexump (before):\n"); - hexdump((void*) (phys_to_virt(ACCESS_LE(tmptd->cbp))), td->actlen); + 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((void*) 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); struct endpoint_descriptor *dummyconfig = allocate_endpoint(); - u32 current2 = read32(OHCI0_HC_CTRL_CURRENT_ED); - printf("current2: 0x%08X\n", current2); - #define ED_MASK2 ~0 /*((u32)~0x0f) */ #define ED_MASK ((u32)~0x0f) - printf("tmpdt & ED_MASK: 0x%08X\n", virt_to_phys((void*) ((u32)tmptd & ED_MASK))); - dummyconfig->tailp = dummyconfig->headp = ACCESS_LE(virt_to_phys((void*) ((u32)tmptd & ED_MASK))); + /*dummyconfig->tailp =*/ dummyconfig->headp = ACCESS_LE(virt_to_phys((void*) ((u32)tmptd & ED_MASK))); 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)); - sync_after_write(dummyconfig, 64); + printf("dummyconfig hexdump (before) 0x%08X:\n", dummyconfig); + hexdump((void*) dummyconfig, 16); + + sync_after_write(dummyconfig, 16); write32(OHCI0_HC_CTRL_HEAD_ED, virt_to_phys(dummyconfig)); - printf("OHCI_CTRL_CLE: 0x%08X\n", read32(OHCI0_HC_CONTROL)&OHCI_CTRL_CLE); + 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); set32(OHCI0_HC_CONTROL, OHCI_CTRL_CLE); write32(OHCI0_HC_COMMAND_STATUS, OHCI_CLF); @@ -215,38 +221,37 @@ u8 hcdi_enqueue(usb_transfer_descriptor *td) { u32 current = read32(OHCI0_HC_CTRL_CURRENT_ED); printf("current: 0x%08X\n", current); while(!current) { - udelay(10); + // udelay(1000000); + udelay(2); current = read32(OHCI0_HC_CTRL_CURRENT_ED); + // 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); } - udelay(2000); - udelay(2000); - udelay(2000); + udelay(20000); current = read32(OHCI0_HC_CTRL_CURRENT_ED); printf("current: 0x%08X\n", current); printf("+++++++++++++++++++++++++++++\n"); - udelay(2000); - udelay(2000); - udelay(2000); - udelay(2000); - udelay(2000); - udelay(2000); - udelay(2000); - udelay(2000); + udelay(20000); + sync_before_read(tmptd, sizeof(struct general_td)); - printf("tmptd hexump (after):\n"); + printf("tmptd hexdump (after) 0x%08X:\n", tmptd); hexdump(tmptd, sizeof(struct general_td)); - sync_before_read((void*) ACCESS_LE(tmptd->cbp), td->actlen); - printf("tmptd-cbp hexump (after):\n"); - hexdump((void*) (phys_to_virt(ACCESS_LE(tmptd->cbp))), td->actlen); + 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); + + sync_before_read(dummyconfig, 16); + printf("dummyconfig hexdump (after) 0x%08X:\n", dummyconfig); + hexdump((void*) dummyconfig, 16); - printf("done head (vor sync): 0x%08X\n", ACCESS_LE(hcca_oh0.done_head)); sync_before_read(&hcca_oh0, 256); printf("done head (nach sync): 0x%08X\n", ACCESS_LE(hcca_oh0.done_head)); - free(tmptd); + //should be free'd after taking it from the done queue + //free(tmptd); return 0; } @@ -347,8 +352,10 @@ void hcdi_irq() flags &= read32(OHCI0_HC_INT_ENABLE); /* nothing to do? */ - if (flags == 0) + if (flags == 0) { + printf("OHCI Interrupt occured: but not for you! WTF?!\n"); return; + } printf("OHCI Interrupt occured: "); /* UnrecoverableError */