Changeset 1d1bb0f in mainline for uspace/drv/ehci

Timestamp:

2011-06-19T13:38:37Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b72efe8

Parents:

adfdbd5 (diff), 9724d7f (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 from ​https://code.launchpad.net/~vojtech-horky/helenos/usb

Location:

uspace/drv/ehci

Files:

• Makefile (moved) (moved from uspace/drv/ehci_hcd/Makefile ) (1 diff)
• ehci.h (moved) (moved from uspace/drv/ehci_hcd/ehci.h ) (1 diff)
• ehci.ma (moved) (moved from uspace/drv/ehci_hcd/ehci_hcd.ma )
• hc_iface.c (moved) (moved from uspace/drv/ehci_hcd/hc_iface.c ) (1 diff)
• main.c (moved) (moved from uspace/drv/ehci_hcd/main.c )
• pci.c (moved) (moved from uspace/drv/ehci_hcd/pci.c )
• pci.h (moved) (moved from uspace/drv/ehci_hcd/pci.h )

uspace/drv/ehci/Makefile

@@ -38 +38 @@
         -I$(LIBDRV_PREFIX)/include
 
-BINARY = ehci_hcd
+BINARY = ehci
 
 SOURCES = \

uspace/drv/ehci/ehci.h

@@ -38 +38 @@
 #include <usbhc_iface.h>
 
-#define NAME "ehci_hcd"
+#define NAME "ehci"
 
 extern usbhc_iface_t ehci_hc_iface;

uspace/drv/ehci/hc_iface.c

@@ -45 +45 @@
 
 #define UNSUPPORTED(methodname) \
-        usb_log_warning("Unsupported interface method `%s()' in %s:%d.\n", \
+        usb_log_debug("Client called unsupported interface method " \
+            "`%s()' in %s:%d.\n", \
             methodname, __FILE__, __LINE__)