new hottie: calloc != memalign. after s/calloc/memalign the HC

don't move HEAD to CURRENT, wtf? :/

diff --git a/usb/core/core.c b/usb/core/core.c
index 47e236c1d59a295433e183d69e8b36381528f8be..89d3f69c1a5e11a04e75c17319234aa40dfba62c 100644 (file)
--- a/usb/core/core.c
+++ b/usb/core/core.c
@@ -104,7 +104,24 @@ usb_device *usb_add_device()
        /* ask first 8 bytes of device descriptor with this special 
         * GET Descriptor Request, when device address = 0
         */
-       usb_control_msg(dev, 0x80, GET_DESCRIPTOR, 1, 0, 64, buf, 8, 0);
+
+       /*
+        * see page 253 in usb_20.pdf
+        * 
+        * bmRequestType = 0x80 = 10000000B
+        * bRequest = GET_DESCRIPTOR
+        * wValue = DEVICE (Descriptor Type)
+        * wIndex = 0
+        * wLength = 8 (in Bytes!?)
+        */
+       usb_control_msg(dev, 0x80, GET_DESCRIPTOR, DEVICE, 0, 8, buf, 8, 0);
+
+       /* 
+        * length (here =64) should be "number of byte to transfer", not 
+        * (as here) "number of bits to transfer.
+        * ?
+        */
+       //usb_control_msg(dev, 0x80, GET_DESCRIPTOR, 1, 0, 64, buf, 8, 0);
        printf("===========\nafter usb control msg:\n");
        hexdump(buf, sizeof(buf));
 

diff --git a/usb/core/usb.c b/usb/core/usb.c
index 072dff74137b35d61f41be8babe458e72b704f85..0d8edca3cf4787735e91455a62242aa9c0d48ab5 100644 (file)
--- a/usb/core/usb.c
+++ b/usb/core/usb.c
@@ -135,6 +135,7 @@ u8 usb_reset(usb_device *dev)
  */
 u8 usb_control_msg(usb_device *dev, u8 requesttype, u8 request, u16 value, u16 index, u16 length,char *buf, u16 size, u16 timeout)
 {
+       //usb_control_msg(dev, 0x80, GET_DESCRIPTOR, 1, 0, 8, buf, 8, 0);
        usb_irp *irp = (usb_irp*)malloc(sizeof(usb_irp));
        irp->dev = dev;
        irp->endpoint = 0;
@@ -142,7 +143,7 @@ u8 usb_control_msg(usb_device *dev, u8 requesttype, u8 request, u16 value, u16 i
        irp->epsize = dev->bMaxPacketSize0;
        irp->type = USB_CTRL;
 
-#if 1
+#if 0
        buf[0]=(char)requesttype;
        buf[1]=(char)request;            
        buf[2]=(char)(value >> 8);
@@ -153,8 +154,8 @@ u8 usb_control_msg(usb_device *dev, u8 requesttype, u8 request, u16 value, u16 i
        buf[6]=(char)(length);
        buf[7]=(char)(length >> 8);
 #endif
-       //stupid hack?
-#if 0
+#if 1
+       //should be the right way around? :O
        buf[0]=(char)requesttype;
        buf[1]=(char)request;
        buf[2]=(char)(value);

diff --git a/usb/host/ohci.c b/usb/host/ohci.c
index d50c7dd8a731fee34911bacfdecbe909ee81a8be..89f3fd22be5a5f0868f8b58ad2e9511a4abf3be2 100644 (file)
--- 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,14 @@ 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));
        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))); //memailgn required here?
                td->be = ACCESS_LE(ACCESS_LE(td->cbp) + bsize - 1);
        }
        return td;
@@ -102,8 +104,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);
@@ -181,9 +183,9 @@ 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");
+       printf("tmptd->cbp hexdump (before) 0x%08X:\n", tmptd->cbp);
        hexdump((void*) phys_to_virt(ACCESS_LE(tmptd->cbp)), td->actlen);
 
        sync_after_write((void*) phys_to_virt(ACCESS_LE(tmptd->cbp)), td->actlen);
@@ -193,7 +195,6 @@ u8 hcdi_enqueue(usb_transfer_descriptor *td) {
 
 #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->flags |= ACCESS_LE(OHCI_ENDPOINT_LOW_SPEED | 
@@ -201,10 +202,13 @@ u8 hcdi_enqueue(usb_transfer_descriptor *td) {
                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);
@@ -224,14 +228,19 @@ u8 hcdi_enqueue(usb_transfer_descriptor *td) {
        printf("+++++++++++++++++++++++++++++\n");
        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*) phys_to_virt(ACCESS_LE(tmptd->cbp)), td->actlen);
-       printf("tmptd-cbp hexump (after):\n");
+       printf("tmptd->cbp hexdump (after) 0x%08X:\n", 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);
+
        sync_before_read(&hcca_oh0, 256);
        printf("done head (nach sync): 0x%08X\n", ACCESS_LE(hcca_oh0.done_head));