X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=usb%2Fhost%2Fohci.c;h=d50c7dd8a731fee34911bacfdecbe909ee81a8be;hb=f9935091a024bfad92e99a37e0f5b887e66b8b2c;hp=5e50dba4af1f6fcab081da764ef7c7a6176310c9;hpb=7bf08f09fa8cc0f49bcbfe6a830c472c96073550;p=ppcskel.git diff --git a/usb/host/ohci.c b/usb/host/ohci.c index 5e50dba..d50c7dd 100644 --- a/usb/host/ohci.c +++ b/usb/host/ohci.c @@ -18,14 +18,22 @@ Copyright (C) 2009 Sebastian Falbesoner #include "host.h" #include "../usbspec/usb11spec.h" +// macro for accessing u32 variables that need to be in little endian byte order; +// whenever you read or write from an u32 field that the ohci host controller +// will read or write from too, use this macro for access! +#define ACCESS_LE(dword) (u32)( (((dword) & 0xFF000000) >> 24) | \ + (((dword) & 0x00FF0000) >> 8) | \ + (((dword) & 0x0000FF00) << 8) | \ + (((dword) & 0x000000FF) << 24) ) + 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); - ep->flags = OHCI_ENDPOINT_GENERAL_FORMAT; - ep->headp = ep->tailp = ep->nexted = 0; + ep->flags = ACCESS_LE(OHCI_ENDPOINT_GENERAL_FORMAT); + ep->headp = ep->tailp = ep->nexted = ACCESS_LE(0); return ep; } @@ -33,13 +41,13 @@ 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->flags = 0; - td->nexttd = virt_to_phys(td); + td->flags = ACCESS_LE(0); + td->nexttd = ACCESS_LE(virt_to_phys(td)); if(bsize == 0) { - td->cbp = td->be = 0; + td->cbp = td->be = ACCESS_LE(0); } else { - td->cbp = virt_to_phys(malloc(bsize)); - td->be = td->cbp + bsize - 1; + td->cbp = ACCESS_LE(virt_to_phys(malloc(bsize))); + td->be = ACCESS_LE(ACCESS_LE(td->cbp) + bsize - 1); } return td; } @@ -69,8 +77,8 @@ static void control_quirk() } #define ED_MASK ((u32)~0x0f) - ed->tailp = ed->headp = virt_to_phys((void*) ((u32)td & ED_MASK)); - ed->flags |= OHCI_ENDPOINT_DIRECTION_OUT; + ed->tailp = ed->headp = ACCESS_LE(virt_to_phys((void*) ((u32)td & ED_MASK))); + ed->flags |= ACCESS_LE(OHCI_ENDPOINT_DIRECTION_OUT); } /* @@ -142,57 +150,56 @@ 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", hcca_oh0.done_head); + "===========================\n"); sync_before_read(&hcca_oh0, 256); - printf("done head (nach sync): 0x%08X\n", hcca_oh0.done_head); + 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(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 &= ~OHCI_TD_DIRECTION_PID_MASK; + tmptd->flags &= ACCESS_LE(~OHCI_TD_DIRECTION_PID_MASK); switch(td->pid) { case USB_PID_SETUP: printf("pid_setup\n"); - tmptd->flags |= OHCI_TD_DIRECTION_PID_SETUP; + tmptd->flags |= ACCESS_LE(OHCI_TD_DIRECTION_PID_SETUP); break; case USB_PID_OUT: printf("pid_out\n"); - tmptd->flags |= OHCI_TD_DIRECTION_PID_OUT; + tmptd->flags |= ACCESS_LE(OHCI_TD_DIRECTION_PID_OUT); break; case USB_PID_IN: printf("pid_in\n"); - tmptd->flags |= OHCI_TD_DIRECTION_PID_IN; + tmptd->flags |= ACCESS_LE(OHCI_TD_DIRECTION_PID_IN); break; } - tmptd->flags |= (td->togl) ? OHCI_TD_TOGGLE_1 : OHCI_TD_TOGGLE_0; + tmptd->flags |= ACCESS_LE((td->togl) ? OHCI_TD_TOGGLE_1 : OHCI_TD_TOGGLE_0); printf("tmptd hexump (before):\n"); hexdump(tmptd, sizeof(struct general_td)); printf("tmptd-cbp hexump (before):\n"); - hexdump((void*) phys_to_virt(tmptd->cbp), td->actlen); + hexdump((void*) phys_to_virt(ACCESS_LE(tmptd->cbp)), td->actlen); - sync_after_write((void*) (tmptd->cbp), td->actlen); + sync_after_write((void*) phys_to_virt(ACCESS_LE(tmptd->cbp)), td->actlen); sync_after_write(tmptd, sizeof(struct general_td)); 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 = virt_to_phys((void*) ((u32)tmptd & ED_MASK)); + dummyconfig->tailp = dummyconfig->headp = ACCESS_LE(virt_to_phys((void*) ((u32)tmptd & ED_MASK))); - dummyconfig->flags |= OHCI_ENDPOINT_LOW_SPEED | + 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); + OHCI_ENDPOINT_SET_MAX_PACKET_SIZE(td->maxp)); sync_after_write(dummyconfig, 64); write32(OHCI0_HC_CTRL_HEAD_ED, virt_to_phys(dummyconfig)); @@ -211,34 +218,24 @@ u8 hcdi_enqueue(usb_transfer_descriptor *td) { current = read32(OHCI0_HC_CTRL_CURRENT_ED); } - 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"); hexdump(tmptd, sizeof(struct general_td)); - sync_before_read((void*) (tmptd->cbp), td->actlen); + sync_before_read((void*) phys_to_virt(ACCESS_LE(tmptd->cbp)), td->actlen); printf("tmptd-cbp hexump (after):\n"); - hexdump((void*) phys_to_virt(tmptd->cbp), td->actlen); + hexdump((void*) phys_to_virt(ACCESS_LE(tmptd->cbp)), td->actlen); - printf("done head (vor sync): 0x%08X\n", hcca_oh0.done_head); sync_before_read(&hcca_oh0, 256); - printf("done head (nach sync): 0x%08X\n", hcca_oh0.done_head); + printf("done head (nach sync): 0x%08X\n", ACCESS_LE(hcca_oh0.done_head)); - free(tmptd); + //free(tmptd); return 0; } @@ -339,8 +336,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 */