Changes in uspace/drv/uhci-hcd/uhci.c [4125b7d:fa3de85] in mainline

File:

• uspace/drv/uhci-hcd/uhci.c (modified) (14 diffs)

uspace/drv/uhci-hcd/uhci.c

@@ -44 +44 @@
 #include "pci.h"
 
-/** IRQ handling callback, forward status from call to diver structure.
+/** IRQ handling callback, identifies device
  *
  * @param[in] dev DDF instance of the device to use.
  * @param[in] iid (Unused).
- * @param[in] call Pointer to the call from kernel.
+ * @param[in] call Pointer to the call that represents interrupt.
  */
 static void irq_handler(ddf_dev_t *dev, ipc_callid_t iid, ipc_call_t *call)
@@ -61 +61 @@
 /** Get address of the device identified by handle.
  *
- * @param[in] fun DDF instance of the function to use.
- * @param[in] handle DDF handle of the driver seeking its USB address.
- * @param[out] address Found address.
+ * @param[in] dev DDF instance of the device to use.
+ * @param[in] iid (Unused).
+ * @param[in] call Pointer to the call that represents interrupt.
  */
 static int usb_iface_get_address(
@@ -69 +69 @@
 {
         assert(fun);
-        usb_device_keeper_t *manager =
-            &((uhci_t*)fun->dev->driver_data)->hc.manager;
+        usb_device_keeper_t *manager = &((uhci_t*)fun->dev->driver_data)->hc.manager;
 
         usb_address_t addr = usb_device_keeper_find(manager, handle);
@@ -84 +83 @@
 }
 /*----------------------------------------------------------------------------*/
-/** Gets handle of the respective hc.
- *
- * @param[in] fun DDF function of uhci device.
- * @param[out] handle Host cotnroller handle.
+/** Gets handle of the respective hc (this or parent device).
+ *
+ * @param[in] root_hub_fun Root hub function seeking hc handle.
+ * @param[out] handle Place to write the handle.
  * @return Error code.
  */
@@ -101 +100 @@
 }
 /*----------------------------------------------------------------------------*/
-/** USB interface implementation used by RH */
+/** This iface is generic for both RH and HC. */
 static usb_iface_t usb_iface = {
         .get_hc_handle = usb_iface_get_hc_handle,
@@ -107 +106 @@
 };
 /*----------------------------------------------------------------------------*/
-/** Operations supported by the HC driver */
 static ddf_dev_ops_t hc_ops = {
+//      .interfaces[USB_DEV_IFACE] = &usb_iface,
         .interfaces[USBHC_DEV_IFACE] = &hc_iface, /* see iface.h/c */
 };
@@ -123 +122 @@
 }
 /*----------------------------------------------------------------------------*/
-/** Interface to provide the root hub driver with hw info */
 static hw_res_ops_t hw_res_iface = {
         .get_resource_list = get_resource_list,
@@ -129 +127 @@
 };
 /*----------------------------------------------------------------------------*/
-/** RH function support for uhci-rhd */
 static ddf_dev_ops_t rh_ops = {
         .interfaces[USB_DEV_IFACE] = &usb_iface,
@@ -135 +132 @@
 };
 /*----------------------------------------------------------------------------*/
-/** Initialize hc and rh DDF structures and their respective drivers.
+/** Initialize hc and rh ddf structures and their respective drivers.
  *
  * @param[in] instance UHCI structure to use.
@@ -141 +138 @@
  *
  * This function does all the preparatory work for hc and rh drivers:
- *  - gets device's hw resources
- *  - disables UHCI legacy support (PCI config space)
+ *  - gets device hw resources
+ *  - disables UHCI legacy support
  *  - asks for interrupt
  *  - registers interrupt handler
@@ -168 +165 @@
             pci_get_my_registers(device, &io_reg_base, &io_reg_size, &irq);
         CHECK_RET_DEST_FUN_RETURN(ret,
-            "Failed to get I/O addresses for %" PRIun ": %s.\n",
-            device->handle, str_error(ret));
-        usb_log_debug("I/O regs at 0x%p (size %zu), IRQ %d.\n",
-            (void *) io_reg_base, io_reg_size, irq);
+            "Failed(%d) to get I/O addresses:.\n", ret, device->handle);
+        usb_log_debug("I/O regs at 0x%X (size %zu), IRQ %d.\n",
+            io_reg_base, io_reg_size, irq);
 
         ret = pci_disable_legacy(device);
@@ -197 +193 @@
         ret = (instance->hc_fun == NULL) ? ENOMEM : EOK;
         CHECK_RET_DEST_FUN_RETURN(ret,
-            "Failed(%d) to create HC function: %s.\n", ret, str_error(ret));
+            "Failed(%d) to create HC function.\n", ret);
 
         ret = hc_init(&instance->hc, instance->hc_fun,
             (void*)io_reg_base, io_reg_size, interrupts);
-        CHECK_RET_DEST_FUN_RETURN(ret,
-            "Failed(%d) to init uhci-hcd: %s.\n", ret, str_error(ret));
-
+        CHECK_RET_DEST_FUN_RETURN(ret, "Failed(%d) to init uhci-hcd.\n", ret);
         instance->hc_fun->ops = &hc_ops;
         instance->hc_fun->driver_data = &instance->hc;
@@ -227 +221 @@
             &instance->hc.interrupt_code);
         CHECK_RET_FINI_RETURN(ret,
-            "Failed(%d) to register interrupt handler: %s.\n",
-            ret, str_error(ret));
+            "Failed(%d) to register interrupt handler.\n", ret);
 
         instance->rh_fun = ddf_fun_create(device, fun_inner, "uhci-rh");
         ret = (instance->rh_fun == NULL) ? ENOMEM : EOK;
         CHECK_RET_FINI_RETURN(ret,
-            "Failed(%d) to create root hub function: %s.\n",
-            ret, str_error(ret));
+            "Failed(%d) to create root hub function.\n", ret);
 
         ret = rh_init(&instance->rh, instance->rh_fun,
             (uintptr_t)instance->hc.registers + 0x10, 4);
         CHECK_RET_FINI_RETURN(ret,
-            "Failed(%d) to setup UHCI root hub: %s.\n", ret, str_error(ret));
+            "Failed(%d) to setup UHCI root hub.\n", ret);
 
         instance->rh_fun->ops = &rh_ops;
@@ -245 +237 @@
         ret = ddf_fun_bind(instance->rh_fun);
         CHECK_RET_FINI_RETURN(ret,
-            "Failed(%d) to register UHCI root hub: %s.\n", ret, str_error(ret));
+            "Failed(%d) to register UHCI root hub.\n", ret);
 
         return EOK;