Skip to content

Commit 20623d7

Browse files
pussuwjerpelea
authored andcommitted
sem/sem_init: Change sem_xxx -> nxsem_xxx in kernel modules
Use the kernel space api nxsem_xxx when inside the kernel.
1 parent 33d6c1b commit 20623d7

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

arch/arm/src/rtl8720c/amebaz_depend.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
#include "amebaz_depend.h"
2626
#include <nuttx/mqueue.h>
27+
#include <nuttx/semaphore.h>
2728
#include <nuttx/syslog/syslog.h>
2829

2930
/****************************************************************************
@@ -168,7 +169,7 @@ void rtw_init_sema(void **sema, int init_val)
168169
return;
169170
}
170171

171-
if (sem_init(_sema, 0, init_val))
172+
if (nxsem_init(_sema, 0, init_val))
172173
{
173174
free(_sema);
174175
return;
@@ -179,7 +180,7 @@ void rtw_init_sema(void **sema, int init_val)
179180

180181
void rtw_free_sema(void **sema)
181182
{
182-
sem_destroy(*sema);
183+
nxsem_destroy(*sema);
183184
free(*sema);
184185
*sema = NULL;
185186
}

arch/risc-v/src/esp32c3/esp32c3_ble_adapter.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
#include <nuttx/kthread.h>
4545
#include <nuttx/wdog.h>
4646
#include <nuttx/wqueue.h>
47+
#include <nuttx/semaphore.h>
4748
#include <nuttx/sched.h>
4849
#include <nuttx/signal.h>
4950

@@ -780,7 +781,7 @@ static void *semphr_create_wrapper(uint32_t max, uint32_t init)
780781
bt_sem = kmm_malloc(tmp);
781782
DEBUGASSERT(bt_sem);
782783

783-
ret = sem_init(&bt_sem->sem, 0, init);
784+
ret = nxsem_init(&bt_sem->sem, 0, init);
784785
DEBUGASSERT(ret == OK);
785786

786787
#ifdef CONFIG_ESP32C3_SPIFLASH
@@ -807,7 +808,7 @@ static void *semphr_create_wrapper(uint32_t max, uint32_t init)
807808
static void semphr_delete_wrapper(void *semphr)
808809
{
809810
struct bt_sem_s *bt_sem = (struct bt_sem_s *)semphr;
810-
sem_destroy(&bt_sem->sem);
811+
nxsem_destroy(&bt_sem->sem);
811812
kmm_free(bt_sem);
812813
}
813814

arch/xtensa/src/esp32/esp32_ble_adapter.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1143,7 +1143,7 @@ static void *semphr_create_wrapper(uint32_t max, uint32_t init)
11431143
return NULL;
11441144
}
11451145

1146-
ret = sem_init(sem, 0, init);
1146+
ret = nxsem_init(sem, 0, init);
11471147
if (ret)
11481148
{
11491149
wlerr("ERROR: Failed to initialize sem error=%d\n", ret);
@@ -1171,7 +1171,7 @@ static void *semphr_create_wrapper(uint32_t max, uint32_t init)
11711171
static void semphr_delete_wrapper(void *semphr)
11721172
{
11731173
sem_t *sem = (sem_t *)semphr;
1174-
sem_destroy(sem);
1174+
nxsem_destroy(sem);
11751175
kmm_free(sem);
11761176
}
11771177

0 commit comments

Comments
 (0)