From e1ca51648812cfdebfc04ff60328f1964fcfd440 Mon Sep 17 00:00:00 2001 From: anjiahao Date: Wed, 19 Oct 2022 23:57:25 +0800 Subject: [PATCH] use SEM_INITIALIZER inside of NXSEM_INITIALIZER Signed-off-by: anjiahao --- arch/arm/src/am335x/am335x_i2c.c | 6 +++--- arch/arm/src/cxd56xx/cxd56_i2c.c | 6 +++--- arch/arm/src/efm32/efm32_i2c.c | 4 ++-- arch/arm/src/imxrt/imxrt_lpi2c.c | 8 ++++---- arch/arm/src/kinetis/kinetis_i2c.c | 8 ++++---- arch/arm/src/lc823450/lc823450_i2c.c | 4 ++-- arch/arm/src/nrf52/nrf52_i2c.c | 4 ++-- arch/arm/src/rp2040/rp2040_i2c.c | 4 ++-- arch/arm/src/s32k1xx/s32k1xx_lpi2c.c | 4 ++-- arch/arm/src/s32k3xx/s32k3xx_lpi2c.c | 4 ++-- arch/arm/src/samv7/sam_twihs.c | 6 +++--- arch/arm/src/stm32/stm32_1wire.c | 16 ++++++++-------- arch/arm/src/stm32/stm32_i2c.c | 6 +++--- arch/arm/src/stm32/stm32_i2c_alt.c | 6 +++--- arch/arm/src/stm32/stm32_i2c_v2.c | 8 ++++---- arch/arm/src/stm32/stm32f40xxx_i2c.c | 6 +++--- arch/arm/src/stm32f0l0g0/stm32_i2c.c | 8 ++++---- arch/arm/src/stm32f7/stm32_i2c.c | 8 ++++---- arch/arm/src/stm32h7/stm32_i2c.c | 8 ++++---- arch/arm/src/stm32l4/stm32l4_1wire.c | 10 +++++----- arch/arm/src/stm32l4/stm32l4_i2c.c | 8 ++++---- arch/arm/src/tiva/common/tiva_i2c.c | 20 ++++++++++---------- arch/arm/src/tlsr82/tlsr82_serial.c | 3 +-- arch/mips/src/pic32mz/pic32mz_i2c.c | 10 +++++----- arch/renesas/src/rx65n/rx65n_riic.c | 6 +++--- arch/risc-v/src/bl602/bl602_i2c.c | 2 +- arch/risc-v/src/bl602/bl602_spi.c | 4 ++-- arch/risc-v/src/esp32c3/esp32c3_i2c.c | 2 +- arch/risc-v/src/esp32c3/esp32c3_spi.c | 2 +- arch/risc-v/src/mpfs/mpfs_i2c.c | 4 ++-- arch/risc-v/src/mpfs/mpfs_ihc.c | 6 ++---- arch/risc-v/src/mpfs/mpfs_spi.c | 4 ++-- arch/xtensa/src/esp32/esp32_i2c.c | 4 ++-- arch/xtensa/src/esp32/esp32_spi.c | 4 ++-- arch/xtensa/src/esp32s2/esp32s2_i2c.c | 4 ++-- arch/xtensa/src/esp32s3/esp32s3_i2c.c | 4 ++-- arch/xtensa/src/esp32s3/esp32s3_spi.c | 2 +- drivers/syslog/ramlog.c | 3 +-- drivers/usrsock/usrsock_rpmsg.c | 2 +- fs/aio/aio_initialize.c | 3 +-- mm/iob/iob_initialize.c | 11 ++++------- net/usrsock/usrsock_devif.c | 2 +- sched/task/task_spawnparms.c | 2 +- sched/wqueue/kwork_thread.c | 4 ++-- wireless/bluetooth/bt_conn.c | 2 +- 45 files changed, 122 insertions(+), 130 deletions(-) diff --git a/arch/arm/src/am335x/am335x_i2c.c b/arch/arm/src/am335x/am335x_i2c.c index 815cf289a0..5fe0e4e35b 100644 --- a/arch/arm/src/am335x/am335x_i2c.c +++ b/arch/arm/src/am335x/am335x_i2c.c @@ -316,7 +316,7 @@ static struct am335x_i2c_priv_s am335x_i2c0_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .intstate = INTSTATE_IDLE, .msgc = 0, @@ -351,7 +351,7 @@ static struct am335x_i2c_priv_s am335x_i2c1_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .intstate = INTSTATE_IDLE, .msgc = 0, @@ -386,7 +386,7 @@ static struct am335x_i2c_priv_s am335x_i2c2_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .intstate = INTSTATE_IDLE, .msgc = 0, diff --git a/arch/arm/src/cxd56xx/cxd56_i2c.c b/arch/arm/src/cxd56xx/cxd56_i2c.c index 1a9bd668c7..ebdddf3a74 100644 --- a/arch/arm/src/cxd56xx/cxd56_i2c.c +++ b/arch/arm/src/cxd56xx/cxd56_i2c.c @@ -105,7 +105,7 @@ static struct cxd56_i2cdev_s g_i2c0dev = .base = CXD56_SCU_I2C0_BASE, .irqid = CXD56_IRQ_SCU_I2C0, .lock = NXMUTEX_INITIALIZER, - .wait = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .wait = SEM_INITIALIZER(0), .refs = 0, }; #endif @@ -116,7 +116,7 @@ static struct cxd56_i2cdev_s g_i2c1dev = .base = CXD56_SCU_I2C1_BASE, .irqid = CXD56_IRQ_SCU_I2C1, .lock = NXMUTEX_INITIALIZER, - .wait = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .wait = SEM_INITIALIZER(0), .refs = 0, }; #endif @@ -127,7 +127,7 @@ static struct cxd56_i2cdev_s g_i2c2dev = .base = CXD56_I2CM_BASE, .irqid = CXD56_IRQ_I2CM, .lock = NXMUTEX_INITIALIZER, - .wait = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .wait = SEM_INITIALIZER(0), .refs = 0, }; #endif diff --git a/arch/arm/src/efm32/efm32_i2c.c b/arch/arm/src/efm32/efm32_i2c.c index eaa1b89766..844ce20686 100644 --- a/arch/arm/src/efm32/efm32_i2c.c +++ b/arch/arm/src/efm32/efm32_i2c.c @@ -332,7 +332,7 @@ static struct efm32_i2c_priv_s efm32_i2c0_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .result = I2CRESULT_NONE, .msgc = 0, @@ -363,7 +363,7 @@ static struct efm32_i2c_priv_s efm32_i2c1_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .result = I2CRESULT_NONE, .msgc = 0, diff --git a/arch/arm/src/imxrt/imxrt_lpi2c.c b/arch/arm/src/imxrt/imxrt_lpi2c.c index 0de70bd9e4..9225356cab 100644 --- a/arch/arm/src/imxrt/imxrt_lpi2c.c +++ b/arch/arm/src/imxrt/imxrt_lpi2c.c @@ -355,7 +355,7 @@ static struct imxrt_lpi2c_priv_s imxrt_lpi2c1_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .intstate = INTSTATE_IDLE, .msgc = 0, @@ -400,7 +400,7 @@ static struct imxrt_lpi2c_priv_s imxrt_lpi2c2_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .intstate = INTSTATE_IDLE, .msgc = 0, @@ -445,7 +445,7 @@ static struct imxrt_lpi2c_priv_s imxrt_lpi2c3_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .intstate = INTSTATE_IDLE, .msgc = 0, @@ -490,7 +490,7 @@ static struct imxrt_lpi2c_priv_s imxrt_lpi2c4_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .intstate = INTSTATE_IDLE, .msgc = 0, diff --git a/arch/arm/src/kinetis/kinetis_i2c.c b/arch/arm/src/kinetis/kinetis_i2c.c index 696c4fe5c8..21f68e6184 100644 --- a/arch/arm/src/kinetis/kinetis_i2c.c +++ b/arch/arm/src/kinetis/kinetis_i2c.c @@ -191,7 +191,7 @@ static struct kinetis_i2cdev_s g_i2c0_dev = .config = &kinetis_i2c0_config, .refs = 0, .lock = NXMUTEX_INITIALIZER, - .wait = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .wait = SEM_INITIALIZER(0), .state = STATE_OK, .msgs = NULL, }; @@ -214,7 +214,7 @@ static struct kinetis_i2cdev_s g_i2c1_dev = .config = &kinetis_i2c1_config, .refs = 0, .lock = NXMUTEX_INITIALIZER, - .wait = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .wait = SEM_INITIALIZER(0), .state = STATE_OK, .msgs = NULL, }; @@ -237,7 +237,7 @@ static struct kinetis_i2cdev_s g_i2c2_dev = .config = &kinetis_i2c2_config, .refs = 0, .lock = NXMUTEX_INITIALIZER, - .wait = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .wait = SEM_INITIALIZER(0), .state = STATE_OK, .msgs = NULL, }; @@ -260,7 +260,7 @@ static struct kinetis_i2cdev_s g_i2c3_dev = .config = &kinetis_i2c3_config, .refs = 0, .lock = NXMUTEX_INITIALIZER, - .wait = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .wait = SEM_INITIALIZER(0), .state = STATE_OK, .msgs = NULL, }; diff --git a/arch/arm/src/lc823450/lc823450_i2c.c b/arch/arm/src/lc823450/lc823450_i2c.c index a7591522ef..69960dd826 100644 --- a/arch/arm/src/lc823450/lc823450_i2c.c +++ b/arch/arm/src/lc823450/lc823450_i2c.c @@ -208,7 +208,7 @@ static struct lc823450_i2c_priv_s lc823450_i2c0_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .irqstate = IRQSTATE_IDLE, .msgc = 0, @@ -238,7 +238,7 @@ static struct lc823450_i2c_priv_s lc823450_i2c1_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .irqstate = IRQSTATE_IDLE, .msgc = 0, diff --git a/arch/arm/src/nrf52/nrf52_i2c.c b/arch/arm/src/nrf52/nrf52_i2c.c index 2d6f5c57ac..b26938556b 100644 --- a/arch/arm/src/nrf52/nrf52_i2c.c +++ b/arch/arm/src/nrf52/nrf52_i2c.c @@ -131,7 +131,7 @@ static struct nrf52_i2c_priv_s g_nrf52_i2c0_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), .irq = NRF52_IRQ_SPI_TWI_0, #endif .msgc = 0, @@ -156,7 +156,7 @@ static struct nrf52_i2c_priv_s g_nrf52_i2c1_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), .irq = NRF52_IRQ_SPI_TWI_1, #endif .msgc = 0, diff --git a/arch/arm/src/rp2040/rp2040_i2c.c b/arch/arm/src/rp2040/rp2040_i2c.c index f53fc24d11..38072da4d8 100644 --- a/arch/arm/src/rp2040/rp2040_i2c.c +++ b/arch/arm/src/rp2040/rp2040_i2c.c @@ -96,7 +96,7 @@ static struct rp2040_i2cdev_s g_i2c0dev = .base = RP2040_I2C0_BASE, .irqid = RP2040_I2C0_IRQ, .lock = NXMUTEX_INITIALIZER, - .wait = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .wait = SEM_INITIALIZER(0), .refs = 0, }; #endif @@ -107,7 +107,7 @@ static struct rp2040_i2cdev_s g_i2c1dev = .base = RP2040_I2C1_BASE, .irqid = RP2040_I2C1_IRQ, .lock = NXMUTEX_INITIALIZER, - .wait = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .wait = SEM_INITIALIZER(0), .refs = 0, }; #endif diff --git a/arch/arm/src/s32k1xx/s32k1xx_lpi2c.c b/arch/arm/src/s32k1xx/s32k1xx_lpi2c.c index 2cb85b777c..593f90f96f 100644 --- a/arch/arm/src/s32k1xx/s32k1xx_lpi2c.c +++ b/arch/arm/src/s32k1xx/s32k1xx_lpi2c.c @@ -342,7 +342,7 @@ static struct s32k1xx_lpi2c_priv_s s32k1xx_lpi2c0_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .intstate = INTSTATE_IDLE, .msgc = 0, @@ -380,7 +380,7 @@ static struct s32k1xx_lpi2c_priv_s s32k1xx_lpi2c1_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .intstate = INTSTATE_IDLE, .msgc = 0, diff --git a/arch/arm/src/s32k3xx/s32k3xx_lpi2c.c b/arch/arm/src/s32k3xx/s32k3xx_lpi2c.c index 5bb1673cbf..85172d187b 100644 --- a/arch/arm/src/s32k3xx/s32k3xx_lpi2c.c +++ b/arch/arm/src/s32k3xx/s32k3xx_lpi2c.c @@ -333,7 +333,7 @@ static struct s32k3xx_lpi2c_priv_s s32k3xx_lpi2c0_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .intstate = INTSTATE_IDLE, .msgc = 0, @@ -371,7 +371,7 @@ static struct s32k3xx_lpi2c_priv_s s32k3xx_lpi2c1_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .intstate = INTSTATE_IDLE, .msgc = 0, diff --git a/arch/arm/src/samv7/sam_twihs.c b/arch/arm/src/samv7/sam_twihs.c index 8ee6f67475..58efd28dab 100644 --- a/arch/arm/src/samv7/sam_twihs.c +++ b/arch/arm/src/samv7/sam_twihs.c @@ -250,7 +250,7 @@ static struct twi_dev_s g_twi0 = { .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .waitsem = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .waitsem = SEM_INITIALIZER(0), #endif }; #endif @@ -276,7 +276,7 @@ static struct twi_dev_s g_twi1 = { .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .waitsem = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .waitsem = SEM_INITIALIZER(0), #endif }; #endif @@ -302,7 +302,7 @@ static struct twi_dev_s g_twi2 = { .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .waitsem = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .waitsem = SEM_INITIALIZER(0), #endif }; #endif diff --git a/arch/arm/src/stm32/stm32_1wire.c b/arch/arm/src/stm32/stm32_1wire.c index 8075d27f3b..3809383294 100644 --- a/arch/arm/src/stm32/stm32_1wire.c +++ b/arch/arm/src/stm32/stm32_1wire.c @@ -185,7 +185,7 @@ static struct stm32_1wire_priv_s stm32_1wire1_priv = .config = &stm32_1wire1_config, .refs = 0, .lock = NXMUTEX_INITIALIZER, - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), .msgs = NULL }; @@ -206,7 +206,7 @@ static struct stm32_1wire_priv_s stm32_1wire2_priv = .config = &stm32_1wire2_config, .refs = 0, .lock = NXMUTEX_INITIALIZER, - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), .msgs = NULL }; @@ -227,7 +227,7 @@ static struct stm32_1wire_priv_s stm32_1wire3_priv = .config = &stm32_1wire3_config, .refs = 0, .lock = NXMUTEX_INITIALIZER, - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), .msgs = NULL }; @@ -248,7 +248,7 @@ static struct stm32_1wire_priv_s stm32_1wire4_priv = .config = &stm32_1wire4_config, .refs = 0, .lock = NXMUTEX_INITIALIZER, - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), .msgs = NULL }; @@ -269,7 +269,7 @@ static struct stm32_1wire_priv_s stm32_1wire5_priv = .config = &stm32_1wire5_config, .refs = 0, .lock = NXMUTEX_INITIALIZER, - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), .msgs = NULL }; @@ -290,7 +290,7 @@ static struct stm32_1wire_priv_s stm32_1wire6_priv = .config = &stm32_1wire6_config, .refs = 0, .lock = NXMUTEX_INITIALIZER, - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), .msgs = NULL }; @@ -311,7 +311,7 @@ static struct stm32_1wire_priv_s stm32_1wire7_priv = .config = &stm32_1wire7_config, .refs = 0, .lock = NXMUTEX_INITIALIZER, - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), .msgs = NULL }; @@ -332,7 +332,7 @@ static struct stm32_1wire_priv_s stm32_1wire8_priv = .config = &stm32_1wire8_config, .refs = 0, .lock = NXMUTEX_INITIALIZER, - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), .msgs = NULL }; diff --git a/arch/arm/src/stm32/stm32_i2c.c b/arch/arm/src/stm32/stm32_i2c.c index d5778a3718..0e97f090f2 100644 --- a/arch/arm/src/stm32/stm32_i2c.c +++ b/arch/arm/src/stm32/stm32_i2c.c @@ -372,7 +372,7 @@ static struct stm32_i2c_priv_s stm32_i2c1_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .intstate = INTSTATE_IDLE, .msgc = 0, @@ -405,7 +405,7 @@ static struct stm32_i2c_priv_s stm32_i2c2_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .intstate = INTSTATE_IDLE, .msgc = 0, @@ -438,7 +438,7 @@ static struct stm32_i2c_priv_s stm32_i2c3_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .intstate = INTSTATE_IDLE, .msgc = 0, diff --git a/arch/arm/src/stm32/stm32_i2c_alt.c b/arch/arm/src/stm32/stm32_i2c_alt.c index 5ac233b847..392d4fa45b 100644 --- a/arch/arm/src/stm32/stm32_i2c_alt.c +++ b/arch/arm/src/stm32/stm32_i2c_alt.c @@ -402,7 +402,7 @@ static struct stm32_i2c_priv_s stm32_i2c1_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .intstate = INTSTATE_IDLE, .msgc = 0, @@ -435,7 +435,7 @@ static struct stm32_i2c_priv_s stm32_i2c2_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .intstate = INTSTATE_IDLE, .msgc = 0, @@ -468,7 +468,7 @@ static struct stm32_i2c_priv_s stm32_i2c3_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .intstate = INTSTATE_IDLE, .msgc = 0, diff --git a/arch/arm/src/stm32/stm32_i2c_v2.c b/arch/arm/src/stm32/stm32_i2c_v2.c index 4ebc98b31b..bdeccf6f36 100644 --- a/arch/arm/src/stm32/stm32_i2c_v2.c +++ b/arch/arm/src/stm32/stm32_i2c_v2.c @@ -516,7 +516,7 @@ static struct stm32_i2c_priv_s stm32_i2c1_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .intstate = INTSTATE_IDLE, .msgc = 0, @@ -552,7 +552,7 @@ static struct stm32_i2c_priv_s stm32_i2c2_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .intstate = INTSTATE_IDLE, .msgc = 0, @@ -588,7 +588,7 @@ static struct stm32_i2c_priv_s stm32_i2c3_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .intstate = INTSTATE_IDLE, .msgc = 0, @@ -624,7 +624,7 @@ static struct stm32_i2c_priv_s stm32_i2c4_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .intstate = INTSTATE_IDLE, .msgc = 0, diff --git a/arch/arm/src/stm32/stm32f40xxx_i2c.c b/arch/arm/src/stm32/stm32f40xxx_i2c.c index c6cff03f6b..a8aa2dc770 100644 --- a/arch/arm/src/stm32/stm32f40xxx_i2c.c +++ b/arch/arm/src/stm32/stm32f40xxx_i2c.c @@ -402,7 +402,7 @@ static struct stm32_i2c_priv_s stm32_i2c1_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .intstate = INTSTATE_IDLE, .msgc = 0, @@ -444,7 +444,7 @@ static struct stm32_i2c_priv_s stm32_i2c2_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .intstate = INTSTATE_IDLE, .msgc = 0, @@ -484,7 +484,7 @@ static struct stm32_i2c_priv_s stm32_i2c3_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .intstate = INTSTATE_IDLE, .msgc = 0, diff --git a/arch/arm/src/stm32f0l0g0/stm32_i2c.c b/arch/arm/src/stm32f0l0g0/stm32_i2c.c index 16ac57daee..efeb8813d0 100644 --- a/arch/arm/src/stm32f0l0g0/stm32_i2c.c +++ b/arch/arm/src/stm32f0l0g0/stm32_i2c.c @@ -516,7 +516,7 @@ static struct stm32_i2c_priv_s stm32_i2c1_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .intstate = INTSTATE_IDLE, .msgc = 0, @@ -551,7 +551,7 @@ static struct stm32_i2c_priv_s stm32_i2c2_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .intstate = INTSTATE_IDLE, .msgc = 0, @@ -586,7 +586,7 @@ static struct stm32_i2c_priv_s stm32_i2c3_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .intstate = INTSTATE_IDLE, .msgc = 0, @@ -621,7 +621,7 @@ static struct stm32_i2c_priv_s stm32_i2c4_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .intstate = INTSTATE_IDLE, .msgc = 0, diff --git a/arch/arm/src/stm32f7/stm32_i2c.c b/arch/arm/src/stm32f7/stm32_i2c.c index 7545a48cd6..ae0a38cb3c 100644 --- a/arch/arm/src/stm32f7/stm32_i2c.c +++ b/arch/arm/src/stm32f7/stm32_i2c.c @@ -553,7 +553,7 @@ static struct stm32_i2c_priv_s stm32_i2c1_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .intstate = INTSTATE_IDLE, .msgc = 0, @@ -589,7 +589,7 @@ static struct stm32_i2c_priv_s stm32_i2c2_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .intstate = INTSTATE_IDLE, .msgc = 0, @@ -625,7 +625,7 @@ static struct stm32_i2c_priv_s stm32_i2c3_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .intstate = INTSTATE_IDLE, .msgc = 0, @@ -661,7 +661,7 @@ static struct stm32_i2c_priv_s stm32_i2c4_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .intstate = INTSTATE_IDLE, .msgc = 0, diff --git a/arch/arm/src/stm32h7/stm32_i2c.c b/arch/arm/src/stm32h7/stm32_i2c.c index 3043526492..e12cd3fb75 100644 --- a/arch/arm/src/stm32h7/stm32_i2c.c +++ b/arch/arm/src/stm32h7/stm32_i2c.c @@ -512,7 +512,7 @@ static struct stm32_i2c_priv_s stm32_i2c1_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .intstate = INTSTATE_IDLE, .msgc = 0, @@ -548,7 +548,7 @@ static struct stm32_i2c_priv_s stm32_i2c2_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .intstate = INTSTATE_IDLE, .msgc = 0, @@ -584,7 +584,7 @@ static struct stm32_i2c_priv_s stm32_i2c3_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .intstate = INTSTATE_IDLE, .msgc = 0, @@ -620,7 +620,7 @@ static struct stm32_i2c_priv_s stm32_i2c4_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .intstate = INTSTATE_IDLE, .msgc = 0, diff --git a/arch/arm/src/stm32l4/stm32l4_1wire.c b/arch/arm/src/stm32l4/stm32l4_1wire.c index dcb0bbf861..8141da6643 100644 --- a/arch/arm/src/stm32l4/stm32l4_1wire.c +++ b/arch/arm/src/stm32l4/stm32l4_1wire.c @@ -185,7 +185,7 @@ static struct stm32_1wire_priv_s stm32_1wire1_priv = .config = &stm32_1wire1_config, .refs = 0, .lock = NXMUTEX_INITIALIZER, - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), .msgs = NULL, #ifdef CONFIG_PM .pm_cb.prepare = stm32_1wire_pm_prepare, @@ -209,7 +209,7 @@ static struct stm32_1wire_priv_s stm32_1wire2_priv = .config = &stm32_1wire2_config, .refs = 0, .lock = NXMUTEX_INITIALIZER, - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), .msgs = NULL, #ifdef CONFIG_PM .pm_cb.prepare = stm32_1wire_pm_prepare, @@ -233,7 +233,7 @@ static struct stm32_1wire_priv_s stm32_1wire3_priv = .config = &stm32_1wire3_config, .refs = 0, .lock = NXMUTEX_INITIALIZER, - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), .msgs = NULL, #ifdef CONFIG_PM .pm_cb.prepare = stm32_1wire_pm_prepare, @@ -257,7 +257,7 @@ static struct stm32_1wire_priv_s stm32_1wire4_priv = .config = &stm32_1wire4_config, .refs = 0, .lock = NXMUTEX_INITIALIZER, - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), .msgs = NULL, #ifdef CONFIG_PM .pm_cb.prepare = stm32_1wire_pm_prepare, @@ -281,7 +281,7 @@ static struct stm32_1wire_priv_s stm32_1wire5_priv = .config = &stm32_1wire5_config, .refs = 0, .lock = NXMUTEX_INITIALIZER, - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), .msgs = NULL, #ifdef CONFIG_PM .pm_cb.prepare = stm32_1wire_pm_prepare, diff --git a/arch/arm/src/stm32l4/stm32l4_i2c.c b/arch/arm/src/stm32l4/stm32l4_i2c.c index 98fc9f905a..1b3cc85fec 100644 --- a/arch/arm/src/stm32l4/stm32l4_i2c.c +++ b/arch/arm/src/stm32l4/stm32l4_i2c.c @@ -555,7 +555,7 @@ static struct stm32l4_i2c_priv_s stm32l4_i2c1_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .intstate = INTSTATE_IDLE, .msgc = 0, @@ -591,7 +591,7 @@ static struct stm32l4_i2c_priv_s stm32l4_i2c2_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .intstate = INTSTATE_IDLE, .msgc = 0, @@ -627,7 +627,7 @@ static struct stm32l4_i2c_priv_s stm32l4_i2c3_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .intstate = INTSTATE_IDLE, .msgc = 0, @@ -663,7 +663,7 @@ static struct stm32l4_i2c_priv_s stm32l4_i2c4_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .intstate = INTSTATE_IDLE, .msgc = 0, diff --git a/arch/arm/src/tiva/common/tiva_i2c.c b/arch/arm/src/tiva/common/tiva_i2c.c index a19f4cb438..f607b94139 100644 --- a/arch/arm/src/tiva/common/tiva_i2c.c +++ b/arch/arm/src/tiva/common/tiva_i2c.c @@ -322,7 +322,7 @@ static struct tiva_i2c_priv_s tiva_i2c0_priv = { .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .waitsem = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .waitsem = SEM_INITIALIZER(0), #endif }; #endif @@ -349,7 +349,7 @@ static struct tiva_i2c_priv_s tiva_i2c1_priv = { .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .waitsem = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .waitsem = SEM_INITIALIZER(0), #endif }; #endif @@ -376,7 +376,7 @@ static struct tiva_i2c_priv_s tiva_i2c2_priv = { .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .waitsem = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .waitsem = SEM_INITIALIZER(0), #endif }; #endif @@ -403,7 +403,7 @@ static struct tiva_i2c_priv_s tiva_i2c3_priv = { .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .waitsem = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .waitsem = SEM_INITIALIZER(0), #endif }; #endif @@ -430,7 +430,7 @@ static struct tiva_i2c_priv_s tiva_i2c4_priv = { .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .waitsem = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .waitsem = SEM_INITIALIZER(0), #endif }; #endif @@ -457,7 +457,7 @@ static struct tiva_i2c_priv_s tiva_i2c5_priv = { .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .waitsem = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .waitsem = SEM_INITIALIZER(0), #endif }; #endif @@ -484,7 +484,7 @@ static struct tiva_i2c_priv_s tiva_i2c6_priv = { .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .waitsem = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .waitsem = SEM_INITIALIZER(0), #endif }; #endif @@ -511,7 +511,7 @@ static struct tiva_i2c_priv_s tiva_i2c7_priv = { .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .waitsem = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .waitsem = SEM_INITIALIZER(0), #endif }; #endif @@ -538,7 +538,7 @@ static struct tiva_i2c_priv_s tiva_i2c8_priv = { .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .waitsem = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .waitsem = SEM_INITIALIZER(0), #endif }; #endif @@ -565,7 +565,7 @@ static struct tiva_i2c_priv_s tiva_i2c9_priv = { .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .waitsem = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .waitsem = SEM_INITIALIZER(0), #endif }; #endif diff --git a/arch/arm/src/tlsr82/tlsr82_serial.c b/arch/arm/src/tlsr82/tlsr82_serial.c index 68bcf44760..c38e3b9088 100644 --- a/arch/arm/src/tlsr82/tlsr82_serial.c +++ b/arch/arm/src/tlsr82/tlsr82_serial.c @@ -262,8 +262,7 @@ static char g_uart0txbuffer[UART0_TX_BUF_SIZE]; #ifdef CONFIG_TLSR82_UART0_TXDMA static char g_uart0txdmabuf[UART0_TXDMA_BUF_SIZE + DMA_HEAD_LEN] \ aligned_data(4); -static sem_t g_uart0txdmasem = NXSEM_INITIALIZER(1, - PRIOINHERIT_FLAGS_DISABLE); +static sem_t g_uart0txdmasem = SEM_INITIALIZER(1); #endif #ifdef CONFIG_TLSR82_UART0_RXDMA diff --git a/arch/mips/src/pic32mz/pic32mz_i2c.c b/arch/mips/src/pic32mz/pic32mz_i2c.c index 1a115bdc10..29ab0b8b5e 100644 --- a/arch/mips/src/pic32mz/pic32mz_i2c.c +++ b/arch/mips/src/pic32mz/pic32mz_i2c.c @@ -336,7 +336,7 @@ static struct pic32mz_i2c_priv_s pic32mz_i2c1_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .intstate = INTSTATE_IDLE, .msgc = 0, @@ -368,7 +368,7 @@ static struct pic32mz_i2c_priv_s pic32mz_i2c2_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .intstate = INTSTATE_IDLE, .msgc = 0, @@ -400,7 +400,7 @@ static struct pic32mz_i2c_priv_s pic32mz_i2c3_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .intstate = INTSTATE_IDLE, .msgc = 0, @@ -432,7 +432,7 @@ static struct pic32mz_i2c_priv_s pic32mz_i2c4_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .intstate = INTSTATE_IDLE, .msgc = 0, @@ -464,7 +464,7 @@ static struct pic32mz_i2c_priv_s pic32mz_i2c5_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .intstate = INTSTATE_IDLE, .msgc = 0, diff --git a/arch/renesas/src/rx65n/rx65n_riic.c b/arch/renesas/src/rx65n/rx65n_riic.c index 47fd7a5509..0133167a0a 100644 --- a/arch/renesas/src/rx65n/rx65n_riic.c +++ b/arch/renesas/src/rx65n/rx65n_riic.c @@ -244,7 +244,7 @@ static struct rx65n_i2c_priv_s rx65n_riic0_priv = .bus = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .mode = RIIC_NONE, .dev_sts = RIIC_STS_NO_INIT, @@ -279,7 +279,7 @@ static struct rx65n_i2c_priv_s rx65n_riic1_priv = .bus = 1, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .mode = RIIC_NONE, .dev_sts = RIIC_STS_NO_INIT, @@ -314,7 +314,7 @@ static struct rx65n_i2c_priv_s rx65n_riic2_priv = .bus = 2, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .mode = RIIC_NONE, .dev_sts = RIIC_STS_NO_INIT, diff --git a/arch/risc-v/src/bl602/bl602_i2c.c b/arch/risc-v/src/bl602/bl602_i2c.c index 005480dff6..aafa185ae6 100644 --- a/arch/risc-v/src/bl602/bl602_i2c.c +++ b/arch/risc-v/src/bl602/bl602_i2c.c @@ -153,7 +153,7 @@ static struct bl602_i2c_priv_s bl602_i2c0_priv = .subaddr = 0, .sublen = 0, .lock = NXMUTEX_INITIALIZER, - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), .i2cstate = EV_I2C_END_INT, .msgv = NULL, .msgid = 0, diff --git a/arch/risc-v/src/bl602/bl602_spi.c b/arch/risc-v/src/bl602/bl602_spi.c index 1c9f0fdbca..00c732dbc1 100644 --- a/arch/risc-v/src/bl602/bl602_spi.c +++ b/arch/risc-v/src/bl602/bl602_spi.c @@ -239,8 +239,8 @@ static struct bl602_spi_priv_s bl602_spi_priv = }, .config = &bl602_spi_config, .lock = NXMUTEX_INITIALIZER, - .sem_isr_tx = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), - .sem_isr_rx = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr_tx = SEM_INITIALIZER(0), + .sem_isr_rx = SEM_INITIALIZER(0), .dma_rxchan = -1, .dma_txchan = -1, }; diff --git a/arch/risc-v/src/esp32c3/esp32c3_i2c.c b/arch/risc-v/src/esp32c3/esp32c3_i2c.c index 43b937108e..afc5a9046e 100644 --- a/arch/risc-v/src/esp32c3/esp32c3_i2c.c +++ b/arch/risc-v/src/esp32c3/esp32c3_i2c.c @@ -332,7 +332,7 @@ static struct esp32c3_i2c_priv_s esp32c3_i2c0_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .i2cstate = I2CSTATE_IDLE, .msgv = NULL, diff --git a/arch/risc-v/src/esp32c3/esp32c3_spi.c b/arch/risc-v/src/esp32c3/esp32c3_spi.c index 9438e230ea..30618158f2 100644 --- a/arch/risc-v/src/esp32c3/esp32c3_spi.c +++ b/arch/risc-v/src/esp32c3/esp32c3_spi.c @@ -308,7 +308,7 @@ static struct esp32c3_spi_priv_s esp32c3_spi2_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifdef CONFIG_ESP32C3_SPI2_DMA - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), .cpuint = -ENOMEM, .dma_channel = -1, #endif diff --git a/arch/risc-v/src/mpfs/mpfs_i2c.c b/arch/risc-v/src/mpfs/mpfs_i2c.c index 774bb8e6a4..5e7bde97b0 100644 --- a/arch/risc-v/src/mpfs/mpfs_i2c.c +++ b/arch/risc-v/src/mpfs/mpfs_i2c.c @@ -164,7 +164,7 @@ static struct mpfs_i2c_priv_s g_mpfs_i2c0_lo_priv = .ser_address = 0x21, .target_addr = 0, .lock = NXMUTEX_INITIALIZER, - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), .refs = 0, .tx_size = 0, .tx_idx = 0, @@ -187,7 +187,7 @@ static struct mpfs_i2c_priv_s g_mpfs_i2c1_lo_priv = .ser_address = 0x21, .target_addr = 0, .lock = NXMUTEX_INITIALIZER, - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), .refs = 0, .tx_size = 0, .tx_idx = 0, diff --git a/arch/risc-v/src/mpfs/mpfs_ihc.c b/arch/risc-v/src/mpfs/mpfs_ihc.c index d8e7b7426e..2a6a6c1cc4 100644 --- a/arch/risc-v/src/mpfs/mpfs_ihc.c +++ b/arch/risc-v/src/mpfs/mpfs_ihc.c @@ -178,10 +178,8 @@ static struct rpmsg_device *g_mpfs_rpmsg_device; static struct rpmsg_virtio_device *g_mpfs_virtio_device; #ifndef CONFIG_MPFS_OPENSBI -static sem_t g_mpfs_ack_sig = NXSEM_INITIALIZER(0, - PRIOINHERIT_FLAGS_DISABLE); -static sem_t g_mpfs_rx_sig = NXSEM_INITIALIZER(0, - PRIOINHERIT_FLAGS_DISABLE); +static sem_t g_mpfs_ack_sig = SEM_INITIALIZER(0); +static sem_t g_mpfs_rx_sig = SEM_INITIALIZER(0); #endif static struct list_node g_dev_list = LIST_INITIAL_VALUE(g_dev_list); diff --git a/arch/risc-v/src/mpfs/mpfs_spi.c b/arch/risc-v/src/mpfs/mpfs_spi.c index 60fc98756b..71b76af420 100644 --- a/arch/risc-v/src/mpfs/mpfs_spi.c +++ b/arch/risc-v/src/mpfs/mpfs_spi.c @@ -233,7 +233,7 @@ static struct mpfs_spi_priv_s g_mpfs_spi0_priv = .id = 0, .devid = 0, .lock = NXMUTEX_INITIALIZER, - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), }; #endif /* CONFIG_MPFS_SPI0 */ @@ -279,7 +279,7 @@ static struct mpfs_spi_priv_s g_mpfs_spi1_priv = .id = 1, .devid = 1, .lock = NXMUTEX_INITIALIZER, - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), }; #endif /* CONFIG_MPFS_SPI1 */ diff --git a/arch/xtensa/src/esp32/esp32_i2c.c b/arch/xtensa/src/esp32/esp32_i2c.c index 50a76555d2..9680daf4c0 100644 --- a/arch/xtensa/src/esp32/esp32_i2c.c +++ b/arch/xtensa/src/esp32/esp32_i2c.c @@ -308,7 +308,7 @@ static struct esp32_i2c_priv_s esp32_i2c0_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .i2cstate = I2CSTATE_IDLE, .msgv = NULL, @@ -344,7 +344,7 @@ static struct esp32_i2c_priv_s esp32_i2c1_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .i2cstate = I2CSTATE_IDLE, .msgv = NULL, diff --git a/arch/xtensa/src/esp32/esp32_spi.c b/arch/xtensa/src/esp32/esp32_spi.c index e8e5ac368c..78a8b47348 100644 --- a/arch/xtensa/src/esp32/esp32_spi.c +++ b/arch/xtensa/src/esp32/esp32_spi.c @@ -277,7 +277,7 @@ static struct esp32_spi_priv_s esp32_spi2_priv = }, .config = &esp32_spi2_config, .lock = NXMUTEX_INITIALIZER, - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), }; #endif /* CONFIG_ESP32_SPI2 */ @@ -353,7 +353,7 @@ static struct esp32_spi_priv_s esp32_spi3_priv = }, .config = &esp32_spi3_config, .lock = NXMUTEX_INITIALIZER, - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), }; #endif /* CONFIG_ESP32_SPI3 */ diff --git a/arch/xtensa/src/esp32s2/esp32s2_i2c.c b/arch/xtensa/src/esp32s2/esp32s2_i2c.c index 575d8fd1d2..6e89ecd2d3 100644 --- a/arch/xtensa/src/esp32s2/esp32s2_i2c.c +++ b/arch/xtensa/src/esp32s2/esp32s2_i2c.c @@ -321,7 +321,7 @@ static struct esp32s2_i2c_priv_s g_esp32s2_i2c0_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .i2cstate = I2CSTATE_IDLE, .msgv = NULL, @@ -357,7 +357,7 @@ static struct esp32s2_i2c_priv_s g_esp32s2_i2c1_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .i2cstate = I2CSTATE_IDLE, .msgv = NULL, diff --git a/arch/xtensa/src/esp32s3/esp32s3_i2c.c b/arch/xtensa/src/esp32s3/esp32s3_i2c.c index 7c245ca4f5..935623960e 100644 --- a/arch/xtensa/src/esp32s3/esp32s3_i2c.c +++ b/arch/xtensa/src/esp32s3/esp32s3_i2c.c @@ -315,7 +315,7 @@ static struct esp32s3_i2c_priv_s g_esp32s3_i2c0_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .i2cstate = I2CSTATE_IDLE, .msgv = NULL, @@ -351,7 +351,7 @@ static struct esp32s3_i2c_priv_s g_esp32s3_i2c1_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifndef CONFIG_I2C_POLLED - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), #endif .i2cstate = I2CSTATE_IDLE, .msgv = NULL, diff --git a/arch/xtensa/src/esp32s3/esp32s3_spi.c b/arch/xtensa/src/esp32s3/esp32s3_spi.c index 0a8fcd77d7..e99952e9d6 100644 --- a/arch/xtensa/src/esp32s3/esp32s3_spi.c +++ b/arch/xtensa/src/esp32s3/esp32s3_spi.c @@ -298,7 +298,7 @@ static struct esp32s3_spi_priv_s esp32s3_spi2_priv = .refs = 0, .lock = NXMUTEX_INITIALIZER, #ifdef CONFIG_ESP32S3_SPI2_DMA - .sem_isr = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + .sem_isr = SEM_INITIALIZER(0), .cpuint = -ENOMEM, .dma_channel = -1, #endif diff --git a/drivers/syslog/ramlog.c b/drivers/syslog/ramlog.c index 5fce475c3c..dfc3e7dad0 100644 --- a/drivers/syslog/ramlog.c +++ b/drivers/syslog/ramlog.c @@ -146,8 +146,7 @@ static struct ramlog_dev_s g_sysdev = CONFIG_RAMLOG_BUFSIZE, /* rl_tail */ NXMUTEX_INITIALIZER, /* rl_lock */ # ifndef CONFIG_RAMLOG_NONBLOCKING - NXSEM_INITIALIZER(0, - PRIOINHERIT_FLAGS_DISABLE), /* rl_waitsem */ + SEM_INITIALIZER(0), /* rl_waitsem */ # endif CONFIG_RAMLOG_BUFSIZE, /* rl_bufsize */ g_sysbuffer /* rl_buffer */ diff --git a/drivers/usrsock/usrsock_rpmsg.c b/drivers/usrsock/usrsock_rpmsg.c index 9837618f6a..8b2a584dc1 100644 --- a/drivers/usrsock/usrsock_rpmsg.c +++ b/drivers/usrsock/usrsock_rpmsg.c @@ -69,7 +69,7 @@ static void usrsock_rpmsg_device_destroy(FAR struct rpmsg_device *rdev, static struct usrsock_rpmsg_s g_usrsock_rpmsg = { - NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE) + SEM_INITIALIZER(0) }; /**************************************************************************** diff --git a/fs/aio/aio_initialize.c b/fs/aio/aio_initialize.c index f8595c702f..b611e4289a 100644 --- a/fs/aio/aio_initialize.c +++ b/fs/aio/aio_initialize.c @@ -49,8 +49,7 @@ static dq_queue_t g_aioc_free; /* This counting semaphore tracks the number of free AIO containers */ -static sem_t g_aioc_freesem = NXSEM_INITIALIZER(CONFIG_FS_NAIOC, - PRIOINHERIT_FLAGS_DISABLE); +static sem_t g_aioc_freesem = SEM_INITIALIZER(CONFIG_FS_NAIOC); /* This binary lock supports exclusive access to the list of pending * asynchronous I/O. g_aio_holder and a_aio_count support the reentrant diff --git a/mm/iob/iob_initialize.c b/mm/iob/iob_initialize.c index 7d3c3b72c4..5d3cbbb57c 100644 --- a/mm/iob/iob_initialize.c +++ b/mm/iob/iob_initialize.c @@ -87,22 +87,19 @@ FAR struct iob_qentry_s *g_iob_qcommitted; /* Counting semaphores that tracks the number of free IOBs/qentries */ -sem_t g_iob_sem = NXSEM_INITIALIZER(CONFIG_IOB_NBUFFERS, - PRIOINHERIT_FLAGS_DISABLE); +sem_t g_iob_sem = SEM_INITIALIZER(CONFIG_IOB_NBUFFERS); #if CONFIG_IOB_THROTTLE > 0 /* Counts available I/O buffers when throttled */ -sem_t g_throttle_sem = NXSEM_INITIALIZER(CONFIG_IOB_NBUFFERS - - CONFIG_IOB_THROTTLE, - PRIOINHERIT_FLAGS_DISABLE); +sem_t g_throttle_sem = SEM_INITIALIZER(CONFIG_IOB_NBUFFERS - + CONFIG_IOB_THROTTLE); #endif #if CONFIG_IOB_NCHAINS > 0 /* Counts free I/O buffer queue containers */ -sem_t g_qentry_sem = NXSEM_INITIALIZER(CONFIG_IOB_NCHAINS, - PRIOINHERIT_FLAGS_DISABLE); +sem_t g_qentry_sem = SEM_INITIALIZER(CONFIG_IOB_NCHAINS); #endif /**************************************************************************** diff --git a/net/usrsock/usrsock_devif.c b/net/usrsock/usrsock_devif.c index 1afcf008c7..7f40a29f83 100644 --- a/net/usrsock/usrsock_devif.c +++ b/net/usrsock/usrsock_devif.c @@ -74,7 +74,7 @@ struct usrsock_req_s static struct usrsock_req_s g_usrsock_req = { NXMUTEX_INITIALIZER, - NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + SEM_INITIALIZER(0), 0, 0, 0, diff --git a/sched/task/task_spawnparms.c b/sched/task/task_spawnparms.c index e829598972..3a62f1006c 100644 --- a/sched/task/task_spawnparms.c +++ b/sched/task/task_spawnparms.c @@ -44,7 +44,7 @@ mutex_t g_spawn_parmlock = NXMUTEX_INITIALIZER; #ifndef CONFIG_SCHED_WAITPID -sem_t g_spawn_execsem = NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE); +sem_t g_spawn_execsem = SEM_INITIALIZER(0); #endif struct spawn_parms_s g_spawn_parms; diff --git a/sched/wqueue/kwork_thread.c b/sched/wqueue/kwork_thread.c index f3883726ed..fa39326327 100644 --- a/sched/wqueue/kwork_thread.c +++ b/sched/wqueue/kwork_thread.c @@ -80,7 +80,7 @@ struct hp_wqueue_s g_hpwork = { {NULL, NULL}, - NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + SEM_INITIALIZER(0), }; #endif /* CONFIG_SCHED_HPWORK */ @@ -91,7 +91,7 @@ struct hp_wqueue_s g_hpwork = struct lp_wqueue_s g_lpwork = { {NULL, NULL}, - NXSEM_INITIALIZER(0, PRIOINHERIT_FLAGS_DISABLE), + SEM_INITIALIZER(0), }; #endif /* CONFIG_SCHED_LPWORK */ diff --git a/wireless/bluetooth/bt_conn.c b/wireless/bluetooth/bt_conn.c index 68c958723c..c69658a685 100644 --- a/wireless/bluetooth/bt_conn.c +++ b/wireless/bluetooth/bt_conn.c @@ -78,7 +78,7 @@ struct bt_conn_handoff_s static struct bt_conn_s g_conns[CONFIG_BLUETOOTH_MAX_CONN]; static struct bt_conn_handoff_s g_conn_handoff = { - NXSEM_INITIALIZER(1, PRIOINHERIT_FLAGS_DISABLE), + SEM_INITIALIZER(1), NULL };