Changeset c48f6ab in mainline for uspace/drv/bus

Timestamp:

2011-11-30T20:14:37Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

1f5c9c96

Parents:

fb48a0e (diff), f9776ae5 (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 branch

Mostly cleanups.

Location:

uspace/drv/bus/usb

Files:

• ehci/Makefile (modified) (1 diff)
• ehci/ehci.h (deleted)
• ehci/hc_iface.c (deleted)
• ehci/main.c (modified) (3 diffs)
• usbmid/explore.c (modified) (1 diff)
• usbmid/usbmid.c (modified) (2 diffs)
• vhc/connhost.c (modified) (1 diff)

uspace/drv/bus/usb/ehci/Makefile

@@ -42 +42 @@
 
 SOURCES = \
-        hc_iface.c \
         main.c \
         pci.c

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

@@ -42 +42 @@
 #include <usb/ddfiface.h>
 #include <usb/debug.h>
+#include <usb/host/hcd.h>
 
 #include "pci.h"
-#include "ehci.h"
+
+#define NAME "ehci"
 
 static int ehci_dev_add(ddf_dev_t *device);
@@ -57 +59 @@
 };
 static ddf_dev_ops_t hc_ops = {
-        .interfaces[USBHC_DEV_IFACE] = &ehci_hc_iface,
+        .interfaces[USBHC_DEV_IFACE] = &hcd_iface,
 };
 
@@ -95 +97 @@
                 return ENOMEM;
         }
+        hcd_t *ehci_hc = ddf_fun_data_alloc(hc_fun, sizeof(hcd_t));
+        if (ehci_hc == NULL) {
+                usb_log_error("Failed to alloc generic HC driver.\n");
+                return ENOMEM;
+        }
+        /* High Speed, no bandwidth */
+        hcd_init(ehci_hc, USB_SPEED_HIGH, 0, NULL);
         hc_fun->ops = &hc_ops;
 

uspace/drv/bus/usb/usbmid/explore.c

@@ -54 +54 @@
  * @return Interface @p interface_no is already present in the list.
  */
-static bool interface_in_list(list_t *list, int interface_no)
+static bool interface_in_list(const list_t *list, int interface_no)
 {
         list_foreach(*list, l) {

uspace/drv/bus/usb/usbmid/usbmid.c

@@ -45 +45 @@
 
 /** Callback for DDF USB interface. */
-static int usb_iface_get_interface_impl(ddf_fun_t *fun, devman_handle_t handle,
-    int *iface_no)
+static int usb_iface_get_interface_impl(ddf_fun_t *fun, int *iface_no)
 {
         assert(fun);
@@ -64 +63 @@
         .get_hc_handle = usb_iface_get_hc_handle_device_impl,
         .get_my_address = usb_iface_get_my_address_forward_impl,
-        .get_interface = usb_iface_get_interface_impl,
+        .get_my_interface = usb_iface_get_interface_impl,
 };
 

uspace/drv/bus/usb/vhc/connhost.c

@@ -508 +508 @@
         .request_address = request_address,
         .bind_address = bind_address,
-        .find_by_address = find_by_address,
+        .get_handle = find_by_address,
         .release_address = release_address,