Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[mutex] use RT_IPC_FLAG_PRIO to replace RT_IPC_FLAG_FIFO #5284

Merged
merged 1 commit into from
Nov 19, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bsp/at32/Libraries/rt_drivers/drv_sdio.c
Original file line number Diff line number Diff line change
Expand Up @@ -648,7 +648,7 @@ struct rt_mmcsd_host *sdio_host_create(struct at32_sdio_des *sdio_des)
sdio->sdio_des.clk_get = (sdio_des->clk_get == RT_NULL ? at32_sdio_clk_get : sdio_des->clk_get);

rt_event_init(&sdio->event, "sdio", RT_IPC_FLAG_FIFO);
rt_mutex_init(&sdio->mutex, "sdio", RT_IPC_FLAG_FIFO);
rt_mutex_init(&sdio->mutex, "sdio", RT_IPC_FLAG_PRIO);

/* set host defautl attributes */
host->ops = &ops;
Expand Down
4 changes: 2 additions & 2 deletions bsp/bluetrum/ab32vg1-ab-prougen/board/board.c
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,8 @@ RT_SECTION(".irq.cache")
void cache_init(void)
{
os_cache_init();
rt_mutex_init(&mutex_spiflash, "flash_mutex", RT_IPC_FLAG_FIFO);
rt_mutex_init(&mutex_cache, "cache_mutex", RT_IPC_FLAG_FIFO);
rt_mutex_init(&mutex_spiflash, "flash_mutex", RT_IPC_FLAG_PRIO);
rt_mutex_init(&mutex_cache, "cache_mutex", RT_IPC_FLAG_PRIO);
}

RT_SECTION(".irq.cache")
Expand Down
2 changes: 1 addition & 1 deletion bsp/bluetrum/libraries/hal_drivers/drv_sdio.c
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,7 @@ struct rt_mmcsd_host *sdio_host_create(struct ab32_sdio_des *sdio_des)
sdio->sdio_des.clk_get = (sdio_des->clk_get == RT_NULL ? ab32_sdio_clk_get : sdio_des->clk_get);

rt_event_init(&sdio->event, "sdio", RT_IPC_FLAG_FIFO);
rt_mutex_init(&sdio->mutex, "sdio", RT_IPC_FLAG_FIFO);
rt_mutex_init(&sdio->mutex, "sdio", RT_IPC_FLAG_PRIO);

/* set host defautl attributes */
host->ops = &ab32_sdio_ops;
Expand Down
2 changes: 1 addition & 1 deletion bsp/ft2004/drivers/drv_sdctrl.c
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,7 @@ static rt_err_t rthw_sdctrl_create(ft_sdctrl_class_t *class_p)

class_p->ft_sdctrl.config = *(FSdCtrl_Config_t *)FSdCtrl_LookupConfig(0);
rt_event_init(&class_p->event, "sdctrl", RT_IPC_FLAG_FIFO);
rt_mutex_init(&class_p->mutex, "sdctrl", RT_IPC_FLAG_FIFO);
rt_mutex_init(&class_p->mutex, "sdctrl", RT_IPC_FLAG_PRIO);

class_p->host = host;
host->ops = &ops;
Expand Down
2 changes: 1 addition & 1 deletion bsp/k210/driver/dmalock.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ static struct dmac_host _dmac_host;
void dmalock_init(void)
{
rt_sem_init(&_dmac_host.sem, "dma_sem", DMAC_CHANNEL_COUNT, RT_IPC_FLAG_FIFO);
rt_mutex_init(&_dmac_host.mutex, "dma_mutex", RT_IPC_FLAG_FIFO);
rt_mutex_init(&_dmac_host.mutex, "dma_mutex", RT_IPC_FLAG_PRIO);
for (int i = 0; i < DMAC_CHANNEL_COUNT; i++)
{
_dmac_host.channel_used[i] = 0;
Expand Down
2 changes: 1 addition & 1 deletion bsp/lpc54608-LPCXpresso/drivers/drv_sd.c
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ rt_err_t mci_hw_init(const char *device_name)
}

/* initialize mutex lock */
rt_mutex_init(&_mci_device->lock, device_name, RT_IPC_FLAG_FIFO);
rt_mutex_init(&_mci_device->lock, device_name, RT_IPC_FLAG_PRIO);
/* create finish event */
_mci_device->finish_event = rt_event_create(device_name, RT_IPC_FLAG_FIFO);

Expand Down
2 changes: 1 addition & 1 deletion bsp/lpc55sxx/Libraries/drivers/drv_sd.c
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ int rt_hw_mci_init(void)
}

