Changeset 6297465 in mainline

Timestamp:

2013-12-31T07:45:34Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

4c14b88

Parents:

2c24983

Message:

ehci: Add skeleton driver.

Mostly copied from ohci. Reports root hub correctly, does nothing else.

Location:

uspace/drv/bus/usb/ehci

Files:

• Makefile (modified) (3 diffs)
• ehci.c (added)
• ehci.h (added)
• ehci_rh.c (added)
• ehci_rh.h (added)
• hc.c (added)
• hc.h (added)
• main.c (modified) (2 diffs)
• utils/malloc32.h (added)

uspace/drv/bus/usb/ehci/Makefile

@@ -31 +31 @@
 LIBS = \
         $(LIBUSBHOST_PREFIX)/libusbhost.a \
+        $(LIBUSBVIRT_PREFIX)/libusbvirt.a \
         $(LIBUSB_PREFIX)/libusb.a \
         $(LIBDRV_PREFIX)/libdrv.a
@@ -36 +37 @@
 EXTRA_CFLAGS += \
         -I$(LIBUSB_PREFIX)/include \
+        -I$(LIBUSBDEV_PREFIX)/include \
         -I$(LIBUSBHOST_PREFIX)/include \
+        -I$(LIBUSBVIRT_PREFIX)/include \
         -I$(LIBDRV_PREFIX)/include
 
@@ -42 +45 @@
 
 SOURCES = \
+        ehci.c \
+        ehci_rh.c \
+        hc.c \
         main.c \
         res.c

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

@@ -44 +44 @@
 
 #include "res.h"
+#include "ehci.h"
 
 #define NAME "ehci"
@@ -91 +92 @@
 
         /* High Speed, no bandwidth */
-        ret = hcd_ddf_setup_hc(device, USB_SPEED_HIGH, 0, NULL);
+        ret = device_setup_ehci(device);
         if (ret != EOK) {
-                usb_log_error("Failed to init generci hcd driver: %s\n",
+                usb_log_error("Failed to init ehci driver: %s\n",
                     str_error(ret));
                 return ret;