Skip to content

Commit 2562bd6

Browse files
authored
Merge pull request #21750 from elenaf9/kinetis/bme/temp-disable-bitband-fns
kinetis/bme: temp disable `BITBAND_FUNCTIONS_PROVIDED`
2 parents 947eb56 + 0c7061c commit 2562bd6

File tree

4 files changed

+7
-1
lines changed

4 files changed

+7
-1
lines changed

cpu/kinetis/include/bme.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ extern "C"
2828
/**
2929
* @brief Tell bit.h that we provide CPU specific bit manipulation functions
3030
*/
31-
#define BITBAND_FUNCTIONS_PROVIDED 1
31+
#define BITBAND_FUNCTIONS_PROVIDED 0
3232

3333
#define BME_AND_MASK (1 << 26) /**< AND decoration bitmask */
3434
#define BME_OR_MASK (1 << 27) /**< OR decoration bitmask */
@@ -121,6 +121,7 @@ static inline volatile uint8_t *bme_bitfield8(volatile uint8_t *ptr, uint8_t bit
121121
return (volatile uint8_t *)(bme_bf_addr(ptr, bit, width));
122122
}
123123

124+
#if BITBAND_FUNCTIONS_PROVIDED
124125
/* For compatibility with the M3/M4 bitbanding macros: */
125126

126127
/**
@@ -243,6 +244,8 @@ static inline void bit_clear8(volatile uint8_t *ptr, uint8_t bit)
243244
*((volatile uint8_t *)(((uintptr_t)ptr) | BME_AND_MASK)) = (uint8_t)(~(1ul << bit));
244245
}
245246

247+
#endif /* BITBAND_FUNCTIONS_PROVIDED */
248+
246249
#ifdef __cplusplus
247250
}
248251
#endif

drivers/kw41zrf/kw41zrf.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include <string.h>
2020
#include <errno.h>
2121

22+
#include "bit.h"
2223
#include "log.h"
2324
#include "msg.h"
2425
#include "net/gnrc.h"

drivers/kw41zrf/kw41zrf_getset.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include <errno.h>
2121
#include <string.h>
2222
#include "log.h"
23+
#include "bit.h"
2324
#include "cpu.h"
2425
#include "byteorder.h"
2526
#include "kw41zrf.h"

drivers/kw41zrf/kw41zrf_netdev.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include <assert.h>
2323
#include <stdatomic.h>
2424

25+
#include "bit.h"
2526
#include "log.h"
2627
#include "random.h"
2728
#include "thread_flags.h"

0 commit comments

Comments
 (0)