/* initialize mutex lock */
rt_mutex_init(&_mci_device->lock, "sdcard0", RT_IPC_FLAG_FIFO);
rt_mutex_init(&_mci_device->lock, "sdcard0", RT_IPC_FLAG_PRIO);
/* create finish event */
_mci_device->finish_event = rt_event_create("sdcard0", RT_IPC_FLAG_FIFO);

Expand Down
2 changes: 1 addition & 1 deletion bsp/simulator/drivers/sd_sim.c
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ rt_err_t rt_hw_sdcard_init(const char *spi_device_name)
sd = &_sdcard;
device = &(sd->parent);

lock = rt_mutex_create("lock", RT_IPC_FLAG_FIFO);
lock = rt_mutex_create("lock", RT_IPC_FLAG_PRIO);
if (lock == RT_NULL)
{
LOG_E("Create mutex in rt_hw_sdcard_init failed!");
Expand Down
2 changes: 1 addition & 1 deletion bsp/simulator/drivers/sdl_fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ static void sdlfb_hw_init(void)

rt_device_register(RT_DEVICE(&_device), "sdl", RT_DEVICE_FLAG_RDWR);

sdllock = rt_mutex_create("fb", RT_IPC_FLAG_FIFO);
sdllock = rt_mutex_create("fb", RT_IPC_FLAG_PRIO);
if (sdllock == RT_NULL)
{
LOG_E("Create mutex for sdlfb failed!");
Expand Down
2 changes: 1 addition & 1 deletion bsp/simulator/drivers/sst25vfxx_mtd_sim.c
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ rt_err_t sst25vfxx_mtd_init(const char *nor_name,
mtd->ops = &sst25vfxx_mtd_ops;

/* initialize mutex */
if (rt_mutex_init(&flash_lock, nor_name, RT_IPC_FLAG_FIFO) != RT_EOK)
if (rt_mutex_init(&flash_lock, nor_name, RT_IPC_FLAG_PRIO) != RT_EOK)
{
rt_kprintf("init sd lock mutex failed\n");
}
Expand Down
2 changes: 1 addition & 1 deletion bsp/stm32/libraries/HAL_Drivers/drv_crypto.c
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,7 @@ int stm32_hw_crypto_device_init(void)
{
return -1;
}
rt_mutex_init(&_crypto_dev.mutex, RT_HWCRYPTO_DEFAULT_NAME, RT_IPC_FLAG_FIFO);
rt_mutex_init(&_crypto_dev.mutex, RT_HWCRYPTO_DEFAULT_NAME, RT_IPC_FLAG_PRIO);
return 0;
}
INIT_DEVICE_EXPORT(stm32_hw_crypto_device_init);
2 changes: 1 addition & 1 deletion bsp/stm32/libraries/HAL_Drivers/drv_sdio.c
Original file line number Diff line number Diff line change
Expand Up @@ -650,7 +650,7 @@ struct rt_mmcsd_host *sdio_host_create(struct stm32_sdio_des *sdio_des)
sdio->sdio_des.clk_get = (sdio_des->clk_get == RT_NULL ? stm32_sdio_clk_get : sdio_des->clk_get);

rt_event_init(&sdio->event, "sdio", RT_IPC_FLAG_FIFO);
rt_mutex_init(&sdio->mutex, "sdio", RT_IPC_FLAG_FIFO);
rt_mutex_init(&sdio->mutex, "sdio", RT_IPC_FLAG_PRIO);

/* set host defautl attributes */
host->ops = &ops;
Expand Down
2 changes: 1 addition & 1 deletion bsp/stm32/stm32h750-artpi-h750/board/port/drv_sdio.c
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,7 @@ int rt_hw_sdio_init(void)
/* wifi auto change */
mmcsd_change(host2);
#endif
mmcsd_mutex = rt_mutex_create("mmutex", RT_IPC_FLAG_FIFO);
mmcsd_mutex = rt_mutex_create("mmutex", RT_IPC_FLAG_PRIO);

if (mmcsd_mutex == RT_NULL)
{
Expand Down
4 changes: 2 additions & 2 deletions bsp/stm32/stm32mp157a-st-discovery/board/ports/drv_sdio.c
Original file line number Diff line number Diff line change
Expand Up @@ -473,14 +473,14 @@ struct rt_mmcsd_host *sdio_host_create(struct stm32_sdio_des *sdio_des)
{
sdio->sdio_des.hw_sdio = (struct stm32_sdio *)SDIO1_BASE_ADDRESS;
rt_event_init(&sdio->event, "sdio1", RT_IPC_FLAG_FIFO);
rt_mutex_init(&sdio->mutex, "sdio1", RT_IPC_FLAG_FIFO);
rt_mutex_init(&sdio->mutex, "sdio1", RT_IPC_FLAG_PRIO);
}

if(sdio_des->hsd.Instance == SDMMC2)
{
sdio->sdio_des.hw_sdio = (struct stm32_sdio *)SDIO2_BASE_ADDRESS;
rt_event_init(&sdio->event, "sdio2", RT_IPC_FLAG_FIFO);
rt_mutex_init(&sdio->mutex, "sdio2", RT_IPC_FLAG_FIFO);
rt_mutex_init(&sdio->mutex, "sdio2", RT_IPC_FLAG_PRIO);
}

/* set host default attributes */
Expand Down
2 changes: 1 addition & 1 deletion bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_emmc.c
Original file line number Diff line number Diff line change
Expand Up @@ -503,7 +503,7 @@ struct rt_mmcsd_host *sdio_host_create(struct stm32_sdio_des *sdio_des)
sdio->sdio_des.hw_sdio = (struct stm32_sdio *)EMMC_BASE_ADDRESS;

rt_event_init(&sdio->event, "sdio", RT_IPC_FLAG_FIFO);
rt_mutex_init(&sdio->mutex, "sdio", RT_IPC_FLAG_FIFO);
rt_mutex_init(&sdio->mutex, "sdio", RT_IPC_FLAG_PRIO);
/* set host default attributes */
host->ops = &ops;
host->freq_min = 400 * 1000;
Expand Down
2 changes: 1 addition & 1 deletion bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_nand.c
Original file line number Diff line number Diff line change
Expand Up @@ -640,7 +640,7 @@ int rt_hw_nand_init(void)
LOG_D("nand flash init error!");
return RT_ERROR;
}
rt_mutex_init(&_device.lock, "nand", RT_IPC_FLAG_FIFO);
rt_mutex_init(&_device.lock, "nand", RT_IPC_FLAG_PRIO);

nand_dev.page_size = 4096;
nand_dev.pages_per_block = 224;
Expand Down
2 changes: 1 addition & 1 deletion bsp/swm320-lq100/drivers/drv_crypto.c
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ int rt_hw_crypto_init(void)
{
return -1;
}
rt_mutex_init(&_crypto_dev.mutex, RT_HWCRYPTO_DEFAULT_NAME, RT_IPC_FLAG_FIFO);
rt_mutex_init(&_crypto_dev.mutex, RT_HWCRYPTO_DEFAULT_NAME, RT_IPC_FLAG_PRIO);
return 0;
}
INIT_BOARD_EXPORT(rt_hw_crypto_init);
Expand Down
2 changes: 1 addition & 1 deletion bsp/swm320-lq100/drivers/drv_nor_flash.c
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ int rt_hw_norflash_init(void)
mtd.ops = &mtd_ops;

/* initialize mutex */
if (rt_mutex_init(&flash_lock, "nor", RT_IPC_FLAG_FIFO) != RT_EOK)
if (rt_mutex_init(&flash_lock, "nor", RT_IPC_FLAG_PRIO) != RT_EOK)
{
rt_kprintf("init sd lock mutex failed\n");
return -RT_ERROR;
Expand Down
2 changes: 1 addition & 1 deletion bsp/swm320-lq100/drivers/drv_sdio.c
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,7 @@ struct rt_mmcsd_host *sdio_host_create(struct swm_sdio_des *sdio_des)
rt_memcpy(&sdio->sdio_des, sdio_des, sizeof(struct swm_sdio_des));

rt_event_init(&sdio->event, "sdio", RT_IPC_FLAG_FIFO);
rt_mutex_init(&sdio->mutex, "sdio", RT_IPC_FLAG_FIFO);
rt_mutex_init(&sdio->mutex, "sdio", RT_IPC_FLAG_PRIO);

/* set host defautl attributes */
host->ops = &swm_sdio_ops;
Expand Down
2 changes: 1 addition & 1 deletion bsp/swm320/drivers/drv_crypto.c
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ int rt_hw_crypto_init(void)
{
return -1;
}
rt_mutex_init(&_crypto_dev.mutex, RT_HWCRYPTO_DEFAULT_NAME, RT_IPC_FLAG_FIFO);
rt_mutex_init(&_crypto_dev.mutex, RT_HWCRYPTO_DEFAULT_NAME, RT_IPC_FLAG_PRIO);
return 0;
}
INIT_BOARD_EXPORT(rt_hw_crypto_init);
Expand Down
2 changes: 1 addition & 1 deletion bsp/swm320/drivers/drv_nor_flash.c
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ int rt_hw_norflash_init(void)
mtd.ops = &mtd_ops;

/* initialize mutex */
if (rt_mutex_init(&flash_lock, "nor", RT_IPC_FLAG_FIFO) != RT_EOK)
if (rt_mutex_init(&flash_lock, "nor", RT_IPC_FLAG_PRIO) != RT_EOK)
{
rt_kprintf("init sd lock mutex failed\n");
return -RT_ERROR;
Expand Down
2 changes: 1 addition & 1 deletion bsp/swm320/drivers/drv_sdio.c
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,7 @@ struct rt_mmcsd_host *sdio_host_create(struct swm_sdio_des *sdio_des)
rt_memcpy(&sdio->sdio_des, sdio_des, sizeof(struct swm_sdio_des));

rt_event_init(&sdio->event, "sdio", RT_IPC_FLAG_FIFO);
rt_mutex_init(&sdio->mutex, "sdio", RT_IPC_FLAG_FIFO);
rt_mutex_init(&sdio->mutex, "sdio", RT_IPC_FLAG_PRIO);

/* set host defautl attributes */
host->ops = &swm_sdio_ops;
Expand Down
2 changes: 1 addition & 1 deletion bsp/w60x/drivers/drv_crypto.c
Original file line number Diff line number Diff line change
Expand Up @@ -732,7 +732,7 @@ int wm_hw_crypto_device_init(void)
{
return -1;
}
rt_mutex_init(&_crypto_dev.mutex, RT_HWCRYPTO_DEFAULT_NAME, RT_IPC_FLAG_FIFO);
rt_mutex_init(&_crypto_dev.mutex, RT_HWCRYPTO_DEFAULT_NAME, RT_IPC_FLAG_PRIO);
return 0;
}
INIT_DEVICE_EXPORT(wm_hw_crypto_device_init);
2 changes: 1 addition & 1 deletion bsp/x86/drivers/floppy.c
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ void rt_floppy_init(void)
{
struct rt_device *device;

rt_mutex_init(&lock,"fdlock", RT_IPC_FLAG_FIFO);
rt_mutex_init(&lock,"fdlock", RT_IPC_FLAG_PRIO);
rt_sem_init(&sem, "fdsem", 0, RT_IPC_FLAG_FIFO);

rt_hw_interrupt_install(FLOPPY_IRQ, rt_floppy_isr, RT_NULL, "floppy");
Expand Down
2 changes: 1 addition & 1 deletion bsp/zynqmp-r5-axu4ev/drivers/drv_sdcard.c
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ static rt_err_t rt_sdcard_init(rt_device_t dev)
BYTE drvnum = *((BYTE *)dev->user_data);

rt_snprintf(sdlock_name, sizeof(sdlock_name), "sdlock%d", drvnum);
if (rt_mutex_init(&sd_lock[drvnum], sdlock_name, RT_IPC_FLAG_FIFO) != RT_EOK)
if (rt_mutex_init(&sd_lock[drvnum], sdlock_name, RT_IPC_FLAG_PRIO) != RT_EOK)
{
LOG_E("init sdlock semaphore failed\n");
}
Expand Down
2 changes: 1 addition & 1 deletion components/cplusplus/cxx_Mutex.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ using namespace rtthread;

Mutex::Mutex(const char *name)
{
rt_mutex_init(&mID, name, RT_IPC_FLAG_FIFO);
rt_mutex_init(&mID, name, RT_IPC_FLAG_PRIO);
}

bool Mutex::lock(int32_t millisec)
Expand Down
2 changes: 1 addition & 1 deletion components/dfs/filesystems/elmfat/dfs_elm.c
Original file line number Diff line number Diff line change
Expand Up @@ -980,7 +980,7 @@ int ff_cre_syncobj(BYTE drv, FF_SYNC_t *m)
rt_mutex_t mutex;

rt_snprintf(name, sizeof(name), "fat%d", drv);
mutex = rt_mutex_create(name, RT_IPC_FLAG_FIFO);
mutex = rt_mutex_create(name, RT_IPC_FLAG_PRIO);
if (mutex != RT_NULL)
{
*m = mutex;
Expand Down
2 changes: 1 addition & 1 deletion components/dfs/src/dfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ int dfs_init(void)
memset(&_fdtab, 0, sizeof(_fdtab));

/* create device filesystem lock */
rt_mutex_init(&fslock, "fslock", RT_IPC_FLAG_FIFO);
rt_mutex_init(&fslock, "fslock", RT_IPC_FLAG_PRIO);

#ifdef DFS_USING_WORKDIR
/* set current working directory */
Expand Down
2 changes: 1 addition & 1 deletion components/drivers/i2c/i2c_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ rt_err_t rt_i2c_bus_device_register(struct rt_i2c_bus_device *bus,
{
rt_err_t res = RT_EOK;

rt_mutex_init(&bus->lock, "i2c_bus_lock", RT_IPC_FLAG_FIFO);
rt_mutex_init(&bus->lock, "i2c_bus_lock", RT_IPC_FLAG_PRIO);

if (bus->timeout == 0) bus->timeout = RT_TICK_PER_SECOND;

Expand Down
2 changes: 1 addition & 1 deletion components/drivers/rtc/alarm.c
Original file line number Diff line number Diff line change
Expand Up @@ -790,7 +790,7 @@ int rt_alarm_system_init(void)

rt_list_init(&_container.head);
rt_event_init(&_container.event, "alarmsvc", RT_IPC_FLAG_FIFO);
rt_mutex_init(&_container.mutex, "alarmsvc", RT_IPC_FLAG_FIFO);
rt_mutex_init(&_container.mutex, "alarmsvc", RT_IPC_FLAG_PRIO);

tid = rt_thread_create("alarmsvc",
rt_alarmsvc_thread_init, RT_NULL,
Expand Down
2 changes: 1 addition & 1 deletion components/drivers/sdio/mmcsd_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -708,7 +708,7 @@ struct rt_mmcsd_host *mmcsd_alloc_host(void)
host->max_blk_size = 512;
host->max_blk_count = 4096;

rt_mutex_init(&host->bus_lock, "sd_bus_lock", RT_IPC_FLAG_FIFO);
rt_mutex_init(&host->bus_lock, "sd_bus_lock", RT_IPC_FLAG_PRIO);
rt_sem_init(&host->sem_ack, "sd_ack", 0, RT_IPC_FLAG_FIFO);

return host;
Expand Down
2 changes: 1 addition & 1 deletion components/drivers/sensors/sensor.c
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ int rt_hw_sensor_register(rt_sensor_t sensor,
if (sensor->module != RT_NULL && sensor->module->lock == RT_NULL)
{
/* Create a mutex lock for the module */
sensor->module->lock = rt_mutex_create(name, RT_IPC_FLAG_FIFO);
sensor->module->lock = rt_mutex_create(name, RT_IPC_FLAG_PRIO);
if (sensor->module->lock == RT_NULL)
{
rt_free(device_name);
Expand Down
2 changes: 1 addition & 1 deletion components/drivers/spi/enc28j60.c
Original file line number Diff line number Diff line change
Expand Up @@ -834,7 +834,7 @@ rt_err_t enc28j60_attach(const char *spi_device_name)
enc28j60_dev.parent.eth_rx = enc28j60_rx;
enc28j60_dev.parent.eth_tx = enc28j60_tx;

rt_mutex_init(&enc28j60_dev.lock, "enc28j60", RT_IPC_FLAG_FIFO);
rt_mutex_init(&enc28j60_dev.lock, "enc28j60", RT_IPC_FLAG_PRIO);

eth_device_init(&(enc28j60_dev.parent), "e0");

Expand Down
2 changes: 1 addition & 1 deletion components/drivers/spi/spi_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ rt_err_t rt_spi_bus_register(struct rt_spi_bus *bus,
return result;

/* initialize mutex lock */
rt_mutex_init(&(bus->lock), name, RT_IPC_FLAG_FIFO);
rt_mutex_init(&(bus->lock), name, RT_IPC_FLAG_PRIO);
/* set ops */
bus->ops = ops;
/* initialize owner */
Expand Down
2 changes: 1 addition & 1 deletion components/drivers/spi/spi_flash_sfud.c
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ rt_spi_flash_device_t rt_sfud_flash_probe_ex(const char *spi_flash_dev_name, con
if (rtt_dev) {
rt_memset(rtt_dev, 0, sizeof(struct spi_flash_device));
/* initialize lock */
rt_mutex_init(&(rtt_dev->lock), spi_flash_dev_name, RT_IPC_FLAG_FIFO);
rt_mutex_init(&(rtt_dev->lock), spi_flash_dev_name, RT_IPC_FLAG_PRIO);
}

if (rtt_dev && sfud_dev && spi_flash_dev_name_bak && spi_dev_name_bak) {
Expand Down
2 changes: 1 addition & 1 deletion components/drivers/src/pipe.c
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@ rt_pipe_t *rt_pipe_create(const char *name, int bufsz)

rt_memset(pipe, 0, sizeof(rt_pipe_t));
pipe->is_named = RT_TRUE; /* initialize as a named pipe */
rt_mutex_init(&(pipe->lock), name, RT_IPC_FLAG_FIFO);
rt_mutex_init(&(pipe->lock), name, RT_IPC_FLAG_PRIO);
rt_wqueue_init(&(pipe->reader_queue));
rt_wqueue_init(&(pipe->writer_queue));

Expand Down
2 changes: 1 addition & 1 deletion components/drivers/wlan/wlan_cfg.c
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ void rt_wlan_cfg_init(void)
rt_memset(cfg_cache, 0, sizeof(struct rt_wlan_cfg_des));
}
/* init mutex lock */
rt_mutex_init(&cfg_mutex, "wlan_cfg", RT_IPC_FLAG_FIFO);
rt_mutex_init(&cfg_mutex, "wlan_cfg", RT_IPC_FLAG_PRIO);
}
}

Expand Down
2 changes: 1 addition & 1 deletion components/drivers/wlan/wlan_dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -650,7 +650,7 @@ static rt_err_t _rt_wlan_dev_init(rt_device_t dev)
struct rt_wlan_device *wlan = (struct rt_wlan_device *)dev;
rt_err_t result = RT_EOK;

rt_mutex_init(&wlan->lock, "wlan_dev", RT_IPC_FLAG_FIFO);
rt_mutex_init(&wlan->lock, "wlan_dev", RT_IPC_FLAG_PRIO);

if (wlan->ops->wlan_init)
result = wlan->ops->wlan_init(wlan);
Expand Down
8 changes: 4 additions & 4 deletions components/drivers/wlan/wlan_mgnt.c
Original file line number Diff line number Diff line change
Expand Up @@ -2011,10 +2011,10 @@ int rt_wlan_init(void)
rt_memset(&_ap_mgnt, 0, sizeof(struct rt_wlan_mgnt_des));
rt_memset(&scan_result, 0, sizeof(struct rt_wlan_scan_result));
rt_memset(&sta_info, 0, sizeof(struct rt_wlan_sta_des));
rt_mutex_init(&mgnt_mutex, "mgnt", RT_IPC_FLAG_FIFO);
rt_mutex_init(&scan_result_mutex, "scan", RT_IPC_FLAG_FIFO);
rt_mutex_init(&sta_info_mutex, "sta", RT_IPC_FLAG_FIFO);
rt_mutex_init(&complete_mutex, "complete", RT_IPC_FLAG_FIFO);
rt_mutex_init(&mgnt_mutex, "mgnt", RT_IPC_FLAG_PRIO);
rt_mutex_init(&scan_result_mutex, "scan", RT_IPC_FLAG_PRIO);
rt_mutex_init(&sta_info_mutex, "sta", RT_IPC_FLAG_PRIO);
rt_mutex_init(&complete_mutex, "complete", RT_IPC_FLAG_PRIO);
#ifdef RT_WLAN_AUTO_CONNECT_ENABLE
rt_timer_init(&reconnect_time, "wifi_tim", rt_wlan_cyclic_check, RT_NULL,
rt_tick_from_millisecond(AUTO_CONNECTION_PERIOD_MS),
Expand Down
2 changes: 1 addition & 1 deletion components/libc/posix/pthreads/pthread_mutex.c
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ int pthread_mutex_init(pthread_mutex_t *mutex, const pthread_mutexattr_t *attr)
mutex->attr = *attr;

/* init mutex lock */
result = rt_mutex_init(&(mutex->lock), name, RT_IPC_FLAG_FIFO);
result = rt_mutex_init(&(mutex->lock), name, RT_IPC_FLAG_PRIO);
if (result != RT_EOK)
return EINVAL;

Expand Down
4 changes: 2 additions & 2 deletions components/net/at/at_socket/at_socket.c
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ static struct at_socket *alloc_socket_by_device(struct at_device *device, enum a
if (at_slock == RT_NULL)
{
/* create AT socket lock */
at_slock = rt_mutex_create("at_slock", RT_IPC_FLAG_FIFO);
at_slock = rt_mutex_create("at_slock", RT_IPC_FLAG_PRIO);
if (at_slock == RT_NULL)
{
LOG_E("No memory for socket allocation lock!");
Expand Down Expand Up @@ -367,7 +367,7 @@ static struct at_socket *alloc_socket_by_device(struct at_device *device, enum a

rt_snprintf(name, RT_NAME_MAX, "%s%d", "at_skt", idx);
/* create AT socket receive ring buffer lock */
if((sock->recv_lock = rt_mutex_create(name, RT_IPC_FLAG_FIFO)) == RT_NULL)
if((sock->recv_lock = rt_mutex_create(name, RT_IPC_FLAG_PRIO)) == RT_NULL)
{
LOG_E("No memory for socket receive mutex create.");
rt_sem_delete(sock->recv_notice);
Expand Down
Loading