Changeset ec4538d in mainline for uspace/drv/uhci-rhd/root_hub.c

Timestamp:

2011-03-07T19:08:13Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

1d115c8, a8e98498

Parents:

f16a76b (diff), 18e9eeb (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:

EHCI handsoff fix (it works now), refactoring, Doxygen

File:

• uspace/drv/uhci-rhd/root_hub.c (modified) (4 diffs)

uspace/drv/uhci-rhd/root_hub.c

@@ -40 +40 @@
 #include "root_hub.h"
 
+/** Initializes UHCI root hub instance.
+ *
+ * @param[in] instance Driver memory structure to use.
+ * @param[in] addr Address of I/O registers.
+ * @param[in] size Size of available I/O space.
+ * @param[in] rh Pointer to ddf instance fo the root hub driver.
+ * @return Error code.
+ */
 int uhci_root_hub_init(
   uhci_root_hub_t *instance, void *addr, size_t size, ddf_dev_t *rh)
@@ -47 +55 @@
         int ret;
 
-        /* allow access to root hub registers */
-        assert(sizeof(port_status_t) * UHCI_ROOT_HUB_PORT_COUNT == size);
+        /* Allow access to root hub port registers */
+        assert(sizeof(port_status_t) * UHCI_ROOT_HUB_PORT_COUNT <= size);
         port_status_t *regs;
         ret = pio_enable(addr, size, (void**)&regs);
-
         if (ret < 0) {
-                usb_log_error("Failed to gain access to port registers at %p\n", regs);
+                usb_log_error(
+                    "Failed to gain access to port registers at %p\n", regs);
                 return ret;
         }
@@ -60 +68 @@
         unsigned i = 0;
         for (; i < UHCI_ROOT_HUB_PORT_COUNT; ++i) {
-                /* mind pointer arithmetics */
+                /* NOTE: mind pointer arithmetics here */
                 ret = uhci_port_init(
-                  &instance->ports[i], regs + i, i, ROOT_HUB_WAIT_USEC, rh);
+                    &instance->ports[i], regs + i, i, ROOT_HUB_WAIT_USEC, rh);
                 if (ret != EOK) {
                         unsigned j = 0;
@@ -74 +82 @@
 }
 /*----------------------------------------------------------------------------*/
-int uhci_root_hub_fini( uhci_root_hub_t* instance )
+/** Finishes UHCI root hub instance.
+ *
+ * @param[in] instance Driver memory structure to use.
+ * @return Error code.
+ */
+int uhci_root_hub_fini(uhci_root_hub_t* instance)
 {
-        assert( instance );
-        // TODO:
-        //destroy fibril here
-        //disable access to registers
+        assert(instance);
+        unsigned i = 0;
+        for (; i < UHCI_ROOT_HUB_PORT_COUNT; ++i) {
+                uhci_port_fini(&instance->ports[i]);
+        }
         return EOK;
 }