aboutsummaryrefslogtreecommitdiffstats
path: root/os/hal/include
diff options
context:
space:
mode:
authorDiego Ismirlian <dismirlian (at) google's mail.com>2017-07-09 19:42:36 -0300
committerDiego Ismirlian <dismirlian (at) google's mail.com>2017-07-09 19:42:36 -0300
commit6b7161b90a3572bbb7717d0317306741043528e5 (patch)
tree934fd84bd72b0d5140208d14392e79294c713b1b /os/hal/include
parent665643c9e47709e6915b22398571be978b59a891 (diff)
downloadChibiOS-Contrib-6b7161b90a3572bbb7717d0317306741043528e5.tar.gz
ChibiOS-Contrib-6b7161b90a3572bbb7717d0317306741043528e5.tar.bz2
ChibiOS-Contrib-6b7161b90a3572bbb7717d0317306741043528e5.zip
USBH: moved usbh/desciter.h and usbh/debug.h to usbh/internal.h
Diffstat (limited to 'os/hal/include')
-rw-r--r--os/hal/include/hal_usbh.h7
-rw-r--r--os/hal/include/usbh/dev/uvc.h6
-rw-r--r--os/hal/include/usbh/internal.h3
3 files changed, 4 insertions, 12 deletions
diff --git a/os/hal/include/hal_usbh.h b/os/hal/include/hal_usbh.h
index f6e78e9..d686cfd 100644
--- a/os/hal/include/hal_usbh.h
+++ b/os/hal/include/hal_usbh.h
@@ -429,13 +429,6 @@ struct usbh_baseclassdriver {
_usbh_base_classdriver_data
};
-
-/*===========================================================================*/
-/* Helper functions. */
-/*===========================================================================*/
-#include <usbh/desciter.h> /* descriptor iterators */
-#include <usbh/debug.h> /* debug */
-
#endif
#endif /* HAL_USBH_H_ */
diff --git a/os/hal/include/usbh/dev/uvc.h b/os/hal/include/usbh/dev/uvc.h
index bc46a71..817d465 100644
--- a/os/hal/include/usbh/dev/uvc.h
+++ b/os/hal/include/usbh/dev/uvc.h
@@ -22,11 +22,7 @@
#if HAL_USE_USBH && HAL_USBH_USE_UVC
-/* TODO:
- *
- *
- */
-
+#include "usbh/desciter.h"
/*===========================================================================*/
/* Driver pre-compile time settings. */
diff --git a/os/hal/include/usbh/internal.h b/os/hal/include/usbh/internal.h
index 70d2f7a..89695f0 100644
--- a/os/hal/include/usbh/internal.h
+++ b/os/hal/include/usbh/internal.h
@@ -137,6 +137,9 @@ void _usbh_urb_abort_and_waitS(usbh_urb_t *urb, usbh_urbstatus_t status);
#define sizeof_array(x) (sizeof(x)/sizeof(*(x)))
+#include "usbh/desciter.h" /* descriptor iterators */
+#include "usbh/debug.h"
+
#endif
#endif /* USBH_INTERNAL_H_ */