Changeset 70c85211 in mainline for uspace/lib/drv/include/usbhc_iface.h

Timestamp:

2010-12-03T13:03:26Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

101ef25c

Parents:

bbc28be (diff), 4570779 (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 branch development into lelian/hidd

File:

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

uspace/lib/drv/include/usbhc_iface.h

@@ -92 +92 @@
  */
 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 by HC (shall not happen)
+         * - arbitrary error code if returned by remote implementation
+         * - EOK - handle found, first parameter contains the USB address
+         */
+        IPC_M_USBHC_GET_ADDRESS,
+
         /** Asks for data buffer.
          * See explanation at usb_iface_funcs_t.
@@ -155 +166 @@
     usb_transaction_outcome_t, size_t, void *);
 
+
+/** Out transfer processing function prototype. */
+typedef int (*usbhc_iface_transfer_out_t)(device_t *, usb_target_t,
+    void *, size_t,
+    usbhc_iface_transfer_out_callback_t, void *);
+
+/** Setup transfer processing function prototype. */
+typedef usbhc_iface_transfer_out_t usbhc_iface_transfer_setup_t;
+
+/** In transfer processing function prototype. */
+typedef int (*usbhc_iface_transfer_in_t)(device_t *, usb_target_t,
+    void *, size_t,
+    usbhc_iface_transfer_in_callback_t, void *);
+
 /** USB devices communication interface. */
 typedef struct {
-        int (*interrupt_out)(device_t *, usb_target_t,
-            void *, size_t,
+        int (*tell_address)(device_t *, devman_handle_t, usb_address_t *);
+
+        usbhc_iface_transfer_out_t interrupt_out;
+        usbhc_iface_transfer_in_t interrupt_in;
+
+        usbhc_iface_transfer_setup_t control_write_setup;
+        usbhc_iface_transfer_out_t control_write_data;
+        int (*control_write_status)(device_t *, usb_target_t,
+            usbhc_iface_transfer_in_callback_t, void *);
+
+        usbhc_iface_transfer_setup_t control_read_setup;
+        usbhc_iface_transfer_in_t control_read_data;
+        int (*control_read_status)(device_t *, usb_target_t,
             usbhc_iface_transfer_out_callback_t, void *);
-        int (*interrupt_in)(device_t *, usb_target_t,
-            void *, size_t,
-            usbhc_iface_transfer_in_callback_t, void *);
 } usbhc_iface_t;