Changeset 5d07f54 in mainline

Timestamp:

2011-05-07T11:42:34Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

7ab7c7f6

Parents:

bba0dc20

Message:

Reset OHCI root hub even if taking control from SMM driver

postpone root hub registration

Location:

uspace/drv/ohci

Files:

• hc.c (modified) (4 diffs)
• main.c (modified) (1 diff)
• ohci.c (modified) (2 diffs)

uspace/drv/ohci/hc.c

@@ -91 +91 @@
                 usb_log_error("Failed add root hub match-id.\n");
         }
+        ret = ddf_fun_bind(hub_fun);
         return ret;
 }
@@ -288 +289 @@
 {
         assert(instance);
-        usb_log_debug("OHCI interrupt: %x.\n", status);
+        usb_log_debug("OHCI(%p) interrupt: %x.\n", instance, status);
         if ((status & ~I_SF) == 0) /* ignore sof status */
                 return;
@@ -354 +355 @@
                 }
                 usb_log_info("SMM driver: Ownership taken.\n");
+                instance->registers->control &= (C_HCFS_RESET << C_HCFS_SHIFT);
+                async_usleep(50000);
                 return;
         }
@@ -478 +481 @@
 {
         assert(instance);
+
+        bzero(&instance->rh, sizeof(instance->rh));
         /* Init queues */
         hc_init_transfer_lists(instance);

uspace/drv/ohci/main.c

@@ -75 +75 @@
                 return ret;
         }
-        device->driver_data = ohci;
+//      device->driver_data = ohci;
+        hc_register_hub(&ohci->hc, ohci->rh_fun);
 
         usb_log_info("Controlling new OHCI device `%s'.\n", device->name);

uspace/drv/ohci/ohci.c

@@ -54 +54 @@
 {
         assert(dev);
+        assert(dev->driver_data);
         hc_t *hc = &((ohci_t*)dev->driver_data)->hc;
         uint16_t status = IPC_GET_ARG1(*call);
@@ -208 +209 @@
             "Failed(%d) to create root hub function.\n", ret);
 
-        hc_register_hub(&instance->hc, instance->rh_fun);
 
         instance->rh_fun->ops = &rh_ops;
         instance->rh_fun->driver_data = NULL;
-        ret = ddf_fun_bind(instance->rh_fun);
-        CHECK_RET_FINI_RETURN(ret,
-            "Failed(%d) to register OHCI root hub.\n", ret);
+        
+        device->driver_data = instance;
 
         hc_start_hw(&instance->hc);