Changeset 2ef036a in mainline for uspace/drv/uhci-rhd/main.c

Timestamp:

2011-03-14T22:51:09Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

2180979

Parents:

7ffe82f (diff), fcf07e6 (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:

Merge development/ changes

File:

• uspace/drv/uhci-rhd/main.c (modified) (6 diffs)

uspace/drv/uhci-rhd/main.c

@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup usb
+/** @addtogroup drvusbuhcirh
  * @{
  */
 /** @file
- * @brief UHCI driver
+ * @brief UHCI root hub initialization routines
  */
 #include <ddf/driver.h>
@@ -40 +40 @@
 #include <usb/debug.h>
 
-
-
 #include "root_hub.h"
 
@@ -47 +45 @@
 static int hc_get_my_registers(ddf_dev_t *dev,
     uintptr_t *io_reg_address, size_t *io_reg_size);
+#if 0
 /*----------------------------------------------------------------------------*/
 static int usb_iface_get_hc_handle(ddf_fun_t *fun, devman_handle_t *handle)
@@ -67 +66 @@
         .interfaces[USB_DEV_IFACE] = &uhci_rh_usb_iface,
 };
+#endif
 /*----------------------------------------------------------------------------*/
-/** Initializes a new ddf driver instance of UHCI root hub.
+/** Initialize a new ddf driver instance of UHCI root hub.
  *
  * @param[in] device DDF instance of the device to initialize.
@@ -81 +81 @@
 
         //device->ops = &uhci_rh_ops;
-        (void) uhci_rh_ops;
-
-        uhci_root_hub_t *rh = malloc(sizeof(uhci_root_hub_t));
-        if (!rh) {
-                usb_log_error("Failed to allocate memory for driver instance.\n");
-                return ENOMEM;
-        }
-
         uintptr_t io_regs = 0;
         size_t io_size = 0;
 
         int ret = hc_get_my_registers(device, &io_regs, &io_size);
-        assert(ret == EOK);
+        if (ret != EOK) {
+                usb_log_error("Failed(%d) to get registers from parent hc.",
+                    ret);
+        }
+        usb_log_info("I/O regs at %#X (size %zu).\n", io_regs, io_size);
 
-        /* TODO: verify values from hc */
-        usb_log_info("I/O regs at 0x%X (size %zu).\n", io_regs, io_size);
+        uhci_root_hub_t *rh = malloc(sizeof(uhci_root_hub_t));
+        if (!rh) {
+                usb_log_error("Failed to allocate driver instance.\n");
+                return ENOMEM;
+        }
+
         ret = uhci_root_hub_init(rh, (void*)io_regs, io_size, device);
         if (ret != EOK) {
@@ -119 +119 @@
 };
 /*----------------------------------------------------------------------------*/
-/** Initializes global driver structures (NONE).
+/** Initialize global driver structures (NONE).
  *
  * @param[in] argc Nmber of arguments in argv vector (ignored).