Changeset 41df71f9 in mainline for uspace/lib/usbhost/src/ddf_helpers.c

Timestamp:

2017-11-02T14:29:15Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

887c9de

Parents:

479e32d

Message:

ddf: split usb interface to usb and usbhc

File:

• uspace/lib/usbhost/src/ddf_helpers.c (modified) (5 diffs)

uspace/lib/usbhost/src/ddf_helpers.c

@@ -53 +53 @@
 #include <str_error.h>
 #include <usb_iface.h>
+#include <usbhc_iface.h>
 
 #include "ddf_helpers.h"
@@ -218 +219 @@
 static int dev_read(ddf_fun_t *fun, usb_target_t target,
     uint64_t setup_data, char *data, size_t size,
-    usb_iface_transfer_callback_t callback, void *arg)
+    usbhc_iface_transfer_callback_t callback, void *arg)
 {
         assert(fun);
@@ -244 +245 @@
 static int dev_write(ddf_fun_t *fun, usb_target_t target,
     uint64_t setup_data, const char *data, size_t size,
-    usb_iface_transfer_callback_t callback, void *arg)
+    usbhc_iface_transfer_callback_t callback, void *arg)
 {
         assert(fun);
@@ -261 +262 @@
 static usb_iface_t usb_iface = {
         .get_my_device_handle = get_my_device_handle,
-
+};
+
+/** USB host controller interface */
+static usbhc_iface_t usbhc_iface = {
         .reserve_default_address = reserve_default_address,
         .release_default_address = release_default_address,
@@ -278 +282 @@
 static ddf_dev_ops_t usb_ops = {
         .interfaces[USB_DEV_IFACE] = &usb_iface,
+        .interfaces[USBHC_DEV_IFACE] = &usbhc_iface,
 };