Skip to content

Commit 7f6707d

Browse files
committed
modules: hal_nordic: fix errors with CMSIS_6
hal_nordic modules includes cmsis header files even when compiling for posic arch, e.g. for bsim, which results in compiler error with CMSIS_6. Signed-off-by: Sudan Landge <[email protected]>
1 parent 9eb3ad3 commit 7f6707d

File tree

2 files changed

+17
-1
lines changed

2 files changed

+17
-1
lines changed

boards/native/nrf_bsim/common/cmsis/cmsis_instr.h

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,22 @@
3636
#define __NOP()
3737
#endif
3838

39+
#ifndef __I
40+
#ifdef __cplusplus
41+
#define __I volatile /*!< Defines 'read only' permissions */
42+
#else
43+
#define __I volatile const /*!< Defines 'read only' permissions */
44+
#endif
45+
#endif
46+
47+
#ifndef __O
48+
#define __O volatile /*!< Defines 'write only' permissions */
49+
#endif /* !__O */
50+
51+
#ifndef __IO
52+
#define __IO volatile /*!< Defines 'read / write' permissions */
53+
#endif /* !__IO */
54+
3955
void __WFE(void);
4056
void __WFI(void);
4157
void __SEV(void);

west.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ manifest:
200200
groups:
201201
- hal
202202
- name: hal_nordic
203-
revision: 119ff5b5ec7a413ca2f64ae1928c79eee1e7b7b2
203+
revision: pull/290/head
204204
path: modules/hal/nordic
205205
groups:
206206
- hal

0 commit comments

Comments
 (0)