Changes in uspace/lib/drv/include/usbhc_iface.h [b7d8fd9:357a302] in mainline

File:

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

uspace/lib/drv/include/usbhc_iface.h

@@ -38 +38 @@
 #define LIBDRV_USBHC_IFACE_H_
 
-#include "ddf/driver.h"
+#include "driver.h"
 #include <usb/usb.h>
 #include <bool.h>
@@ -167 +167 @@
         IPC_M_USBHC_CONTROL_READ,
 
-        /** Register endpoint attributes at host controller.
-         * This is used to reserve portion of USB bandwidth.
-         * Parameters:
-         * - USB address + endpoint number (ADDR * 256 + EP)
-         * - transfer type + direction (TYPE * 256 + DIR)
-         * - maximum packet size
-         * - interval (in milliseconds)
-         * Answer:
-         * - EOK - reservation successful
-         * - ELIMIT - not enough bandwidth to satisfy the request
-         */
-        IPC_M_USBHC_REGISTER_ENDPOINT,
-
-        /** Revert endpoint registration.
-         * Parameters:
-         * - USB address
-         * - endpoint number
-         * - data direction
-         * Answer:
-         * - EOK - endpoint unregistered
-         * - ENOENT - unknown endpoint
-         */
-        IPC_M_USBHC_UNREGISTER_ENDPOINT
+        /* IPC_M_USB_ */
 } usbhc_iface_funcs_t;
 
 /** Callback for outgoing transfer. */
-typedef void (*usbhc_iface_transfer_out_callback_t)(ddf_fun_t *,
+typedef void (*usbhc_iface_transfer_out_callback_t)(device_t *,
     int, void *);
 
 /** Callback for incoming transfer. */
-typedef void (*usbhc_iface_transfer_in_callback_t)(ddf_fun_t *,
+typedef void (*usbhc_iface_transfer_in_callback_t)(device_t *,
     int, size_t, void *);
 
 
 /** Out transfer processing function prototype. */
-typedef int (*usbhc_iface_transfer_out_t)(ddf_fun_t *, usb_target_t, size_t,
+typedef int (*usbhc_iface_transfer_out_t)(device_t *, usb_target_t, size_t,
     void *, size_t,
     usbhc_iface_transfer_out_callback_t, void *);
@@ -210 +188 @@
 
 /** In transfer processing function prototype. */
-typedef int (*usbhc_iface_transfer_in_t)(ddf_fun_t *, usb_target_t, size_t,
+typedef int (*usbhc_iface_transfer_in_t)(device_t *, usb_target_t, size_t,
     void *, size_t,
     usbhc_iface_transfer_in_callback_t, void *);
@@ -216 +194 @@
 /** USB host controller communication interface. */
 typedef struct {
-        int (*reserve_default_address)(ddf_fun_t *, usb_speed_t);
-        int (*release_default_address)(ddf_fun_t *);
-        int (*request_address)(ddf_fun_t *, usb_speed_t, usb_address_t *);
-        int (*bind_address)(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 (*reserve_default_address)(device_t *, usb_speed_t);
+        int (*release_default_address)(device_t *);
+        int (*request_address)(device_t *, usb_speed_t, usb_address_t *);
+        int (*bind_address)(device_t *, usb_address_t, devman_handle_t);
+        int (*release_address)(device_t *, usb_address_t);
 
         usbhc_iface_transfer_out_t interrupt_out;
@@ -233 +206 @@
         usbhc_iface_transfer_in_t bulk_in;
 
-        int (*control_write)(ddf_fun_t *, usb_target_t,
+        int (*control_write)(device_t *, usb_target_t,
             size_t,
             void *, size_t, void *, size_t,
             usbhc_iface_transfer_out_callback_t, void *);
 
-        int (*control_read)(ddf_fun_t *, usb_target_t,
+        int (*control_read)(device_t *, usb_target_t,
             size_t,
             void *, size_t, void *, size_t,