summaryrefslogtreecommitdiff
path: root/core/cortex-m0
diff options
context:
space:
mode:
authorGwendal Grignou <gwendal@chromium.org>2019-03-11 15:57:52 -0700
committerchrome-bot <chrome-bot@chromium.org>2019-03-26 04:42:55 -0700
commitbb266fc26fc05d4ab22de6ad7bce5b477c9f9140 (patch)
treef6ada087f62246c3a9547e649ac8846b0ed6d5ab /core/cortex-m0
parent0bfc511527cf2aebfa163c63a1d028419ca0b0c3 (diff)
downloadchrome-ec-bb266fc26fc05d4ab22de6ad7bce5b477c9f9140.tar.gz
common: replace 1 << digits, with BIT(digits)
Requested for linux integration, use BIT instead of 1 << First step replace bit operation with operand containing only digits. Fix an error in motion_lid try to set bit 31 of a signed integer. BUG=None BRANCH=None TEST=compile Change-Id: Ie843611f2f68e241f0f40d4067f7ade726951d29 Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/1518659 Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Diffstat (limited to 'core/cortex-m0')
-rw-r--r--core/cortex-m0/cpu.h3
-rw-r--r--core/cortex-m0/task.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/core/cortex-m0/cpu.h b/core/cortex-m0/cpu.h
index 8df6fa5d27..f4f8e424df 100644
--- a/core/cortex-m0/cpu.h
+++ b/core/cortex-m0/cpu.h
@@ -9,6 +9,7 @@
#define __CROS_EC_CPU_H
#include <stdint.h>
+#include "compile_time_macros.h"
/* Macro to access 32-bit registers */
#define CPUREG(addr) (*(volatile uint32_t*)(addr))
@@ -31,7 +32,7 @@
#define CPU_NVIC_SHCSR2 CPUREG(0xe000ed1c)
#define CPU_NVIC_SHCSR3 CPUREG(0xe000ed20)
-#define CPU_NVIC_CCR_UNALIGN_TRAP (1 << 3)
+#define CPU_NVIC_CCR_UNALIGN_TRAP BIT(3)
/* Set up the cpu to detect faults */
void cpu_init(void);
diff --git a/core/cortex-m0/task.c b/core/cortex-m0/task.c
index 32dabcaf19..9b3f8ce0ed 100644
--- a/core/cortex-m0/task.c
+++ b/core/cortex-m0/task.c
@@ -371,7 +371,7 @@ uint32_t task_set_event(task_id_t tskid, uint32_t event, int wait)
* Trigger the scheduler when there's
* no other irqs happening.
*/
- CPU_SCB_ICSR = (1 << 28);
+ CPU_SCB_ICSR = BIT(28);
}
} else {
if (wait) {