Commit a7632079 authored by Fabio Baltieri's avatar Fabio Baltieri Committed by Fabio Baltieri
Browse files

arch: arm: dwt: use the cmsis_6 macro unconditionally



Always use the cmsis_6 version for DWT_LSR_Present_Msk and
DWT_LSR_Access_Msk, the old ones are not going to be available anymore
when Cortex-M is selected..

Signed-off-by: default avatarFabio Baltieri <fabiobaltieri@google.com>
parent e538997a
Loading
Loading
Loading
Loading
+3 −6
Original line number Diff line number Diff line
@@ -36,14 +36,11 @@ extern "C" {
 * update to CMSIS_6.
 */
#if !defined DWT_LSR_Present_Msk
#define DWT_LSR_Present_Msk \
	IF_ENABLED(CONFIG_ZEPHYR_CMSIS_MODULE, (ITM_LSR_Present_Msk)) \
	IF_DISABLED(CONFIG_ZEPHYR_CMSIS_MODULE, (ITM_LSR_PRESENT_Msk))
#define DWT_LSR_Present_Msk ITM_LSR_PRESENT_Msk
#endif

#if !defined DWT_LSR_Access_Msk
#define DWT_LSR_Access_Msk \
	IF_ENABLED(CONFIG_ZEPHYR_CMSIS_MODULE, (ITM_LSR_Access_Msk)) \
	IF_DISABLED(CONFIG_ZEPHYR_CMSIS_MODULE, (ITM_LSR_ACCESS_Msk))
#define DWT_LSR_Access_Msk ITM_LSR_ACCESS_Msk
#endif

static inline void dwt_access(bool ena)