Changeset 3848fec in mainline

Timestamp:

2013-01-06T02:47:45Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

74271e0

Parents:

c95c00e

Message:

uhci: Switch to new emulated root hub.

Location:

uspace/drv/bus/usb/uhci

Files:

• hc.c (modified) (1 diff)
• uhci.c (modified) (1 diff)

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

@@ -409 +409 @@
         assert(batch);
 
-//      if (batch->ep->address == uhci_rh_get_address(&instance->rh))
-//              return uhci_rh_schedule(&instance->rh, batch);
+        if (batch->ep->address == uhci_rh_get_address(&instance->rh))
+                return uhci_rh_schedule(&instance->rh, batch);
 
         uhci_transfer_batch_t *uhci_batch = uhci_transfer_batch_get(batch);

uspace/drv/bus/usb/uhci/uhci.c

@@ -159 +159 @@
 } else (void)0
 
-        ret = rh_init(device, (uintptr_t)hc->registers + 0x10, 4,
-            ddf_fun_get_handle(hc_fun));
-//      ret = hcd_ddf_setup_root_hub(device, USB_SPEED_FULL);
+//      ret = rh_init(device, (uintptr_t)hc->registers + 0x10, 4,
+//          ddf_fun_get_handle(hc_fun));
+        ret = hcd_ddf_setup_root_hub(device, USB_SPEED_FULL);
         CHECK_RET_FINI_RETURN(ret,
             "Failed to setup UHCI root hub: %s.\n", str_error(ret));