Changes in uspace/lib/usbhost/include/usb/host/hcd.h [8d2dd7f2:479e32d] in mainline

File:

• uspace/lib/usbhost/include/usb/host/hcd.h (modified) (6 diffs)

uspace/lib/usbhost/include/usb/host/hcd.h

@@ -38 +38 @@
 
 #include <usb/host/endpoint.h>
-#include <usb/host/usb_bus.h>
+#include <usb/host/bus.h>
 #include <usb/host/usb_transfer_batch.h>
 #include <usb/usb.h>
 
 #include <assert.h>
-#include <usbhc_iface.h>
+#include <mem.h>
 #include <stddef.h>
 #include <stdint.h>
@@ -50 +50 @@
 
 typedef int (*schedule_hook_t)(hcd_t *, usb_transfer_batch_t *);
-typedef int (*ep_add_hook_t)(hcd_t *, endpoint_t *);
-typedef void (*ep_remove_hook_t)(hcd_t *, endpoint_t *);
 typedef void (*interrupt_hook_t)(hcd_t *, uint32_t);
 typedef int (*status_hook_t)(hcd_t *, uint32_t *);
+typedef int (*address_device_hook_t)(hcd_t *, usb_speed_t, usb_tt_address_t, usb_address_t *);
 
 typedef struct {
         /** Transfer scheduling, implement in device driver. */
         schedule_hook_t schedule;
-        /** Hook called upon registering new endpoint. */
-        ep_add_hook_t ep_add_hook;
-        /** Hook called upon removing of an endpoint. */
-        ep_remove_hook_t ep_remove_hook;
         /** Hook to be called on device interrupt, passes ARG1 */
         interrupt_hook_t irq_hook;
         /** Periodic polling hook */
         status_hook_t status_hook;
+        /** Hook to setup device address */
+        address_device_hook_t address_device;
 } hcd_ops_t;
 
@@ -71 +68 @@
 struct hcd {
         /** Endpoint manager. */
-        usb_bus_t bus;
+        bus_t *bus;
 
         /** Interrupt replacement fibril */
@@ -78 +75 @@
         /** Driver implementation */
         hcd_ops_t ops;
+
         /** Device specific driver data. */
         void * driver_data;
 };
 
-extern void hcd_init(hcd_t *, usb_speed_t, size_t, bw_count_func_t);
+extern void hcd_init(hcd_t *);
 
 static inline void hcd_set_implementation(hcd_t *hcd, void *data,
-    const hcd_ops_t *ops)
+    const hcd_ops_t *ops, bus_t *bus)
 {
         assert(hcd);
@@ -91 +89 @@
                 hcd->driver_data = data;
                 hcd->ops = *ops;
+                hcd->bus = bus;
         } else {
                 memset(&hcd->ops, 0, sizeof(hcd->ops));
@@ -104 +103 @@
 extern usb_address_t hcd_request_address(hcd_t *, usb_speed_t);
 
-extern int hcd_release_address(hcd_t *, usb_address_t);
-
-extern int hcd_reserve_default_address(hcd_t *, usb_speed_t);
-
-static inline int hcd_release_default_address(hcd_t *hcd)
-{
-        return hcd_release_address(hcd, USB_ADDRESS_DEFAULT);
-}
-
 extern int hcd_add_ep(hcd_t *, usb_target_t, usb_direction_t,
-    usb_transfer_type_t, size_t, unsigned int, size_t, usb_address_t,
-    unsigned int);
+    usb_transfer_type_t, size_t, unsigned int, size_t, usb_tt_address_t);
 
 extern int hcd_remove_ep(hcd_t *, usb_target_t, usb_direction_t);
 
-extern int hcd_send_batch(hcd_t *, usb_target_t, usb_direction_t, void *,
-    size_t, uint64_t, usbhc_iface_transfer_in_callback_t,
-    usbhc_iface_transfer_out_callback_t, void *, const char *);
+extern int hcd_send_batch(hcd_t *, device_t *, usb_target_t,
+    usb_direction_t direction, char *, size_t, uint64_t,
+    usb_transfer_batch_callback_t, void *, const char *);
 
-extern ssize_t hcd_send_batch_sync(hcd_t *, usb_target_t, usb_direction_t,
-    void *, size_t, uint64_t, const char *);
+extern ssize_t hcd_send_batch_sync(hcd_t *, device_t *, usb_target_t,
+    usb_direction_t direction, char *, size_t, uint64_t,
+    const char *);
 
 #endif