Changes in uspace/lib/drv/include/usbhc_iface.h [d4da860:41df71f9] in mainline

File:

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

uspace/lib/drv/include/usbhc_iface.h

@@ -1 +1 @@
 /*
  * Copyright (c) 2010 Vojtech Horky
- * Copyright (c) 2011 Jan Vesely
+ * Copyright (c) 2017 Ondrej Hlavaty
  * All rights reserved.
  *
@@ -32 +32 @@
  * @{
  */
-
 /** @file
- * @brief USB host controller interface definition.
+ * @brief USB host controler interface definition. This is the interface of
+ * USB host controller function, which can be used by usb device drivers.
  */
 
@@ -41 +41 @@
 
 #include "ddf/driver.h"
-#include <usb_iface.h>
-#include <stdbool.h>
+#include <async.h>
+#include <usb/usb.h>
 
-extern int usbhc_read(async_exch_t *, usb_address_t, usb_endpoint_t,
-    uint64_t, void *, size_t, size_t *);
-extern int usbhc_write(async_exch_t *, usb_address_t, usb_endpoint_t,
-    uint64_t, const void *, size_t);
+extern int usbhc_reserve_default_address(async_exch_t *, usb_speed_t);
+extern int usbhc_release_default_address(async_exch_t *);
 
-/** Callback for outgoing transfer. */
-typedef void (*usbhc_iface_transfer_out_callback_t)(int, void *);
+extern int usbhc_device_enumerate(async_exch_t *, unsigned port);
+extern int usbhc_device_remove(async_exch_t *, unsigned port);
 
-/** Callback for incoming transfer. */
-typedef void (*usbhc_iface_transfer_in_callback_t)(int, size_t, void *);
+extern int usbhc_register_endpoint(async_exch_t *, usb_endpoint_desc_t *);
+extern int usbhc_unregister_endpoint(async_exch_t *, usb_endpoint_desc_t *);
+extern int usbhc_read(async_exch_t *, usb_endpoint_t, uint64_t, void *, size_t,
+    size_t *);
+extern int usbhc_write(async_exch_t *, usb_endpoint_t, uint64_t, const void *,
+    size_t);
 
-/** USB host controller communication interface. */
+/** Defined in usb/host/usb_transfer_batch.h */
+typedef struct usb_transfer_batch usb_transfer_batch_t;
+
+/** Callback for outgoing transfer - clone of usb_transfer_batch_callback_t */
+typedef int (*usbhc_iface_transfer_callback_t)(usb_transfer_batch_t *);
+
+/** USB device communication interface. */
 typedef struct {
-        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 *);
+        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_desc_t *);
+        int (*unregister_endpoint)(ddf_fun_t *, usb_endpoint_desc_t *);
+
+        int (*read)(ddf_fun_t *, usb_target_t,
+                uint64_t, char *, size_t,
+                usbhc_iface_transfer_callback_t, void *);
+        int (*write)(ddf_fun_t *, usb_target_t,
+                uint64_t, const char *, size_t,
+                usbhc_iface_transfer_callback_t, void *);
 } usbhc_iface_t;
-
 
 #endif