From 329f8a10dc72eb2361e8487e47fe73189769e4b2 Mon Sep 17 00:00:00 2001 From: Anna Bridge Date: Fri, 1 Jul 2016 15:08:31 +0100 Subject: [PATCH] Add core_util_ prefix to are_interrupts_enabled() function. For consistency with other exposed functions from this file, core_util_ prefix should be added. --- hal/api/critical.h | 2 +- hal/common/critical.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hal/api/critical.h b/hal/api/critical.h index 464ce10e97..2c288a5430 100644 --- a/hal/api/critical.h +++ b/hal/api/critical.h @@ -34,7 +34,7 @@ extern "C" { * differs. * @return true if interrupts are enabled, false otherwise */ -bool are_interrupts_enabled(void); +bool core_util_are_interrupts_enabled(void); /** Mark the start of a critical section * diff --git a/hal/common/critical.c b/hal/common/critical.c index 6426416f44..47bfd23b12 100644 --- a/hal/common/critical.c +++ b/hal/common/critical.c @@ -29,7 +29,7 @@ static volatile uint32_t interrupt_enable_counter = 0; static volatile bool critical_interrupts_disabled = false; -bool are_interrupts_enabled(void) +bool core_util_are_interrupts_enabled(void) { #if defined(__CORTEX_A9) return ((__get_CPSR() & 0x80) == 0); @@ -40,7 +40,7 @@ bool are_interrupts_enabled(void) void core_util_critical_section_enter() { - bool interrupts_disabled = !are_interrupts_enabled(); + bool interrupts_disabled = !core_util_are_interrupts_enabled(); __disable_irq(); /* Save the interrupt disabled state as it was prior to any nested critical section lock use */ @@ -70,7 +70,7 @@ void core_util_critical_section_exit() // FIXME #ifndef FEATURE_UVISOR - bool interrupts_disabled = !are_interrupts_enabled(); /* get the current interrupt disabled state */ + bool interrupts_disabled = !core_util_are_interrupts_enabled(); /* get the current interrupt disabled state */ MBED_ASSERT(interrupts_disabled); /* Interrupts must be disabled on invoking an exit from a critical section */ #else