Changeset f3378ba in mainline for uspace/drv/bus/usb/uhci/uhci.c

Timestamp:

2012-04-08T05:53:34Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

3b5c119, 81716eb, 90924df, e3a050c7

Parents:

41455a22 (diff), 5b7ba8d (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:

USB HC: Minor fixes, cleanup, and refactoring.

Tested on qemu,vbox, n10/ich7.

File:

• uspace/drv/bus/usb/uhci/uhci.c (modified) (5 diffs)

uspace/drv/bus/usb/uhci/uhci.c

@@ -41 +41 @@
 
 #include "uhci.h"
-#include "pci.h"
-
+
+#include "res.h"
 #include "hc.h"
 #include "root_hub.h"
@@ -49 +49 @@
  * and USB root hub */
 typedef struct uhci {
-        /** Pointer to DDF represenation of UHCI host controller */
+        /** Pointer to DDF representation of UHCI host controller */
         ddf_fun_t *hc_fun;
-        /** Pointer to DDF represenation of UHCI root hub */
+        /** Pointer to DDF representation of UHCI root hub */
         ddf_fun_t *rh_fun;
 
-        /** Internal driver's represenation of UHCI host controller */
+        /** Internal driver's representation of UHCI host controller */
         hc_t hc;
-        /** Internal driver's represenation of UHCI root hub */
+        /** Internal driver's representation of UHCI root hub */
         rh_t rh;
 } uhci_t;
@@ -187 +187 @@
         int irq = 0;
 
-        ret = pci_get_my_registers(device, &reg_base, &reg_size, &irq);
+        ret = get_my_registers(device, &reg_base, &reg_size, &irq);
         CHECK_RET_DEST_FREE_RETURN(ret,
             "Failed to get I/O addresses for %" PRIun ": %s.\n",
@@ -194 +194 @@
             (void *) reg_base, reg_size, irq);
 
-        ret = pci_disable_legacy(device);
+        ret = disable_legacy(device);
         CHECK_RET_DEST_FREE_RETURN(ret,
             "Failed to disable legacy USB: %s.\n", str_error(ret));
@@ -220 +220 @@
 
         bool interrupts = false;
-        ret = pci_enable_interrupts(device);
+        ret = enable_interrupts(device);
         if (ret != EOK) {
                 usb_log_warning("Failed to enable interrupts: %s."