michaelh/zephyr
1
0
Fork 0
Code Releases Activity

spinlock: Change function signature to return bool

Browse source 
Functions z_spin_lock_valid and z_spin_unlock_valid are essentially
boolean functions, just change their signature to return a bool instead
of an integer.

MISRA-C rule 10.1

Signed-off-by: Flavio Ceolin <flavio.ceolin@intel.com>
This commit is contained in:
Flavio Ceolin 2019-03-14 11:41:21 -07:00 • committed by Anas Nashif
commit 625ac2e79f
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
include/spinlock.h
View file

@ -35,9 +35,10 @@ static inline void z_arch_irq_unlock(int key)
#if (CONFIG_FLASH_SIZE == 0) || (CONFIG_FLASH_SIZE > 32) #if (CONFIG_FLASH_SIZE == 0) || (CONFIG_FLASH_SIZE > 32)
#if defined(CONFIG_ASSERT) && (CONFIG_MP_NUM_CPUS < 4) #if defined(CONFIG_ASSERT) && (CONFIG_MP_NUM_CPUS < 4)
#include <misc/__assert.h> #include <misc/__assert.h>
#include <stdbool.h>
struct k_spinlock; struct k_spinlock;
int z_spin_lock_valid(struct k_spinlock *l); bool z_spin_lock_valid(struct k_spinlock *l);
int z_spin_unlock_valid(struct k_spinlock *l); bool z_spin_unlock_valid(struct k_spinlock *l);
void z_spin_lock_set_owner(struct k_spinlock *l); void z_spin_lock_set_owner(struct k_spinlock *l);
#define SPIN_VALIDATE #define SPIN_VALIDATE
#endif #endif

12
kernel/thread.c
View file

@ -708,23 +708,23 @@ FUNC_NORETURN void k_thread_user_mode_enter(k_thread_entry_t entry,
* them in spinlock.h is a giant header ordering headache. * them in spinlock.h is a giant header ordering headache.
*/ */
#ifdef SPIN_VALIDATE #ifdef SPIN_VALIDATE
int z_spin_lock_valid(struct k_spinlock *l) bool z_spin_lock_valid(struct k_spinlock *l)
{ {
if (l->thread_cpu) { if (l->thread_cpu) {
if ((l->thread_cpu & 3) == _current_cpu->id) { if ((l->thread_cpu & 3) == _current_cpu->id) {
return 0; return false;
} }
} }
return 1; return true;
} }
int z_spin_unlock_valid(struct k_spinlock *l) bool z_spin_unlock_valid(struct k_spinlock *l)
{ {
if (l->thread_cpu != (_current_cpu->id | (u32_t)_current)) { if (l->thread_cpu != (_current_cpu->id | (u32_t)_current)) {
return 0; return false;
} }
l->thread_cpu = 0; l->thread_cpu = 0;
return 1; return true;
} }
void z_spin_lock_set_owner(struct k_spinlock *l) void z_spin_lock_set_owner(struct k_spinlock *l)