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

Timestamp:

2012-04-08T08:07:21Z (13 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/ehci/main.c (modified) (3 diffs)

uspace/drv/bus/usb/ehci/main.c

@@ -44 +44 @@
 #include <usb/host/hcd.h>
 
-#include "pci.h"
+#include "res.h"
 
 #define NAME "ehci"
@@ -81 +81 @@
         int irq = 0;
 
-        int ret = pci_get_my_registers(device, &reg_base, &reg_size, &irq);
+        int ret = get_my_registers(device, &reg_base, &reg_size, &irq);
         CHECK_RET_RETURN(ret,
             "Failed to get memory addresses for %" PRIun ": %s.\n",
@@ -88 +88 @@
             reg_base, reg_size, irq);
 
-        ret = pci_disable_legacy(device, reg_base, reg_size, irq);
+        ret = disable_legacy(device, reg_base, reg_size);
         CHECK_RET_RETURN(ret,
             "Failed to disable legacy USB: %s.\n", str_error(ret));