Changeset 6991188 in mainline for uspace/drv/ohci/hc.c

Timestamp:

2011-04-11T13:40:00Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

d91645ab

Parents:

1a46610 (diff), 9f104af4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

OHCI prototype works (INT transfers too)

Tested on vbox 4.0.4, MS mouse and Logitech keyboard work

File:

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

uspace/drv/ohci/hc.c

@@ -113 +113 @@
             ret, str_error(ret));
         hc_init_hw(instance);
+        fibril_mutex_initialize(&instance->guard);
 
         rh_init(&instance->rh, dev, instance->registers);
@@ -135 +136 @@
         }
 
+        fibril_mutex_lock(&instance->guard);
         switch (batch->transfer_type) {
         case USB_TRANSFER_CONTROL:
@@ -157 +159 @@
         case USB_TRANSFER_INTERRUPT:
         case USB_TRANSFER_ISOCHRONOUS:
-                instance->registers->control &= ~C_PLE;
+                instance->registers->control &= (~C_PLE & ~C_IE);
                 transfer_list_add_batch(
                     instance->transfers[batch->transfer_type], batch);
-                instance->registers->control |= C_PLE;
+                instance->registers->control |= C_PLE | C_IE;
+                usb_log_debug2("Added periodic transfer: %x.\n",
+                    instance->registers->periodic_current);
                 break;
         default:
                 break;
         }
+        fibril_mutex_unlock(&instance->guard);
         return EOK;
 }
@@ -178 +183 @@
         usb_log_debug("OHCI interrupt: %x.\n", status);
 
-
         if (status & IS_WDH) {
+                fibril_mutex_lock(&instance->guard);
+                usb_log_debug2("HCCA: %p-%p(%p).\n", instance->hcca,
+                    instance->registers->hcca, addr_to_phys(instance->hcca));
+                usb_log_debug2("Periodic current: %p.\n",
+                    instance->registers->periodic_current);
                 LIST_INITIALIZE(done);
                 transfer_list_remove_finished(
@@ -197 +206 @@
                         usb_transfer_batch_finish(batch);
                 }
+                fibril_mutex_unlock(&instance->guard);
         }
 }
@@ -208 +218 @@
                 instance->registers->interrupt_status = status;
                 hc_interrupt(instance, status);
-                async_usleep(10000);
+                async_usleep(50000);
         }
         return EOK;
@@ -345 +355 @@
         SETUP_TRANSFER_LIST(transfers_control, "CONTROL");
         SETUP_TRANSFER_LIST(transfers_bulk, "BULK");
-
+#undef SETUP_TRANSFER_LIST
         transfer_list_set_next(&instance->transfers_interrupt,
             &instance->transfers_isochronous);
@@ -360 +370 @@
 
         return EOK;
-#undef CHECK_RET_CLEAR_RETURN
 }
 /*----------------------------------------------------------------------------*/