Changeset 32fb6bce in mainline for uspace/lib/usbhost/include/usb/host/bus.h

Timestamp:

2017-12-18T22:50:21Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

7f70d1c

Parents:

1ea0bbf

git-author:

Ondřej Hlavatý <aearsis@…> (2017-12-18 22:04:50)

git-committer:

Ondřej Hlavatý <aearsis@…> (2017-12-18 22:50:21)

Message:

usbhost: refactoring

This commit moves interrupt, status and schedule to bus
operations. Then the purpose of hcd_t is better defined, and split into
hc_driver_t and hc_device_t. hc_driver_t is used to wrap driver
implementation by the library (similar to how usb_driver_t is used to
wrap usb device drivers). hc_device_t is used as a parent for hc_t
inside drivers, and is allocated inside the DDF device node.

To support these changes, some local identifiers were renamed, some
functions were moved and/or renamed and their arguments changed. The
most notable one being hcd_send_batch → bus_device_send_batch.

File:

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

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

@@ -43 +43 @@
 #define LIBUSBHOST_HOST_BUS_H
 
-#include <usb/usb.h>
-#include <usb/request.h>
-#include <usb/host/hcd.h>
-
 #include <assert.h>
 #include <fibril_synch.h>
 #include <stdbool.h>
+#include <usb/host/hcd.h>
+#include <usb/request.h>
+#include <usb/usb.h>
+#include <usbhc_iface.h>
 
 typedef struct hcd hcd_t;
@@ -94 +94 @@
 
         /* Global operations on the bus */
+        void (*interrupt)(bus_t *, uint32_t);
+        int (*status)(bus_t *, uint32_t *);
         int (*reserve_default_address)(bus_t *, usb_speed_t);
         int (*release_default_address)(bus_t *);
@@ -116 +118 @@
 
         /* Operations on batch */
-        void (*batch_destroy)(usb_transfer_batch_t *);  /**< Optional */
+        void (*batch_destroy)(usb_transfer_batch_t *);          /**< Optional */
+        int (*batch_schedule)(usb_transfer_batch_t *);
 };
 
@@ -129 +132 @@
         fibril_mutex_t guard;
 
-        /* TODO: get rid of this one. */
-        hcd_t *hcd;
-
+        /* Size of the device_t extended structure */
         size_t device_size;
 
@@ -140 +141 @@
 } bus_t;
 
-void bus_init(bus_t *, hcd_t *, size_t);
+void bus_init(bus_t *, size_t);
 int bus_device_init(device_t *, bus_t *);
 
@@ -150 +151 @@
 int bus_device_online(device_t *);
 int bus_device_offline(device_t *);
+
+int bus_device_send_batch(device_t *, usb_target_t,
+    usb_direction_t direction, char *, size_t, uint64_t,
+    usbhc_iface_transfer_callback_t, void *, const char *);
+
+ssize_t bus_device_send_batch_sync(device_t *, usb_target_t,
+    usb_direction_t direction, char *, size_t, uint64_t,
+    const char *);
 
 int bus_endpoint_add(device_t *, const usb_endpoint_desc_t *, endpoint_t **);