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

Timestamp:

2011-03-17T12:45:23Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

4fec9ee, 6e3b9a58

Parents:

45dd8bf (diff), 039c66c (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:

Merged development changes

File:

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

uspace/drv/uhci-rhd/root_hub.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 driver
  */
 #include <errno.h>
-#include <stdint.h>
 #include <ddi.h>
-#include <devman.h>
 #include <usb/debug.h>
 
 #include "root_hub.h"
 
-/** Initializes UHCI root hub instance.
+/** Initialize 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.
+ * @param[in] rh Pointer to ddf instance of the root hub driver.
  * @return Error code.
  */
@@ -61 +59 @@
         if (ret < 0) {
                 usb_log_error(
-                    "Failed to gain access to port registers at %p\n", regs);
+                    "Failed(%d) to gain access to port registers at %p\n",
+                    ret, regs);
                 return ret;
         }
 
-        /* add fibrils for periodic port checks */
+        /* Initialize root hub ports */
         unsigned i = 0;
         for (; i < UHCI_ROOT_HUB_PORT_COUNT; ++i) {
@@ -82 +81 @@
 }
 /*----------------------------------------------------------------------------*/
-/** Finishes UHCI root hub instance.
+/** Cleanup UHCI root hub instance.
  *
- * @param[in] instance Driver memory structure to use.
+ * @param[in] instance Root hub structure to use.
  * @return Error code.
  */