Changeset f3378ba in mainline for uspace/drv/bus/usb/ehci

Timestamp:

2012-04-08T05:53:34Z (14 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.

Location:

uspace/drv/bus/usb/ehci

Files:

• Makefile (modified) (1 diff)
• main.c (modified) (3 diffs)
• pci.c (deleted)
• res.c (added)
• res.h (moved) (moved from uspace/drv/bus/usb/ehci/pci.h ) (1 diff)

uspace/drv/bus/usb/ehci/Makefile

@@ -43 +43 @@
 SOURCES = \
         main.c \
-        pci.c
+        res.c
 
 include $(USPACE_PREFIX)/Makefile.common

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));

uspace/drv/bus/usb/ehci/res.h

@@ -38 +38 @@
 #include <ddf/driver.h>
 
-int pci_get_my_registers(const ddf_dev_t *, uintptr_t *, size_t *, int *);
-int pci_enable_interrupts(const ddf_dev_t *);
-int pci_disable_legacy(const ddf_dev_t *, uintptr_t, size_t, int);
+int get_my_registers(const ddf_dev_t *, uintptr_t *, size_t *, int *);
+int enable_interrupts(const ddf_dev_t *);
+int disable_legacy(const ddf_dev_t *, uintptr_t, size_t);
 
 #endif