Changeset b4b534ac in mainline for uspace/lib/drv/include

Timestamp:

2016-07-22T08:24:47Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f76d2c2

Parents:

5b18137 (diff), 8351f9a4 (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:

Merge from lp:~jan.vesely/helenos/usb

Location:

uspace/lib/drv/include

Files:

• ddf/driver.h (modified) (1 diff)
• usb_iface.h (modified) (1 diff)
• usbhc_iface.h (modified) (2 diffs)

uspace/lib/drv/include/ddf/driver.h

@@ -132 +132 @@
 extern int ddf_fun_offline(ddf_fun_t *);
 extern int ddf_fun_add_match_id(ddf_fun_t *, const char *, int);
-extern void ddf_fun_set_ops(ddf_fun_t *, ddf_dev_ops_t *);
+extern void ddf_fun_set_ops(ddf_fun_t *, const ddf_dev_ops_t *);
 extern void ddf_fun_set_conn_handler(ddf_fun_t *, async_port_handler_t);
 extern int ddf_fun_add_to_category(ddf_fun_t *, const char *);

uspace/lib/drv/include/usb_iface.h

@@ -42 +42 @@
 #include <usb/usb.h>
 
-int usb_get_my_address(async_exch_t *, usb_address_t *);
+typedef async_sess_t usb_dev_session_t;
+
+usb_dev_session_t *usb_dev_connect(devman_handle_t);
+usb_dev_session_t *usb_dev_connect_to_self(ddf_dev_t *);
+void usb_dev_disconnect(usb_dev_session_t *);
+
 int usb_get_my_interface(async_exch_t *, int *);
-int usb_get_hc_handle(async_exch_t *, devman_handle_t *);
+int usb_get_my_device_handle(async_exch_t *, devman_handle_t *);
+
+int usb_reserve_default_address(async_exch_t *, usb_speed_t);
+int usb_release_default_address(async_exch_t *);
+
+int usb_device_enumerate(async_exch_t *, unsigned port);
+int usb_device_remove(async_exch_t *, unsigned port);
+
+int usb_register_endpoint(async_exch_t *, usb_endpoint_t, usb_transfer_type_t,
+    usb_direction_t, size_t, unsigned, unsigned);
+int usb_unregister_endpoint(async_exch_t *, usb_endpoint_t, usb_direction_t);
+int usb_read(async_exch_t *, usb_endpoint_t, uint64_t, void *, size_t, size_t *);
+int usb_write(async_exch_t *, usb_endpoint_t, uint64_t, const void *, size_t);
+
+/** Callback for outgoing transfer. */
+typedef void (*usb_iface_transfer_out_callback_t)(int, void *);
+
+/** Callback for incoming transfer. */
+typedef void (*usb_iface_transfer_in_callback_t)(int, size_t, void *);
 
 /** USB device communication interface. */
 typedef struct {
-        int (*get_my_address)(ddf_fun_t *, usb_address_t *);
         int (*get_my_interface)(ddf_fun_t *, int *);
-        int (*get_hc_handle)(ddf_fun_t *, devman_handle_t *);
+        int (*get_my_device_handle)(ddf_fun_t *, devman_handle_t *);
+
+        int (*reserve_default_address)(ddf_fun_t *, usb_speed_t);
+        int (*release_default_address)(ddf_fun_t *);
+
+        int (*device_enumerate)(ddf_fun_t *, unsigned);
+        int (*device_remove)(ddf_fun_t *, unsigned);
+
+        int (*register_endpoint)(ddf_fun_t *, usb_endpoint_t,
+            usb_transfer_type_t, usb_direction_t, size_t, unsigned, unsigned);
+        int (*unregister_endpoint)(ddf_fun_t *, usb_endpoint_t,
+            usb_direction_t);
+
+        int (*read)(ddf_fun_t *, usb_endpoint_t, uint64_t, uint8_t *, size_t,
+            usb_iface_transfer_in_callback_t, void *);
+        int (*write)(ddf_fun_t *, usb_endpoint_t, uint64_t, const uint8_t *,
+            size_t, usb_iface_transfer_out_callback_t, void *);
 } usb_iface_t;
 

uspace/lib/drv/include/usbhc_iface.h

@@ -44 +44 @@
 #include <stdbool.h>
 
-int usbhc_request_address(async_exch_t *, usb_address_t *, bool, usb_speed_t);
-int usbhc_bind_address(async_exch_t *, usb_address_t, devman_handle_t);
-int usbhc_get_handle(async_exch_t *, usb_address_t, devman_handle_t *);
-int usbhc_release_address(async_exch_t *, usb_address_t);
-int usbhc_register_endpoint(async_exch_t *, usb_address_t, usb_endpoint_t,
-    usb_transfer_type_t, usb_direction_t, size_t, unsigned int);
-int usbhc_unregister_endpoint(async_exch_t *, usb_address_t, usb_endpoint_t,
-    usb_direction_t);
 int usbhc_read(async_exch_t *, usb_address_t, usb_endpoint_t,
     uint64_t, void *, size_t, size_t *);
@@ -58 +50 @@
 
 /** Callback for outgoing transfer. */
-typedef void (*usbhc_iface_transfer_out_callback_t)(ddf_fun_t *, int, void *);
+typedef void (*usbhc_iface_transfer_out_callback_t)(int, void *);
 
 /** Callback for incoming transfer. */
-typedef void (*usbhc_iface_transfer_in_callback_t)(ddf_fun_t *,
-    int, size_t, void *);
+typedef void (*usbhc_iface_transfer_in_callback_t)(int, size_t, void *);
 
 /** USB host controller communication interface. */
 typedef struct {
-        int (*request_address)(ddf_fun_t *, usb_address_t *, bool, usb_speed_t);
-        int (*bind_address)(ddf_fun_t *, usb_address_t, devman_handle_t);
-        int (*get_handle)(ddf_fun_t *, usb_address_t,
-            devman_handle_t *);
-        int (*release_address)(ddf_fun_t *, usb_address_t);
-
-        int (*register_endpoint)(ddf_fun_t *,
-            usb_address_t, usb_endpoint_t,
-            usb_transfer_type_t, usb_direction_t, size_t, unsigned int);
-        int (*unregister_endpoint)(ddf_fun_t *, usb_address_t, usb_endpoint_t,
-            usb_direction_t);
-
         int (*read)(ddf_fun_t *, usb_target_t, uint64_t, uint8_t *, size_t,
             usbhc_iface_transfer_in_callback_t, void *);
-
         int (*write)(ddf_fun_t *, usb_target_t, uint64_t, const uint8_t *,
             size_t, usbhc_iface_transfer_out_callback_t, void *);