Changeset 3b5c119 in mainline for uspace/drv/bus/usb/ohci/ohci.c

Timestamp:

2012-04-08T08:07:21Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

1196df6

Parents:

ce6de59 (diff), f3378ba (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 with mainline

File:

• uspace/drv/bus/usb/ohci/ohci.c (modified) (3 diffs)

uspace/drv/bus/usb/ohci/ohci.c

@@ -42 +42 @@
 
 #include "ohci.h"
-#include "pci.h"
+#include "res.h"
 #include "hc.h"
 
@@ -180 +180 @@
         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 register memory addresses for %" PRIun ": %s.\n",
@@ -211 +211 @@
         /* Try to enable interrupts */
         bool interrupts = false;
-        ret = pci_enable_interrupts(device);
+        ret = enable_interrupts(device);
         if (ret != EOK) {
                 usb_log_warning("Failed to enable interrupts: %s."