michaelh/zephyr
1
0
Fork 0
Code Releases Activity

device: fix synchronous call usage of nano semaphore

Browse source 
Initialization and usage of nano semaphore require an actual semaphore
object in memory. So make sure the semaphore is there.

Change-Id: I4a7391973c65f99132735133b82f1e3837eab4f8
Signed-off-by: Daniel Leung <daniel.leung@intel.com>
This commit is contained in:
Daniel Leung 2015-12-09 11:36:53 -08:00 • committed by Anas Nashif
commit 1b8a9ed895
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
include/device.h
View file

@ -101,7 +101,7 @@ struct device* device_get_binding(char *name);
*/ */
typedef struct { typedef struct {
/** Nanokernel semaphore used for fiber context */ /** Nanokernel semaphore used for fiber context */
struct nano_sem *f_sem; struct nano_sem f_sem;
#ifdef CONFIG_MICROKERNEL #ifdef CONFIG_MICROKERNEL
/** Microkernel semaphore used for task context */ /** Microkernel semaphore used for task context */
struct _k_sem_struct _t_sem; struct _k_sem_struct _t_sem;
@ -118,7 +118,7 @@ typedef struct {
*/ */
static inline void synchronous_call_init(device_sync_call_t *sync) static inline void synchronous_call_init(device_sync_call_t *sync)
{ {
nano_sem_init(sync->f_sem); nano_sem_init(&sync->f_sem);
#ifdef CONFIG_MICROKERNEL #ifdef CONFIG_MICROKERNEL
sync->_t_sem.waiters = NULL; sync->_t_sem.waiters = NULL;
sync->_t_sem.level = sync->_t_sem.count = 0; sync->_t_sem.level = sync->_t_sem.count = 0;
@ -144,7 +144,7 @@ static inline void synchronous_call_wait(device_sync_call_t *sync)
task_sem_take_wait(sync->t_sem); task_sem_take_wait(sync->t_sem);
} else { } else {
sync->caller_is_task = false; sync->caller_is_task = false;
nano_sem_take_wait(sync->f_sem); nano_sem_take_wait(&sync->f_sem);
} }
} }
@ -160,7 +160,7 @@ static inline void synchronous_call_complete(device_sync_call_t *sync)
if (sync->caller_is_task) { if (sync->caller_is_task) {
task_sem_give(sync->t_sem); task_sem_give(sync->t_sem);
} else { } else {
nano_isr_sem_give(sync->f_sem); nano_isr_sem_give(&sync->f_sem);
} }
} }
@ -174,7 +174,7 @@ static inline void synchronous_call_complete(device_sync_call_t *sync)
*/ */
static inline void synchronous_call_wait(device_sync_call_t *sync) static inline void synchronous_call_wait(device_sync_call_t *sync)
{ {
nano_sem_take_wait(sync->f_sem); nano_sem_take_wait(&sync->f_sem);
} }
/** /**
@ -185,7 +185,7 @@ static inline void synchronous_call_wait(device_sync_call_t *sync)
*/ */
static inline void synchronous_call_complete(device_sync_call_t *sync) static inline void synchronous_call_complete(device_sync_call_t *sync)
{ {
nano_isr_sem_give(sync->f_sem); nano_isr_sem_give(&sync->f_sem);
} }
#endif /* CONFIG_MICROKERNEL || CONFIG_NANOKERNEL */ #endif /* CONFIG_MICROKERNEL || CONFIG_NANOKERNEL */