libc/semaphore:sem_init change defult protocol

Signed-off-by: anjiahao <[email protected]>
apache · Dec 24, 2021 · 9d14eb6 · 9d14eb6
1 parent 509350a
commit 9d14eb6
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/drivers/input/tsc2007.c b/drivers/input/tsc2007.c
@@ -1234,7 +1234,7 @@ int tsc2007_register(FAR struct i2c_master_s *dev,
  * have priority inheritance enabled.
  */
 
- nxsem_set_protocol(&priv->waitsem, SEM_PRIO_NONE);
+ nxsem_set_protocol(&priv->devsem, SEM_PRIO_INHERIT);
 
  /* Make sure that interrupts are disabled */
 

diff --git a/include/semaphore.h b/include/semaphore.h
@@ -47,8 +47,8 @@
 
 /* Bit definitions for the struct sem_s flags field */
 
-#define PRIOINHERIT_FLAGS_DISABLE (1 << 0) /* Bit 0: Priority inheritance
- * is disabled for this semaphore. */
+#define PRIOINHERIT_FLAGS_ENABLE (1 << 0) /* Bit 0: Priority inheritance
+ * is enable for this semaphore. */
 
 /****************************************************************************
  * Public Type Declarations

diff --git a/libs/libc/semaphore/sem_getprotocol.c b/libs/libc/semaphore/sem_getprotocol.c
@@ -56,7 +56,7 @@ int sem_getprotocol(FAR sem_t *sem, FAR int *protocol)
  DEBUGASSERT(sem != NULL && protocol != NULL);
 
 #ifdef CONFIG_PRIORITY_INHERITANCE
- if ((sem->flags & PRIOINHERIT_FLAGS_DISABLE) != 0)
+ if ((sem->flags & PRIOINHERIT_FLAGS_ENABLE) != 0)
  {
  *protocol = SEM_PRIO_NONE;
  }

diff --git a/sched/semaphore/sem_holder.c b/sched/semaphore/sem_holder.c
@@ -947,7 +947,7 @@ void nxsem_add_holder_tcb(FAR struct tcb_s *htcb, FAR sem_t *sem)
  * inheritance is effectively disabled.
  */
 
- if ((sem->flags & PRIOINHERIT_FLAGS_DISABLE) == 0)
+ if ((sem->flags & PRIOINHERIT_FLAGS_ENABLE) == 1)
  {
  /* Find or allocate a container for this new holder */
 

diff --git a/sched/semaphore/sem_setprotocol.c b/sched/semaphore/sem_setprotocol.c
@@ -82,7 +82,7 @@ int nxsem_set_protocol(FAR sem_t *sem, int protocol)
 
  /* Disable priority inheritance */
 
- sem->flags |= PRIOINHERIT_FLAGS_DISABLE;
+ sem->flags &= ~PRIOINHERIT_FLAGS_ENABLE;
 
  /* Remove any current holders */
 
@@ -93,7 +93,7 @@ int nxsem_set_protocol(FAR sem_t *sem, int protocol)
 
  /* Enable priority inheritance (dangerous) */
 
- sem->flags &= ~PRIOINHERIT_FLAGS_DISABLE;
+ sem->flags |= PRIOINHERIT_FLAGS_ENABLE;
  return OK;
 
  case SEM_PRIO_PROTECT: