Changeset ffcc5776 in mainline for uspace/drv/bus/usb/ohci/hc.c

Timestamp:

2012-02-23T06:00:07Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

bfc5c9dd

Parents:

70922c2

Message:

ohci: Consider endian difference when accessing OHCI registers.

HC initialization works.
Root hub works.

Turn off work queues until memory structure endian is fixed.

File:

• uspace/drv/bus/usb/ohci/hc.c (modified) (5 diffs)

uspace/drv/bus/usb/ohci/hc.c

@@ -50 +50 @@
 {
         { .cmd = CMD_MEM_READ_32, .dstarg = 1, .addr = NULL /*filled later*/ },
-        { .cmd = CMD_BTEST, .srcarg = 1, .dstarg = 2, .value = OHCI_USED_INTERRUPTS },
+        { .cmd = CMD_BTEST, .srcarg = 1, .dstarg = 2, .value = 0 /*filled later*/},
         { .cmd = CMD_PREDICATE, .srcarg = 2, .value = 2 },
         { .cmd = CMD_MEM_WRITE_A_32, .srcarg = 1, .addr = NULL /*filled later*/ },
@@ -112 +112 @@
         void *address = (void*)&registers->interrupt_status;
         cmds[0].addr = address;
+        cmds[1].value = OHCI_USED_INTERRUPTS;
         cmds[3].addr = address;
         return EOK;
@@ -308 +309 @@
         /* Check for root hub communication */
         if (batch->ep->address == instance->rh.address) {
+                usb_log_debug("OHCI root hub request.\n");
                 rh_request(&instance->rh, batch);
                 return EOK;
@@ -511 +513 @@
 
         /* Enable queues */
-        instance->registers->control |= (C_PLE | C_IE | C_CLE | C_BLE);
-        usb_log_debug2("All queues enabled(%x).\n",
-            instance->registers->control);
+//      instance->registers->control |= (C_PLE | C_IE | C_CLE | C_BLE);
+//      usb_log_debug2("All queues enabled(%x).\n",
+//          instance->registers->control);
 
         /* Enable interrupts */
@@ -522 +524 @@
 
         /* Set periodic start to 90% */
-        uint32_t frame_length = ((fm_interval >> FMI_FI_SHIFT) & FMI_FI_MASK);
-        instance->registers->periodic_start = (frame_length / 10) * 9;
+        const uint32_t frame_length = FMI_FL_GET(fm_interval);
+        PS_SET(instance->registers->periodic_start, (frame_length / 10) * 9);
         usb_log_debug2("All periodic start set to: %x(%u - 90%% of %d).\n",
-            instance->registers->periodic_start,
-            instance->registers->periodic_start, frame_length);
+            PS_GET(instance->registers->periodic_start),
+            PS_GET(instance->registers->periodic_start), frame_length);
 
         C_HCFS_SET(instance->registers->control, C_HCFS_OPERATIONAL);