From a5b3e6b231243790cf5dd760750f0c4b159dc2a0 Mon Sep 17 00:00:00 2001 From: Meco Man <920369182@qq.com> Date: Fri, 23 Jul 2021 15:43:36 +0800 Subject: [PATCH] FIFO->FPIO --- .../debug/systemview/an0009-systemview.md | 2 +- .../driver/uart/an0001-rtthread-driver-uart.md | 2 +- .../application-note/system/pm/an0025-pm.md | 2 +- .../programming-manual/device/sensor/sensor.md | 4 ++-- .../programming-manual/device/touch/touch.md | 2 +- .../programming-manual/device/wlan/wlan.md | 2 +- .../programming-manual/interrupt/interrupt.md | 2 +- .../programming-manual/ipc1/ipc1.md | 12 ++++++------ .../programming-manual/ipc2/ipc2.md | 2 +- .../tutorial/beep-player/player.md | 2 +- .../experimental-manual/event_sample/event_sample.md | 2 +- .../mailbox_sample/mailbox_sample.md | 2 +- .../experimental-manual/msgq_sample/msgq_sample.md | 2 +- .../pri_inversion/pri_inversion.md | 2 +- .../producer_consumer/producer_consumer.md | 6 +++--- .../tutorial/temperature-system/ipc.md | 4 ++-- .../tutorial/temperature-system/onenet.md | 2 +- 17 files changed, 26 insertions(+), 26 deletions(-) diff --git a/rt-thread-version/rt-thread-standard/application-note/debug/systemview/an0009-systemview.md b/rt-thread-version/rt-thread-standard/application-note/debug/systemview/an0009-systemview.md index a24214e..2ea070c 100644 --- a/rt-thread-version/rt-thread-standard/application-note/debug/systemview/an0009-systemview.md +++ b/rt-thread-version/rt-thread-standard/application-note/debug/systemview/an0009-systemview.md @@ -124,7 +124,7 @@ void demo_init(void) /* 指向线程控制块的指针 */ rt_thread_t thread1_id, thread2_id; /* 创建一个信号量，初始值是0 */ - sem_food = rt_sem_create("sem_food", 0, RT_IPC_FLAG_FIFO); + sem_food = rt_sem_create("sem_food", 0, RT_IPC_FLAG_PRIO); if (sem_food == RT_NULL) { rt_kprintf("sem created fail!\n"); diff --git a/rt-thread-version/rt-thread-standard/application-note/driver/uart/an0001-rtthread-driver-uart.md b/rt-thread-version/rt-thread-standard/application-note/driver/uart/an0001-rtthread-driver-uart.md index 7829e3d..de79c4e 100644 --- a/rt-thread-version/rt-thread-standard/application-note/driver/uart/an0001-rtthread-driver-uart.md +++ b/rt-thread-version/rt-thread-standard/application-note/driver/uart/an0001-rtthread-driver-uart.md @@ -158,7 +158,7 @@ rt_err_t uart_open(const char *name) return -RT_ERROR; } /* 初始化事件对象 */ - rt_event_init(&event, "event", RT_IPC_FLAG_FIFO); + rt_event_init(&event, "event", RT_IPC_FLAG_PRIO); return RT_EOK; } ``` diff --git a/rt-thread-version/rt-thread-standard/application-note/system/pm/an0025-pm.md b/rt-thread-version/rt-thread-standard/application-note/system/pm/an0025-pm.md index 52b7957..ae60fd3 100644 --- a/rt-thread-version/rt-thread-standard/application-note/system/pm/an0025-pm.md +++ b/rt-thread-version/rt-thread-standard/application-note/system/pm/an0025-pm.md @@ -212,7 +212,7 @@ static int wakeup_app(void) { rt_thread_t tid; - wakeup_event = rt_event_create("wakup", RT_IPC_FLAG_FIFO); + wakeup_event = rt_event_create("wakup", RT_IPC_FLAG_PRIO); RT_ASSERT(wakeup_event != RT_NULL); tid = rt_thread_create("wakeup_app", wakeup_app_entry, RT_NULL, diff --git a/rt-thread-version/rt-thread-standard/programming-manual/device/sensor/sensor.md b/rt-thread-version/rt-thread-standard/programming-manual/device/sensor/sensor.md index a8f5e47..be1b3cf 100644 --- a/rt-thread-version/rt-thread-standard/programming-manual/device/sensor/sensor.md +++ b/rt-thread-version/rt-thread-standard/programming-manual/device/sensor/sensor.md @@ -235,7 +235,7 @@ static int sensor_sample(int argc, char *argv[]) /* 以中断接收及轮询发送模式打开传感器设备 */ rt_device_open(dev, RT_DEVICE_FLAG_INT_RX); /* 初始化信号量 */ - rt_sem_init(&rx_sem, "rx_sem", 0, RT_IPC_FLAG_FIFO); + rt_sem_init(&rx_sem, "rx_sem", 0, RT_IPC_FLAG_PRIO); /* 设置接收回调函数 */ rt_device_set_rx_indicate(dev, sensor_input); @@ -322,7 +322,7 @@ int main(void) rt_device_t dev; struct rt_sensor_data data; - sensor_rx_sem = rt_sem_create("sen_rx_sem", 0, RT_IPC_FLAG_FIFO); + sensor_rx_sem = rt_sem_create("sen_rx_sem", 0, RT_IPC_FLAG_PRIO); tid1 = rt_thread_create("sen_rx_thread", sensor_fifo_rx_entry, dev, 1024, diff --git a/rt-thread-version/rt-thread-standard/programming-manual/device/touch/touch.md b/rt-thread-version/rt-thread-standard/programming-manual/device/touch/touch.md index d3decf1..d154693 100644 --- a/rt-thread-version/rt-thread-standard/programming-manual/device/touch/touch.md +++ b/rt-thread-version/rt-thread-standard/programming-manual/device/touch/touch.md @@ -383,7 +383,7 @@ static int gt9147_sample(void) /* 设置接收回调 */ rt_device_set_rx_indicate(dev, rx_callback); /* 创建信号量 */ - gt9147_sem = rt_sem_create("dsem", 0, RT_IPC_FLAG_FIFO); + gt9147_sem = rt_sem_create("dsem", 0, RT_IPC_FLAG_PRIO); if (gt9147_sem == RT_NULL) { diff --git a/rt-thread-version/rt-thread-standard/programming-manual/device/wlan/wlan.md b/rt-thread-version/rt-thread-standard/programming-manual/device/wlan/wlan.md index 7292c19..5b2bca8 100644 --- a/rt-thread-version/rt-thread-standard/programming-manual/device/wlan/wlan.md +++ b/rt-thread-version/rt-thread-standard/programming-manual/device/wlan/wlan.md @@ -826,7 +826,7 @@ rt_err_t wifi_connect(void) rt_wlan_set_mode(RT_WLAN_DEVICE_STA_NAME, RT_WLAN_STATION); /* station connect */ rt_kprintf("start to connect ap ...\n"); - net_ready = rt_sem_create("net_ready", 0, RT_IPC_FLAG_FIFO); + net_ready = rt_sem_create("net_ready", 0, RT_IPC_FLAG_PRIO); rt_wlan_register_event_handler(RT_WLAN_EVT_READY, wifi_ready_callback, RT_NULL); rt_wlan_register_event_handler(RT_WLAN_EVT_STA_CONNECTED, diff --git a/rt-thread-version/rt-thread-standard/programming-manual/interrupt/interrupt.md b/rt-thread-version/rt-thread-standard/programming-manual/interrupt/interrupt.md index 13dddbc..ff48063 100644 --- a/rt-thread-version/rt-thread-standard/programming-manual/interrupt/interrupt.md +++ b/rt-thread-version/rt-thread-standard/programming-manual/interrupt/interrupt.md @@ -216,7 +216,7 @@ void demo_nw_thread(void *param) /*.. 其他的一些操作..*/ /* 创建一个 semaphore 来响应 Bottom Half 的事件 */ - nw_bh_sem = rt_sem_create("bh_sem", 0, RT_IPC_FLAG_FIFO); + nw_bh_sem = rt_sem_create("bh_sem", 0, RT_IPC_FLAG_PRIO); while(1) { diff --git a/rt-thread-version/rt-thread-standard/programming-manual/ipc1/ipc1.md b/rt-thread-version/rt-thread-standard/programming-manual/ipc1/ipc1.md index 4f1e7ba..a761acf 100644 --- a/rt-thread-version/rt-thread-standard/programming-manual/ipc1/ipc1.md +++ b/rt-thread-version/rt-thread-standard/programming-manual/ipc1/ipc1.md @@ -263,7 +263,7 @@ static void rt_thread2_entry(void *parameter) int semaphore_sample(void) { /* 创建一个动态信号量，初始值是 0 */ - dynamic_sem = rt_sem_create("dsem", 0, RT_IPC_FLAG_FIFO); + dynamic_sem = rt_sem_create("dsem", 0, RT_IPC_FLAG_PRIO); if (dynamic_sem == RT_NULL) { rt_kprintf("create dynamic semaphore failed.\n"); @@ -428,9 +428,9 @@ int producer_consumer(void) get = 0; /* 初始化 3 个信号量 */ - rt_sem_init(&sem_lock, "lock", 1, RT_IPC_FLAG_FIFO); - rt_sem_init(&sem_empty, "empty", MAXSEM, RT_IPC_FLAG_FIFO); - rt_sem_init(&sem_full, "full", 0, RT_IPC_FLAG_FIFO); + rt_sem_init(&sem_lock, "lock", 1, RT_IPC_FLAG_PRIO); + rt_sem_init(&sem_empty, "empty", MAXSEM, RT_IPC_FLAG_PRIO); + rt_sem_init(&sem_full, "full", 0, RT_IPC_FLAG_PRIO); /* 创建生产者线程 */ producer_tid = rt_thread_create("producer", @@ -793,7 +793,7 @@ static void rt_thread_entry2(void *parameter) int mutex_sample(void) { /* 创建一个动态互斥量 */ - dynamic_mutex = rt_mutex_create("dmutex", RT_IPC_FLAG_FIFO); + dynamic_mutex = rt_mutex_create("dmutex", RT_IPC_FLAG_PRIO); if (dynamic_mutex == RT_NULL) { rt_kprintf("create dynamic mutex failed.\n"); @@ -1252,7 +1252,7 @@ int event_sample(void) rt_err_t result; /* 初始化事件对象 */ - result = rt_event_init(&event, "event", RT_IPC_FLAG_FIFO); + result = rt_event_init(&event, "event", RT_IPC_FLAG_PRIO); if (result != RT_EOK) { rt_kprintf("init event failed.\n"); diff --git a/rt-thread-version/rt-thread-standard/programming-manual/ipc2/ipc2.md b/rt-thread-version/rt-thread-standard/programming-manual/ipc2/ipc2.md index 03088e6..f53ba5e 100644 --- a/rt-thread-version/rt-thread-standard/programming-manual/ipc2/ipc2.md +++ b/rt-thread-version/rt-thread-standard/programming-manual/ipc2/ipc2.md @@ -689,7 +689,7 @@ int msgq_sample(void) &msg_pool[0], /* 内存池指向 msg_pool */ 1, /* 每个消息的大小是 1 字节 */ sizeof(msg_pool), /* 内存池的大小是 msg_pool 的大小 */ - RT_IPC_FLAG_FIFO); /* 如果有多个线程等待，按照先来先得到的方法分配消息 */ + RT_IPC_FLAG_PRIO); /* 如果有多个线程等待，优先级大小的方法分配消息 */ if (result != RT_EOK) { diff --git a/rt-thread-version/rt-thread-standard/tutorial/beep-player/player.md b/rt-thread-version/rt-thread-standard/tutorial/beep-player/player.md index b62a988..61d769a 100644 --- a/rt-thread-version/rt-thread-standard/tutorial/beep-player/player.md +++ b/rt-thread-version/rt-thread-standard/tutorial/beep-player/player.md @@ -470,7 +470,7 @@ int player_start(player_t player) player->audio->control(AUDIO_OPS_CMD_SET_VOL, &player->volume); /* 初始化动态信号量 */ - player->sem_play = rt_sem_create("sem_play", 0, RT_IPC_FLAG_FIFO); + player->sem_play = rt_sem_create("sem_play", 0, RT_IPC_FLAG_PRIO); if (player->sem_play == RT_NULL) { return -RT_ERROR; diff --git a/rt-thread-version/rt-thread-standard/tutorial/experimental-manual/event_sample/event_sample.md b/rt-thread-version/rt-thread-standard/tutorial/experimental-manual/event_sample/event_sample.md index 74a7982..74566b9 100644 --- a/rt-thread-version/rt-thread-standard/tutorial/experimental-manual/event_sample/event_sample.md +++ b/rt-thread-version/rt-thread-standard/tutorial/experimental-manual/event_sample/event_sample.md @@ -132,7 +132,7 @@ int event_sample(void) rt_err_t result; /* 初始化事件对象 */ - result = rt_event_init(&event, "event", RT_IPC_FLAG_FIFO); + result = rt_event_init(&event, "event", RT_IPC_FLAG_PRIO); if (result != RT_EOK) { rt_kprintf("init event failed.\n"); diff --git a/rt-thread-version/rt-thread-standard/tutorial/experimental-manual/mailbox_sample/mailbox_sample.md b/rt-thread-version/rt-thread-standard/tutorial/experimental-manual/mailbox_sample/mailbox_sample.md index 9ec5aa0..fc649df 100644 --- a/rt-thread-version/rt-thread-standard/tutorial/experimental-manual/mailbox_sample/mailbox_sample.md +++ b/rt-thread-version/rt-thread-standard/tutorial/experimental-manual/mailbox_sample/mailbox_sample.md @@ -154,7 +154,7 @@ int mailbox_sample(void) "mbt", /* 名称是 mbt */ &mb_pool[0], /* 邮箱用到的内存池是 mb_pool */ sizeof(mb_pool) / 4, /* 邮箱中的邮件数目，因为一封邮件占 4 字节 */ - RT_IPC_FLAG_FIFO); /* 采用 FIFO 方式进行线程等待 */ + RT_IPC_FLAG_PRIO); /* 采用 PRIO 方式进行线程等待 */ if (result != RT_EOK) { rt_kprintf("init mailbox failed.\n"); diff --git a/rt-thread-version/rt-thread-standard/tutorial/experimental-manual/msgq_sample/msgq_sample.md b/rt-thread-version/rt-thread-standard/tutorial/experimental-manual/msgq_sample/msgq_sample.md index 07490d0..0f010e0 100644 --- a/rt-thread-version/rt-thread-standard/tutorial/experimental-manual/msgq_sample/msgq_sample.md +++ b/rt-thread-version/rt-thread-standard/tutorial/experimental-manual/msgq_sample/msgq_sample.md @@ -168,7 +168,7 @@ int msgq_sample(void) &msg_pool[0], /* 内存池指向 msg_pool */ 1, /* 每个消息的大小是 1 字节 */ sizeof(msg_pool), /* 内存池的大小是 msg_pool 的大小 */ - RT_IPC_FLAG_FIFO); /* 如果有多个线程等待，按照先来先得到的方法分配消息 */ + RT_IPC_FLAG_PRIO); /* 如果有多个线程等待，按照优先级大小的方法分配消息 */ if (result != RT_EOK) { diff --git a/rt-thread-version/rt-thread-standard/tutorial/experimental-manual/pri_inversion/pri_inversion.md b/rt-thread-version/rt-thread-standard/tutorial/experimental-manual/pri_inversion/pri_inversion.md index cf9a8f7..59c7d49 100644 --- a/rt-thread-version/rt-thread-standard/tutorial/experimental-manual/pri_inversion/pri_inversion.md +++ b/rt-thread-version/rt-thread-standard/tutorial/experimental-manual/pri_inversion/pri_inversion.md @@ -165,7 +165,7 @@ static void thread3_entry(void *parameter) int pri_inversion(void) { /* 创建互斥锁 */ - mutex = rt_mutex_create("mutex", RT_IPC_FLAG_FIFO); + mutex = rt_mutex_create("mutex", RT_IPC_FLAG_PRIO); if (mutex == RT_NULL) { rt_kprintf("create dynamic mutex failed.\n"); diff --git a/rt-thread-version/rt-thread-standard/tutorial/experimental-manual/producer_consumer/producer_consumer.md b/rt-thread-version/rt-thread-standard/tutorial/experimental-manual/producer_consumer/producer_consumer.md index 6fac2ed..94df18a 100644 --- a/rt-thread-version/rt-thread-standard/tutorial/experimental-manual/producer_consumer/producer_consumer.md +++ b/rt-thread-version/rt-thread-standard/tutorial/experimental-manual/producer_consumer/producer_consumer.md @@ -166,9 +166,9 @@ int producer_consumer(void) get = 0; /* 初始化 3 个信号量 */ - rt_sem_init(&sem_lock, "lock", 1, RT_IPC_FLAG_FIFO); - rt_sem_init(&sem_empty, "empty", MAXSEM, RT_IPC_FLAG_FIFO); - rt_sem_init(&sem_full, "full", 0, RT_IPC_FLAG_FIFO); + rt_sem_init(&sem_lock, "lock", 1, RT_IPC_FLAG_PRIO); + rt_sem_init(&sem_empty, "empty", MAXSEM, RT_IPC_FLAG_PRIO); + rt_sem_init(&sem_full, "full", 0, RT_IPC_FLAG_PRIO); /* 创建生产者线程 */ producer_tid = rt_thread_create("producer", diff --git a/rt-thread-version/rt-thread-standard/tutorial/temperature-system/ipc.md b/rt-thread-version/rt-thread-standard/tutorial/temperature-system/ipc.md index 2c36312..9f6efaa 100644 --- a/rt-thread-version/rt-thread-standard/tutorial/temperature-system/ipc.md +++ b/rt-thread-version/rt-thread-standard/tutorial/temperature-system/ipc.md @@ -134,7 +134,7 @@ RT-Thread 的文档中心已经有对邮箱和内存池原理上的详细讲解 main 函数中创建一个邮箱和一个内存池是这么做的： ```c -tmp_msg_mb = rt_mb_create("temp_mb0", MB_LEN, RT_IPC_FLAG_FIFO); /* 创建邮箱 */ +tmp_msg_mb = rt_mb_create("temp_mb0", MB_LEN, RT_IPC_FLAG_PRIO); /* 创建邮箱 */ tmp_msg_mp = rt_mp_create("temp_mp0", MP_LEN, MP_BLOCK_SIZE); /* 创建内存池 */ ``` @@ -316,7 +316,7 @@ msg = RT_NULL; 在 main 函数中创建消息队列： ```c -tmp_msg_mq = rt_mq_create("temp_mq", MQ_BLOCK_SIZE, MQ_LEN, RT_IPC_FLAG_FIFO); +tmp_msg_mq = rt_mq_create("temp_mq", MQ_BLOCK_SIZE, MQ_LEN, RT_IPC_FLAG_PRIO); ``` 在 `ds18b20_thread` 线程中转载数据并发送消息队列： diff --git a/rt-thread-version/rt-thread-standard/tutorial/temperature-system/onenet.md b/rt-thread-version/rt-thread-standard/tutorial/temperature-system/onenet.md index c6d90c2..d481121 100644 --- a/rt-thread-version/rt-thread-standard/tutorial/temperature-system/onenet.md +++ b/rt-thread-version/rt-thread-standard/tutorial/temperature-system/onenet.md @@ -104,7 +104,7 @@ OneNet 软件包数据的上传和命令的接收是基于 MQTT 实现的，OneN 要用信号量之前，第一步当然是创建一个信号量： ```c -mqttinit_sem = rt_sem_create("mqtt_sem", RT_NULL, RT_IPC_FLAG_FIFO); +mqttinit_sem = rt_sem_create("mqtt_sem", RT_NULL, RT_IPC_FLAG_PRIO); ``` 在 `onenet_mqtt_init_thread` 线程的线程入口函数中使用 OneNet 软件包提供的接口 `onenet_mqtt_init` 去初始化 MQTT，初始化成功后，释放信号量： -- Gitee