Changes in uspace/drv/uhci-rhd/root_hub.c [275bf456:dced52a] in mainline

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)
@@ -55 +47 @@
         int ret;
 
-        /* Allow access to root hub port registers */
-        assert(sizeof(port_status_t) * UHCI_ROOT_HUB_PORT_COUNT <= size);
+        /* allow access to root hub 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;
         }
@@ -68 +60 @@
         unsigned i = 0;
         for (; i < UHCI_ROOT_HUB_PORT_COUNT; ++i) {
-                /* NOTE: mind pointer arithmetics here */
+                /* mind pointer arithmetics */
                 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;
@@ -82 +74 @@
 }
 /*----------------------------------------------------------------------------*/
-/** 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)
+int uhci_root_hub_fini( uhci_root_hub_t* instance )
 {
-        assert(instance);
-        unsigned i = 0;
-        for (; i < UHCI_ROOT_HUB_PORT_COUNT; ++i) {
-                uhci_port_fini(&instance->ports[i]);
-        }
+        assert( instance );
+        // TODO:
+        //destroy fibril here
+        //disable access to registers
         return EOK;
 }