diff options
| author | Michael Walker <walkerstop@gmail.com> | 2018-05-01 00:37:57 -0700 |
|---|---|---|
| committer | Michael Walker <walkerstop@gmail.com> | 2018-05-01 00:37:57 -0700 |
| commit | c7e025866649804a298f16ae26bb5d9dabc31476 (patch) | |
| tree | 290123b8ca43042080d89c24b98dac9729ea53af /os/hal | |
| parent | b0a75810674d430ca104edda24800ff11073fdcb (diff) | |
| parent | 4e9f077fb10255dced1da4d5d2ad9f8ae41442a2 (diff) | |
| download | ChibiOS-Contrib-c7e025866649804a298f16ae26bb5d9dabc31476.tar.gz ChibiOS-Contrib-c7e025866649804a298f16ae26bb5d9dabc31476.tar.bz2 ChibiOS-Contrib-c7e025866649804a298f16ae26bb5d9dabc31476.zip | |
Merge branch 'master' into mike
Diffstat (limited to 'os/hal')
| -rw-r--r-- | os/hal/ports/KINETIS/LLD/hal_pal_lld.h | 5 | ||||
| -rw-r--r-- | os/hal/ports/KINETIS/LLD/hal_usb_lld.h | 23 |
2 files changed, 28 insertions, 0 deletions
diff --git a/os/hal/ports/KINETIS/LLD/hal_pal_lld.h b/os/hal/ports/KINETIS/LLD/hal_pal_lld.h index 833d95e..6129f69 100644 --- a/os/hal/ports/KINETIS/LLD/hal_pal_lld.h +++ b/os/hal/ports/KINETIS/LLD/hal_pal_lld.h @@ -83,6 +83,11 @@ typedef uint32_t ioline_t; typedef GPIO_TypeDef *ioportid_t;
/**
+ * @brief Type of an pad identifier.
+ */
+typedef uint32_t iopadid_t;
+
+/**
* @brief Port Configuration.
* @details This structure stores the configuration parameters of all pads
* belonging to a port.
diff --git a/os/hal/ports/KINETIS/LLD/hal_usb_lld.h b/os/hal/ports/KINETIS/LLD/hal_usb_lld.h index 593ef16..615d10d 100644 --- a/os/hal/ports/KINETIS/LLD/hal_usb_lld.h +++ b/os/hal/ports/KINETIS/LLD/hal_usb_lld.h @@ -326,6 +326,10 @@ struct USBDriver { * @brief Current USB device configuration.
*/
uint8_t configuration;
+ /**
+ * @brief State of the driver when a suspend happened.
+ */
+ usbstate_t saved_state;
#if defined(USB_DRIVER_EXT_FIELDS)
USB_DRIVER_EXT_FIELDS
#endif
@@ -341,6 +345,25 @@ struct USBDriver { /*===========================================================================*/
/**
+ * @brief Host wake-up procedure duration.
+ */
+#if !defined(USB_HOST_WAKEUP_DURATION) || defined(__DOXYGEN__)
+#define USB_HOST_WAKEUP_DURATION 2
+#endif
+
+/**
+ * @brief Start of host wake-up procedure.
+ *
+ * @notapi
+ */
+#define usb_lld_wakeup_host(usbp) \
+ do{ \
+ USB0->CTL |= USBx_CTL_RESUME; \
+ osalThreadSleepMilliseconds(USB_HOST_WAKEUP_DURATION); \
+ USB0->CTL &= ~USBx_CTL_RESUME; \
+ } while (false)
+
+/**
* @brief Returns the current frame number.
*
* @param[in] usbp pointer to the @p USBDriver object
|