Changeset b4b534ac in mainline for uspace/drv/bus/usb/vhc/vhcd.h

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

File:

• uspace/drv/bus/usb/vhc/vhcd.h (modified) (2 diffs)

uspace/drv/bus/usb/vhc/vhcd.h

@@ -36 +36 @@
 #define VHCD_VHCD_H_
 
-#include <usb/debug.h>
 #include <usbvirt/device.h>
-#include <usb/host/usb_endpoint_manager.h>
-#include <usb/host/usb_device_manager.h>
 #include <usbhc_iface.h>
 #include <async.h>
+
+#include <usb/host/hcd.h>
+
 
 #define NAME "vhc"
@@ -59 +59 @@
         list_t devices;
         fibril_mutex_t guard;
-        usb_endpoint_manager_t ep_manager;
-        usb_device_manager_t dev_manager;
-        usbvirt_device_t *hub;
-        ddf_fun_t *hc_fun;
+        usbvirt_device_t hub;
 } vhc_data_t;
 
 typedef struct {
         link_t link;
-        usb_address_t address;
-        usb_endpoint_t endpoint;
-        usb_direction_t direction;
-        usb_transfer_type_t transfer_type;
-        void *setup_buffer;
-        size_t setup_buffer_size;
-        void *data_buffer;
-        size_t data_buffer_size;
-        ddf_fun_t *ddf_fun;
-        void *callback_arg;
-        usbhc_iface_transfer_in_callback_t callback_in;
-        usbhc_iface_transfer_out_callback_t callback_out;
+        usb_transfer_batch_t *batch;
 } vhc_transfer_t;
 
-vhc_transfer_t *vhc_transfer_create(usb_address_t, usb_endpoint_t,
-    usb_direction_t, usb_transfer_type_t, ddf_fun_t *, void *);
+
+void on_client_close(ddf_fun_t *fun);
+void default_connection_handler(ddf_fun_t *fun, ipc_callid_t icallid,
+    ipc_call_t *icall);
+
 int vhc_virtdev_plug(vhc_data_t *, async_sess_t *, uintptr_t *);
 int vhc_virtdev_plug_local(vhc_data_t *, usbvirt_device_t *, uintptr_t *);
-int vhc_virtdev_plug_hub(vhc_data_t *, usbvirt_device_t *, uintptr_t *);
+int vhc_virtdev_plug_hub(vhc_data_t *, usbvirt_device_t *, uintptr_t *, usb_address_t address);
 void vhc_virtdev_unplug(vhc_data_t *, uintptr_t);
-int vhc_virtdev_add_transfer(vhc_data_t *, vhc_transfer_t *);
 
+int vhc_init(vhc_data_t *instance);
+int vhc_schedule(hcd_t *hcd, usb_transfer_batch_t *batch);
 int vhc_transfer_queue_processor(void *arg);
-
 
 #endif