From 6b7161b90a3572bbb7717d0317306741043528e5 Mon Sep 17 00:00:00 2001 From: Diego Ismirlian Date: Sun, 9 Jul 2017 19:42:36 -0300 Subject: USBH: moved usbh/desciter.h and usbh/debug.h to usbh/internal.h --- os/hal/include/hal_usbh.h | 7 ------- os/hal/include/usbh/dev/uvc.h | 6 +----- os/hal/include/usbh/internal.h | 3 +++ 3 files changed, 4 insertions(+), 12 deletions(-) (limited to 'os/hal/include') 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 /* descriptor iterators */ -#include /* 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_ */ -- cgit v1.2.3