diff options
| author | Meco Man <[email protected]> | 2021-11-17 15:57:15 -0500 |
|---|---|---|
| committer | Meco Man <[email protected]> | 2021-11-17 15:57:15 -0500 |
| commit | df9a23c534f57e6f5b06acfbe6db8b636894e0ad (patch) | |
| tree | a59dee4012835d6a8d1d1b4566b4a49a719798bd /bsp | |
| parent | fbca0c7f7d195eb8901902c4f94f4bab4395db61 (diff) | |
[mutex] use RT_IPC_FLAG_PRIO to replace RT_IPC_FLAG_FIFO
Diffstat (limited to 'bsp')
25 files changed, 27 insertions, 27 deletions
diff --git a/bsp/at32/Libraries/rt_drivers/drv_sdio.c b/bsp/at32/Libraries/rt_drivers/drv_sdio.c index 9bbfa910c2..eb7a7d4839 100644 --- a/bsp/at32/Libraries/rt_drivers/drv_sdio.c +++ b/bsp/at32/Libraries/rt_drivers/drv_sdio.c @@ -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; diff --git a/bsp/bluetrum/ab32vg1-ab-prougen/board/board.c b/bsp/bluetrum/ab32vg1-ab-prougen/board/board.c index 67a76885bb..14f8510cac 100644 --- a/bsp/bluetrum/ab32vg1-ab-prougen/board/board.c +++ b/bsp/bluetrum/ab32vg1-ab-prougen/board/board.c @@ -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") diff --git a/bsp/bluetrum/libraries/hal_drivers/drv_sdio.c b/bsp/bluetrum/libraries/hal_drivers/drv_sdio.c index a3cb9c2614..3a8461ab29 100644 --- a/bsp/bluetrum/libraries/hal_drivers/drv_sdio.c +++ b/bsp/bluetrum/libraries/hal_drivers/drv_sdio.c @@ -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; diff --git a/bsp/ft2004/drivers/drv_sdctrl.c b/bsp/ft2004/drivers/drv_sdctrl.c index 1f6a4df7e5..6807c60020 100644 --- a/bsp/ft2004/drivers/drv_sdctrl.c +++ b/bsp/ft2004/drivers/drv_sdctrl.c @@ -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; diff --git a/bsp/k210/driver/dmalock.c b/bsp/k210/driver/dmalock.c index 916df84a7f..5ce1d26a7e 100644 --- a/bsp/k210/driver/dmalock.c +++ b/bsp/k210/driver/dmalock.c @@ -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; diff --git a/bsp/lpc54608-LPCXpresso/drivers/drv_sd.c b/bsp/lpc54608-LPCXpresso/drivers/drv_sd.c index f5efc2a9d7..879e0d1c9c 100644 --- a/bsp/lpc54608-LPCXpresso/drivers/drv_sd.c +++ b/bsp/lpc54608-LPCXpresso/drivers/drv_sd.c @@ -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); diff --git a/bsp/lpc55sxx/Libraries/drivers/drv_sd.c b/bsp/lpc55sxx/Libraries/drivers/drv_sd.c index 597e49aa7b..35e46f2f8b 100644 --- a/bsp/lpc55sxx/Libraries/drivers/drv_sd.c +++ b/bsp/lpc55sxx/Libraries/drivers/drv_sd.c @@ -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); diff --git a/bsp/simulator/drivers/sd_sim.c b/bsp/simulator/drivers/sd_sim.c index 7557fac12c..ed6d60a635 100755 --- a/bsp/simulator/drivers/sd_sim.c +++ b/bsp/simulator/drivers/sd_sim.c @@ -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!"); diff --git a/bsp/simulator/drivers/sdl_fb.c b/bsp/simulator/drivers/sdl_fb.c index 995b12219e..4a37a26f19 100755 --- a/bsp/simulator/drivers/sdl_fb.c +++ b/bsp/simulator/drivers/sdl_fb.c @@ -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!"); diff --git a/bsp/simulator/drivers/sst25vfxx_mtd_sim.c b/bsp/simulator/drivers/sst25vfxx_mtd_sim.c index bc44699a10..3b34217ac2 100644 --- a/bsp/simulator/drivers/sst25vfxx_mtd_sim.c +++ b/bsp/simulator/drivers/sst25vfxx_mtd_sim.c @@ -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"); } diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_crypto.c b/bsp/stm32/libraries/HAL_Drivers/drv_crypto.c index b5c858e581..ffce31370a 100644 --- a/bsp/stm32/libraries/HAL_Drivers/drv_crypto.c +++ b/bsp/stm32/libraries/HAL_Drivers/drv_crypto.c @@ -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); diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_sdio.c b/bsp/stm32/libraries/HAL_Drivers/drv_sdio.c index d7241e912b..0eb1e9479a 100644 --- a/bsp/stm32/libraries/HAL_Drivers/drv_sdio.c +++ b/bsp/stm32/libraries/HAL_Drivers/drv_sdio.c @@ -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; diff --git a/bsp/stm32/stm32h750-artpi-h750/board/port/drv_sdio.c b/bsp/stm32/stm32h750-artpi-h750/board/port/drv_sdio.c index 81e65e1bed..5581dfe792 100644 --- a/bsp/stm32/stm32h750-artpi-h750/board/port/drv_sdio.c +++ b/bsp/stm32/stm32h750-artpi-h750/board/port/drv_sdio.c @@ -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) { diff --git a/bsp/stm32/stm32mp157a-st-discovery/board/ports/drv_sdio.c b/bsp/stm32/stm32mp157a-st-discovery/board/ports/drv_sdio.c index 458a62097a..9d128a2892 100644 --- a/bsp/stm32/stm32mp157a-st-discovery/board/ports/drv_sdio.c +++ b/bsp/stm32/stm32mp157a-st-discovery/board/ports/drv_sdio.c @@ -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 */ diff --git a/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_emmc.c b/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_emmc.c index 3e1913bb94..2da6ddc485 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_emmc.c +++ b/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_emmc.c @@ -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; diff --git a/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_nand.c b/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_nand.c index f92dd09afb..40d22e505e 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_nand.c +++ b/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_nand.c @@ -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; diff --git a/bsp/swm320-lq100/drivers/drv_crypto.c b/bsp/swm320-lq100/drivers/drv_crypto.c index 5e97ff987e..281329b32e 100644 --- a/bsp/swm320-lq100/drivers/drv_crypto.c +++ b/bsp/swm320-lq100/drivers/drv_crypto.c @@ -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); diff --git a/bsp/swm320-lq100/drivers/drv_nor_flash.c b/bsp/swm320-lq100/drivers/drv_nor_flash.c index 6940cd54d0..0b1e904bd5 100644 --- a/bsp/swm320-lq100/drivers/drv_nor_flash.c +++ b/bsp/swm320-lq100/drivers/drv_nor_flash.c @@ -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; diff --git a/bsp/swm320-lq100/drivers/drv_sdio.c b/bsp/swm320-lq100/drivers/drv_sdio.c index 1fbbf3bce4..38653a28bc 100644 --- a/bsp/swm320-lq100/drivers/drv_sdio.c +++ b/bsp/swm320-lq100/drivers/drv_sdio.c @@ -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; diff --git a/bsp/swm320/drivers/drv_crypto.c b/bsp/swm320/drivers/drv_crypto.c index 5e97ff987e..281329b32e 100644 --- a/bsp/swm320/drivers/drv_crypto.c +++ b/bsp/swm320/drivers/drv_crypto.c @@ -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); diff --git a/bsp/swm320/drivers/drv_nor_flash.c b/bsp/swm320/drivers/drv_nor_flash.c index 6940cd54d0..0b1e904bd5 100644 --- a/bsp/swm320/drivers/drv_nor_flash.c +++ b/bsp/swm320/drivers/drv_nor_flash.c @@ -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; diff --git a/bsp/swm320/drivers/drv_sdio.c b/bsp/swm320/drivers/drv_sdio.c index bd5526008e..15dc84fd21 100644 --- a/bsp/swm320/drivers/drv_sdio.c +++ b/bsp/swm320/drivers/drv_sdio.c @@ -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; diff --git a/bsp/w60x/drivers/drv_crypto.c b/bsp/w60x/drivers/drv_crypto.c index 1e0db82cde..ee4b913724 100644 --- a/bsp/w60x/drivers/drv_crypto.c +++ b/bsp/w60x/drivers/drv_crypto.c @@ -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); diff --git a/bsp/x86/drivers/floppy.c b/bsp/x86/drivers/floppy.c index be3ab4c179..077ce40e4d 100644 --- a/bsp/x86/drivers/floppy.c +++ b/bsp/x86/drivers/floppy.c @@ -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"); diff --git a/bsp/zynqmp-r5-axu4ev/drivers/drv_sdcard.c b/bsp/zynqmp-r5-axu4ev/drivers/drv_sdcard.c index 5aa866b8bf..5c2e72ce29 100644 --- a/bsp/zynqmp-r5-axu4ev/drivers/drv_sdcard.c +++ b/bsp/zynqmp-r5-axu4ev/drivers/drv_sdcard.c @@ -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"); } |
