Skip to content

RFC: Zephyr: In PR #60031 aarch32 directory in favor of cmsis_core.h #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

RFC: Zephyr: In PR #60031 aarch32 directory in favor of cmsis_core.h #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/zephyr/common/memfault_platform_coredump_regions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include "memfault/ports/zephyr/version.h"

#if MEMFAULT_ZEPHYR_VERSION_GT(2, 1)
#include <arch/arm/aarch32/cortex_m/cmsis.h>
#include <cmsis_core.h>
#else
#include <arch/arm/cortex_m/cmsis.h>
#endif
Expand Down
2 changes: 1 addition & 1 deletion ports/zephyr/v2.4/memfault_fault_handler.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
// Starting in v3.4, the handler set function was renamed and the declaration
// added to a public header
#if MEMFAULT_ZEPHYR_VERSION_GT(3, 3)
#include <arch/arm/aarch32/nmi.h>
#include <cmsis_core.h>
#define MEMFAULT_ZEPHYR_NMI_HANDLER_SET z_arm_nmi_set_handler
#else
#define MEMFAULT_ZEPHYR_NMI_HANDLER_SET z_NmiHandlerSet
Expand Down