Changeset 64fea02 in mainline for uspace/lib/usbhost/include

Timestamp:

2017-11-22T13:54:05Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

820d9bc

Parents:

b60eac1

Message:

usbhost: refactor include hiearchy

Location:

uspace/lib/usbhost/include/usb/host

Files:

• bus.h (modified) (1 diff)
• ddf_helpers.h (modified) (1 diff)
• endpoint.h (modified) (1 diff)
• hcd.h (modified) (1 diff)
• usb2_bus.h (modified) (1 diff)
• usb_transfer_batch.h (modified) (3 diffs)

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

@@ -45 +45 @@
 #include <usb/usb.h>
 #include <usb/request.h>
+#include <usb/host/hcd.h>
 
 #include <assert.h>

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

@@ -37 +37 @@
 #define LIBUSBHOST_HOST_DDF_HELPERS_H
 
-#include <usb/host/hcd.h>
-#include <usb/host/bus.h>
-#include <usb/usb.h>
-
 #include <ddf/driver.h>
 #include <ddf/interrupt.h>
 #include <device/hw_res_parsed.h>
+#include <usb/usb.h>
+
+#include <usb/host/hcd.h>
 
 typedef int (*driver_init_t)(hcd_t *, const hw_res_list_parsed_t *, ddf_dev_t *);

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

@@ -40 +40 @@
 #define LIBUSBHOST_HOST_ENDPOINT_H
 
+#include <adt/list.h>
+#include <atomic.h>
+#include <fibril_synch.h>
 #include <stdbool.h>
-#include <adt/list.h>
-#include <fibril_synch.h>
 #include <usb/usb.h>
-#include <atomic.h>
 
 typedef struct bus bus_t;

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

@@ -37 +37 @@
 #define LIBUSBHOST_HOST_HCD_H
 
-#include <usb/host/endpoint.h>
-#include <usb/host/bus.h>
-#include <usb/host/usb_transfer_batch.h>
-#include <usb/usb.h>
-
 #include <assert.h>
 #include <mem.h>
 #include <stddef.h>
 #include <stdint.h>
+#include <usb/usb.h>
 #include <usbhc_iface.h>
 
 typedef struct hcd hcd_t;
+typedef struct bus bus_t;
+typedef struct device device_t;
+typedef struct usb_transfer_batch usb_transfer_batch_t;
 
 typedef int (*schedule_hook_t)(hcd_t *, usb_transfer_batch_t *);

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

@@ -37 +37 @@
 #define LIBUSBHOST_HOST_USB2_BUS_H
 
-#include <usb/usb.h>
-#include <usb/host/bus.h>
-
 #include <adt/list.h>
 #include <stdbool.h>
+#include <usb/usb.h>
+
+#include <usb/host/bus.h>
 
 typedef struct usb2_bus usb2_bus_t;

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

@@ -37 +37 @@
 #define LIBUSBHOST_HOST_USB_TRANSFER_BATCH_H
 
+#include <atomic.h>
+#include <errno.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <usb/request.h>
 #include <usb/usb.h>
-#include <usb/request.h>
-#include <usb/host/bus.h>
 #include <usbhc_iface.h>
 
-#include <atomic.h>
-#include <stddef.h>
-#include <errno.h>
-#include <stdint.h>
+#include <usb/host/hcd.h>
+#include <usb/host/endpoint.h>
+#include <usb/host/bus.h>
 
 typedef struct endpoint endpoint_t;
@@ -87 +89 @@
 } usb_transfer_batch_t;
 
-/** Printf formatting string for dumping usb_transfer_batch_t. */
+/**
+ * Printf formatting string for dumping usb_transfer_batch_t.
+ *  [address:endpoint speed transfer_type-direction buffer_sizeB/max_packet_size]
+ * */
 #define USB_TRANSFER_BATCH_FMT "[%d:%d %s %s-%s %zuB/%zu]"
 
@@ -94 +99 @@
  */
 #define USB_TRANSFER_BATCH_ARGS(batch) \
-        (batch).target.address, (batch).target.endpoint, \
+        ((batch).ep->device->address), ((batch).ep->endpoint), \
         usb_str_speed((batch).ep->device->speed), \
         usb_str_transfer_type_short((batch).ep->transfer_type), \
-        usb_str_direction((batch).ep->direction), \
+        usb_str_direction((batch).dir), \
         (batch).buffer_size, (batch).ep->max_packet_size