aboutsummaryrefslogtreecommitdiffstats
path: root/os/hal/ports/STM32/LLD/USBv1
diff options
context:
space:
mode:
authorGiovanni Di Sirio <gdisirio@gmail.com>2017-09-09 16:45:34 +0000
committerGiovanni Di Sirio <gdisirio@gmail.com>2017-09-09 16:45:34 +0000
commit67ac09b2f3e66f2a59261d189a0128644918727c (patch)
tree53fd13b1694d37a842cb933bf467c7f1c032a9c4 /os/hal/ports/STM32/LLD/USBv1
parent8204b9ce59da09605a144503221516c8de0b856a (diff)
downloadChibiOS-67ac09b2f3e66f2a59261d189a0128644918727c.tar.gz
ChibiOS-67ac09b2f3e66f2a59261d189a0128644918727c.tar.bz2
ChibiOS-67ac09b2f3e66f2a59261d189a0128644918727c.zip
Moved wakeup logic in LLD.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10572 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal/ports/STM32/LLD/USBv1')
-rw-r--r--os/hal/ports/STM32/LLD/USBv1/hal_usb_lld.h25
1 files changed, 17 insertions, 8 deletions
diff --git a/os/hal/ports/STM32/LLD/USBv1/hal_usb_lld.h b/os/hal/ports/STM32/LLD/USBv1/hal_usb_lld.h
index db199e33d..b1073acf9 100644
--- a/os/hal/ports/STM32/LLD/USBv1/hal_usb_lld.h
+++ b/os/hal/ports/STM32/LLD/USBv1/hal_usb_lld.h
@@ -105,6 +105,13 @@
#define STM32_USB_USE_FAST_COPY FALSE
#endif
+/**
+ * @brief Host wake-up procedure duration.
+ */
+#if !defined(USB_HOST_WAKEUP_DURATION) || defined(__DOXYGEN__)
+#define USB_HOST_WAKEUP_DURATION 2
+#endif
+
/*===========================================================================*/
/* Derived constants and error checks. */
/*===========================================================================*/
@@ -148,6 +155,10 @@
#error "STM32_USB1_LP_NUMBER not defined"
#endif
+#if (USB_HOST_WAKEUP_DURATION < 2) || (USB_HOST_WAKEUP_DURATION > 15)
+#error "invalid USB_HOST_WAKEUP_DURATION setting, it must be between 2 and 15"
+#endif
+
/*===========================================================================*/
/* Driver data structures and types. */
/*===========================================================================*/
@@ -453,14 +464,12 @@ struct USBDriver {
*
* @notapi
*/
-#define usb_lld_start_wakeup_host(usbp) (STM32_USB->CNTR |= USB_CNTR_RESUME)
-
-/**
- * @brief Stop of host wake-up procedure.
- *
- * @notapi
- */
-#define usb_lld_stop_wakeup_host(usbp) (STM32_USB->CNTR &= ~USB_CNTR_RESUME)
+#define usb_lld_wakeup_host(usbp) \
+ do{ \
+ STM32_USB->CNTR |= USB_CNTR_RESUME; \
+ osalThreadSleepMilliseconds(USB_HOST_WAKEUP_DURATION); \
+ STM32_USB->CNTR &= ~USB_CNTR_RESUME; \
+ } while (false)
/*===========================================================================*/
/* External declarations. */