Changeset 92574f4 in mainline for uspace/lib/drv/include/usb_iface.h

Timestamp:

2011-02-24T12:03:27Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

e7b7ebd5

Parents:

4837092 (diff), a80849c (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:

Merged development (changes in DDF, etc.).

Conflicts in uspace/drv/usbkbd/main.c

File:

• uspace/lib/drv/include/usb_iface.h (modified) (2 diffs)

uspace/lib/drv/include/usb_iface.h

@@ -38 +38 @@
 #define LIBDRV_USB_IFACE_H_
 
-#include "driver.h"
+#include "ddf/driver.h"
 #include <usb/usb.h>
 typedef enum {
+        /** Tell USB address assigned to device.
+         * Parameters:
+         * - devman handle id
+         * Answer:
+         * - EINVAL - unknown handle or handle not managed by this driver
+         * - ENOTSUP - operation not supported (shall not happen)
+         * - arbitrary error code if returned by remote implementation
+         * - EOK - handle found, first parameter contains the USB address
+         */
+        IPC_M_USB_GET_ADDRESS,
+
+        /** Tell interface number given device can use.
+         * Parameters
+         * - devman handle id of the device
+         * Answer:
+         * - ENOTSUP - operation not supported (can also mean any interface)
+         * - EOK - operation okay, first parameter contains interface number
+         */
+        IPC_M_USB_GET_INTERFACE,
+
         /** Tell devman handle of device host controller.
          * Parameters:
@@ -55 +75 @@
 /** USB device communication interface. */
 typedef struct {
-        int (*get_hc_handle)(device_t *, devman_handle_t *);
+        int (*get_address)(ddf_fun_t *, devman_handle_t, usb_address_t *);
+        int (*get_interface)(ddf_fun_t *, devman_handle_t, int *);
+        int (*get_hc_handle)(ddf_fun_t *, devman_handle_t *);
 } usb_iface_t;