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

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/src

Files:

• bandwidth.c (modified) (1 diff)
• bus.c (modified) (1 diff)
• ddf_helpers.c (modified) (2 diffs)
• dma_buffer.c (modified) (1 diff)
• endpoint.c (modified) (2 diffs)
• hcd.c (modified) (1 diff)
• usb2_bus.c (modified) (1 diff)
• usb_transfer_batch.c (modified) (1 diff)

uspace/lib/usbhost/src/bandwidth.c

@@ -34 +34 @@
  */
 
-#include <usb/host/bandwidth.h>
-#include <usb/host/endpoint.h>
-#include <usb/host/bus.h>
-
 #include <assert.h>
 #include <stdlib.h>
+
+#include "endpoint.h"
+#include "bus.h"
+
+#include "bandwidth.h"
 
 /** Calculate bandwidth that needs to be reserved for communication with EP.

uspace/lib/usbhost/src/bus.c

@@ -34 +34 @@
  */
 
-#include <usb/host/bus.h>
-#include <usb/host/endpoint.h>
+#include <ddf/driver.h>
+#include <errno.h>
+#include <mem.h>
+#include <stdio.h>
 #include <usb/debug.h>
-#include <ddf/driver.h>
-
-#include <mem.h>
-#include <errno.h>
-#include <stdio.h>
+
+#include "endpoint.h"
+#include "bus.h"
 
 /**

uspace/lib/usbhost/src/ddf_helpers.c

@@ -34 +34 @@
  */
 
-#include <usb/classes/classes.h>
-#include <usb/host/bus.h>
-#include <usb/debug.h>
-#include <usb/descriptor.h>
-#include <usb/request.h>
-#include <usb/usb.h>
-
 #include <adt/list.h>
 #include <assert.h>
@@ -48 +41 @@
 #include <device/hw_res_parsed.h>
 #include <errno.h>
-#include <fibril_synch.h>
-#include <macros.h>
-#include <stdlib.h>
 #include <str_error.h>
+#include <usb/classes/classes.h>
+#include <usb/debug.h>
+#include <usb/descriptor.h>
+#include <usb/usb.h>
 #include <usb_iface.h>
 #include <usbhc_iface.h>
+
+#include "bus.h"
 
 #include "ddf_helpers.h"

uspace/lib/usbhost/src/dma_buffer.c

@@ -33 +33 @@
  */
 
-#include <usb/host/dma_buffer.h>
-
 #include <align.h>
 #include <as.h>
 #include <ddi.h>
 #include <stddef.h>
+
+#include "dma_buffer.h"
 
 dma_policy_t dma_policy_default = {

uspace/lib/usbhost/src/endpoint.c

@@ -35 +35 @@
  */
 
-#include <usb/host/endpoint.h>
-#include <usb/host/usb_transfer_batch.h>
-#include <usb/host/bus.h>
-
 #include <assert.h>
 #include <atomic.h>
 #include <mem.h>
 #include <stdlib.h>
+
+#include "usb_transfer_batch.h"
+#include "bus.h"
+
+#include "endpoint.h"
 
 /** Initialize provided endpoint structure.
@@ -153 +154 @@
 }
 
-
 /**
  * @}

uspace/lib/usbhost/src/hcd.c

@@ -34 +34 @@
  */
 
-#include <usb/debug.h>
-#include <usb/descriptor.h>
-#include <usb/request.h>
-
 #include <assert.h>
 #include <async.h>
 #include <errno.h>
 #include <macros.h>
+#include <str_error.h>
+#include <usb/debug.h>
+#include <usb/descriptor.h>
+#include <usb/request.h>
 #include <usb_iface.h>
-#include <str_error.h>
+
+#include "bus.h"
+#include "endpoint.h"
+#include "usb_transfer_batch.h"
 
 #include "hcd.h"

uspace/lib/usbhost/src/usb2_bus.c

@@ -34 +34 @@
  */
 
-#include <usb/host/usb2_bus.h>
-#include <usb/host/endpoint.h>
-#include <usb/host/ddf_helpers.h>
-#include <usb/debug.h>
-#include <usb/request.h>
-#include <usb/descriptor.h>
-#include <usb/usb.h>
-
 #include <assert.h>
 #include <errno.h>
 #include <macros.h>
+#include <stdbool.h>
+#include <stdlib.h>
 #include <str_error.h>
-#include <stdlib.h>
-#include <stdbool.h>
+#include <usb/debug.h>
+#include <usb/descriptor.h>
+#include <usb/request.h>
+#include <usb/usb.h>
+
+#include "endpoint.h"
+#include "ddf_helpers.h"
+
+#include "usb2_bus.h"
 
 /** Ops receive generic bus_t pointer. */

uspace/lib/usbhost/src/usb_transfer_batch.c

@@ -33 +33 @@
  */
 
-#include <usb/host/usb_transfer_batch.h>
-#include <usb/host/endpoint.h>
-#include <usb/host/bus.h>
+#include <assert.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <str_error.h>
 #include <usb/debug.h>
 
-#include <assert.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <str_error.h>
+#include "endpoint.h"
+#include "bus.h"
 
+#include "usb_transfer_batch.h"
 
 /** Create a batch on given endpoint.