Changeset bb512b2d in mainline

Timestamp:

2013-01-26T16:12:18Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

7c69861

Parents:

9e79a2f

Message:

libusbdev: Add ddf function creation wrapper.

Cleanup request.h header.

Location:

uspace/lib/usbdev

Files:

• include/usb/dev/driver.h (modified) (1 diff)
• include/usb/dev/recognise.h (modified) (2 diffs)
• include/usb/dev/request.h (modified) (1 diff)
• src/devdrv.c (modified) (1 diff)

uspace/lib/usbdev/include/usb/dev/driver.h

@@ -171 +171 @@
 
 const char* usb_device_get_name(usb_device_t *);
+ddf_fun_t *usb_device_ddf_fun_create(usb_device_t *, fun_type_t, const char *);
 
 async_exch_t * usb_device_bus_exchange_begin(usb_device_t *);

uspace/lib/usbdev/include/usb/dev/recognise.h

@@ -37 +37 @@
 #define LIBUSBDEV_RECOGNISE_H_
 
-#include <sys/types.h>
 #include <usb/usb.h>
 #include <usb/dev/pipes.h>
-#include <ipc/devman.h>
 
 extern int usb_device_create_match_ids_from_device_descriptor(
@@ -50 +48 @@
 
 extern int usb_device_create_match_ids(usb_pipe_t *, match_id_list_t *);
-
-extern int usb_device_register_child_in_devman(usb_pipe_t *ctrl_pipe,
-    ddf_dev_t *, ddf_fun_t **);
-
 #endif
 

uspace/lib/usbdev/include/usb/dev/request.h

@@ -75 +75 @@
 int usb_request_get_configuration(usb_pipe_t *, uint8_t *);
 int usb_request_set_configuration(usb_pipe_t *, uint8_t);
+
 int usb_request_get_interface(usb_pipe_t *, uint8_t, uint8_t *);
 int usb_request_set_interface(usb_pipe_t *, uint8_t, uint8_t);

uspace/lib/usbdev/src/devdrv.c

@@ -543 +543 @@
 }
 
+ddf_fun_t *usb_device_ddf_fun_create(usb_device_t *usb_dev, fun_type_t ftype,
+    const char* name)
+{
+        assert(usb_dev);
+        if (usb_dev->ddf_dev)
+                return ddf_fun_create(usb_dev->ddf_dev, ftype, name);
+        return NULL;
+}
+
 async_exch_t * usb_device_bus_exchange_begin(usb_device_t *usb_dev)
 {