Changeset 78d4e1f in mainline for uspace/drv/ohci/hc.c

Timestamp:

2011-04-10T21:03:36Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update

Children:

eaf1e3d

Parents:

0ede0c3

Message:

Init ED queue registers AFTER device reset

Disable and enabled control queue when adding an ED
More debug output
OHCI lives and responds with STALL.

File:

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

uspace/drv/ohci/hc.c

@@ -135 +135 @@
         }
 
-        transfer_list_add_batch(
-            instance->transfers[batch->transfer_type], batch);
-
         switch (batch->transfer_type) {
         case USB_TRANSFER_CONTROL:
                 instance->registers->control &= ~C_CLE;
+                transfer_list_add_batch(
+                    instance->transfers[batch->transfer_type], batch);
                 instance->registers->command_status |= CS_CLF;
-                usb_log_debug2("Set control transfer filled: %x.\n",
+                usb_log_debug2("Set CS control transfer filled: %x.\n",
                         instance->registers->command_status);
+                instance->registers->control_current = 0;
                 instance->registers->control |= C_CLE;
                 break;
@@ -160 +160 @@
 {
         assert(instance);
-        if ((status & ~IS_SF) == 0) /* ignore sof status */
-                return;
+//      if ((status & ~IS_SF) == 0) /* ignore sof status */
+//              return;
         if (status & IS_RHSC)
                 rh_interrupt(&instance->rh);
 
-        usb_log_info("OHCI interrupt: %x.\n", status);
+        usb_log_fatal("OHCI interrupt: %x.\n", status);
 
 
@@ -191 +191 @@
                 instance->registers->interrupt_status = status;
                 hc_interrupt(instance, status);
-                async_usleep(1000);
+                async_usleep(2000000);
         }
         return EOK;
@@ -267 +267 @@
             instance->registers->control);
 
+        /* Use HCCA */
+        instance->registers->hcca = addr_to_phys(instance->hcca);
+
+        /* Use queues */
+        instance->registers->bulk_head = instance->transfers_bulk.list_head_pa;
+        usb_log_debug2("Bulk HEAD set to: %p(%p).\n",
+            instance->transfers_bulk.list_head,
+            instance->transfers_bulk.list_head_pa);
+
+        instance->registers->control_head =
+            instance->transfers_control.list_head_pa;
+        usb_log_debug2("Control HEAD set to: %p(%p).\n",
+            instance->transfers_control.list_head,
+            instance->transfers_control.list_head_pa);
+
         /* Enable queues */
         instance->registers->control |= (C_PLE | C_IE | C_CLE | C_BLE);
@@ -342 +357 @@
                 return ENOMEM;
         bzero(instance->hcca, sizeof(hcca_t));
-        instance->registers->hcca = addr_to_phys(instance->hcca);
-        usb_log_debug2("OHCI HCCA initialized at %p(%p).\n",
-            instance->hcca, instance->registers->hcca);
-
-        /* Use queues */
-        instance->registers->bulk_head = instance->transfers_bulk.list_head_pa;
-        usb_log_debug2("Bulk HEAD set to: %p(%p).\n",
-            instance->transfers_bulk.list_head,
-            instance->transfers_bulk.list_head_pa);
-
-        instance->registers->control_head =
-            instance->transfers_control.list_head_pa;
-        usb_log_debug2("Control HEAD set to: %p(%p).\n",
-            instance->transfers_control.list_head,
-            instance->transfers_control.list_head_pa);
+        usb_log_debug2("OHCI HCCA initialized at %p.\n", instance->hcca);
 
         unsigned i = 0;