forked from springcute/rt-thread
Merge pull request #5284 from mysterywolf/mutex
[mutex] use RT_IPC_FLAG_PRIO to replace RT_IPC_FLAG_FIFO
This commit is contained in:
commit
9bbcd1a8b0
|
@ -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;
|
||||
|
|
|
@ -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")
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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!");
|
||||
|
|
|
@ -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!");
|
||||
|
|
|
@ -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");
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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");
|
||||
|
|
|
@ -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");
|
||||
}
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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");
|
||||
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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));
|
||||
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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),
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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!");
|
||||
|
@ -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);
|
||||
|
|
|
@ -835,7 +835,7 @@ static int at_client_para_init(at_client_t client)
|
|||
}
|
||||
|
||||
rt_snprintf(name, RT_NAME_MAX, "%s%d", AT_CLIENT_LOCK_NAME, at_client_num);
|
||||
client->lock = rt_mutex_create(name, RT_IPC_FLAG_FIFO);
|
||||
client->lock = rt_mutex_create(name, RT_IPC_FLAG_PRIO);
|
||||
if (client->lock == RT_NULL)
|
||||
{
|
||||
LOG_E("AT client initialize failed! at_client_recv_lock create failed!");
|
||||
|
|
|
@ -341,7 +341,7 @@ err_t sys_mutex_new(sys_mutex_t *mutex)
|
|||
rt_snprintf(tname, RT_NAME_MAX, "%s%d", SYS_LWIP_MUTEX_NAME, counter);
|
||||
counter ++;
|
||||
|
||||
tmpmutex = rt_mutex_create(tname, RT_IPC_FLAG_FIFO);
|
||||
tmpmutex = rt_mutex_create(tname, RT_IPC_FLAG_PRIO);
|
||||
if (tmpmutex == RT_NULL)
|
||||
return ERR_MEM;
|
||||
else
|
||||
|
|
|
@ -352,7 +352,7 @@ err_t sys_mutex_new(sys_mutex_t *mutex)
|
|||
rt_snprintf(tname, RT_NAME_MAX, "%s%d", SYS_LWIP_MUTEX_NAME, counter);
|
||||
counter ++;
|
||||
|
||||
tmpmutex = rt_mutex_create(tname, RT_IPC_FLAG_FIFO);
|
||||
tmpmutex = rt_mutex_create(tname, RT_IPC_FLAG_PRIO);
|
||||
if (tmpmutex == RT_NULL)
|
||||
return ERR_MEM;
|
||||
else
|
||||
|
|
|
@ -352,7 +352,7 @@ err_t sys_mutex_new(sys_mutex_t *mutex)
|
|||
rt_snprintf(tname, RT_NAME_MAX, "%s%d", SYS_LWIP_MUTEX_NAME, counter);
|
||||
counter ++;
|
||||
|
||||
tmpmutex = rt_mutex_create(tname, RT_IPC_FLAG_FIFO);
|
||||
tmpmutex = rt_mutex_create(tname, RT_IPC_FLAG_PRIO);
|
||||
if (tmpmutex == RT_NULL)
|
||||
return ERR_MEM;
|
||||
else
|
||||
|
|
|
@ -360,7 +360,7 @@ err_t sys_mutex_new(sys_mutex_t *mutex)
|
|||
rt_snprintf(tname, RT_NAME_MAX, "%s%d", SYS_LWIP_MUTEX_NAME, counter);
|
||||
counter ++;
|
||||
|
||||
tmpmutex = rt_mutex_create(tname, RT_IPC_FLAG_FIFO);
|
||||
tmpmutex = rt_mutex_create(tname, RT_IPC_FLAG_PRIO);
|
||||
if (tmpmutex == RT_NULL)
|
||||
return ERR_MEM;
|
||||
else
|
||||
|
|
|
@ -135,7 +135,7 @@ int sal_init(void)
|
|||
rt_memset(sal_dev_res_tbl, 0, sizeof(sal_dev_res_tbl));
|
||||
|
||||
/* create sal socket lock */
|
||||
rt_mutex_init(&sal_core_lock, "sal_lock", RT_IPC_FLAG_FIFO);
|
||||
rt_mutex_init(&sal_core_lock, "sal_lock", RT_IPC_FLAG_PRIO);
|
||||
|
||||
LOG_I("Socket Abstraction Layer initialize success.");
|
||||
init_ok = RT_TRUE;
|
||||
|
|
|
@ -35,7 +35,7 @@ static void test_static_mutex_init(void)
|
|||
uassert_true(RT_FALSE);
|
||||
}
|
||||
|
||||
result = rt_mutex_init(&static_mutex, "static_mutex", RT_IPC_FLAG_FIFO);
|
||||
result = rt_mutex_init(&static_mutex, "static_mutex", RT_IPC_FLAG_PRIO);
|
||||
if (RT_EOK != result)
|
||||
{
|
||||
uassert_true(RT_FALSE);
|
||||
|
@ -348,7 +348,7 @@ static void test_dynamic_mutex_create(void)
|
|||
}
|
||||
|
||||
/* FIFO mode */
|
||||
dynamic_mutex = rt_mutex_create("dynamic_mutex", RT_IPC_FLAG_FIFO);
|
||||
dynamic_mutex = rt_mutex_create("dynamic_mutex", RT_IPC_FLAG_PRIO);
|
||||
if (RT_NULL == dynamic_mutex)
|
||||
{
|
||||
uassert_true(RT_FALSE);
|
||||
|
|
Loading…
Reference in New Issue