Changeset eaf1e3d in mainline

Timestamp:

2011-04-10T21:42:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

7628050

Parents:

78d4e1f

Message:

Fix TD data direction values

Only check transfer queues if there are retired TDs (WDH interrupt event)
OHCI control transfers work

Location:

uspace/drv/ohci

Files:

• hc.c (modified) (2 diffs)
• hw_struct/transfer_descriptor.h (modified) (1 diff)

uspace/drv/ohci/hc.c

@@ -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_fatal("OHCI interrupt: %x.\n", status);
-
-
-        LIST_INITIALIZE(done);
-        transfer_list_remove_finished(&instance->transfers_interrupt, &done);
-        transfer_list_remove_finished(&instance->transfers_isochronous, &done);
-        transfer_list_remove_finished(&instance->transfers_control, &done);
-        transfer_list_remove_finished(&instance->transfers_bulk, &done);
-
-        while (!list_empty(&done)) {
-                link_t *item = done.next;
-                list_remove(item);
-                usb_transfer_batch_t *batch =
-                    list_get_instance(item, usb_transfer_batch_t, link);
-                usb_transfer_batch_finish(batch);
+        usb_log_debug("OHCI interrupt: %x.\n", status);
+
+
+        if (status & IS_WDH) {
+                LIST_INITIALIZE(done);
+                transfer_list_remove_finished(
+                    &instance->transfers_interrupt, &done);
+                transfer_list_remove_finished(
+                    &instance->transfers_isochronous, &done);
+                transfer_list_remove_finished(
+                    &instance->transfers_control, &done);
+                transfer_list_remove_finished(
+                    &instance->transfers_bulk, &done);
+
+                while (!list_empty(&done)) {
+                        link_t *item = done.next;
+                        list_remove(item);
+                        usb_transfer_batch_t *batch =
+                            list_get_instance(item, usb_transfer_batch_t, link);
+                        usb_transfer_batch_finish(batch);
+                }
         }
 }
@@ -191 +197 @@
                 instance->registers->interrupt_status = status;
                 hc_interrupt(instance, status);
-                async_usleep(2000000);
+                async_usleep(10000);
         }
         return EOK;

uspace/drv/ohci/hw_struct/transfer_descriptor.h

@@ -50 +50 @@
 #define TD_STATUS_DP_SHIFT (19)
 #define TD_STATUS_DP_SETUP (0x0)
-#define TD_STATUS_DP_IN (0x1)
-#define TD_STATUS_DP_OUT (0x2)
+#define TD_STATUS_DP_OUT (0x1)
+#define TD_STATUS_DP_IN (0x2)
 #define TD_STATUS_DI_MASK (0x7) /* delay interrupt, wait DI frames before int */
 #define TD_STATUS_DI_SHIFT (21)