summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
author192.168.1.134 <[email protected]>2021-12-09 19:18:24 +0800
committer192.168.1.134 <[email protected]>2021-12-09 19:18:24 +0800
commit6378f95f00fd51410d2715da55d728d4a40494de (patch)
treebb46a565875d538189e1c1dfc9b1cfddf6862a92 /examples
parentd6b05287bbeaf9369546009e5af445f350b97fe9 (diff)
parent462f093cbd7531098de3b7aadb5f8d5f1b99b4a9 (diff)
Merge branch 'master' of https://github.com/RT-Thread/rt-thread
Diffstat (limited to 'examples')
-rw-r--r--examples/kernel/event_simple.c2
-rw-r--r--examples/libc/termios_test.c12
-rw-r--r--examples/rt-link/rtlink_dev_example.c4
-rw-r--r--examples/utest/testcases/kernel/mutex_tc.c4
4 files changed, 5 insertions, 17 deletions
diff --git a/examples/kernel/event_simple.c b/examples/kernel/event_simple.c
index 8b2f966d3d..78887b6aea 100644
--- a/examples/kernel/event_simple.c
+++ b/examples/kernel/event_simple.c
@@ -15,7 +15,7 @@
* 一个线程定时发送事件 (事件5)
*/
#include <rtthread.h>
-#include <time.h>
+#include <sys/time.h>
#include "tc_comm.h"
/* 指向线程控制块的指针 */
diff --git a/examples/libc/termios_test.c b/examples/libc/termios_test.c
index 855bc82b96..520fca6380 100644
--- a/examples/libc/termios_test.c
+++ b/examples/libc/termios_test.c
@@ -14,18 +14,6 @@
#include <string.h>
#include <sys/time.h>
-#if defined (RT_USING_POSIX)
- #include <dfs_posix.h>
- #include <sys/select.h>
- #if defined (RT_USING_POSIX_TERMIOS)
- #include <termios.h>
- #else
- #error "TERMIOS need RT_USING_POSIX_TERMIOS"
- #endif
-#else
- #error "POSIX poll/select need RT_USING_POSIX"
-#endif
-
#define JOINT(x,y) x##y
#define B(x) JOINT(B,x)
#define Default_baud_rate 115200
diff --git a/examples/rt-link/rtlink_dev_example.c b/examples/rt-link/rtlink_dev_example.c
index 523b67ba53..51b6432d9f 100644
--- a/examples/rt-link/rtlink_dev_example.c
+++ b/examples/rt-link/rtlink_dev_example.c
@@ -45,7 +45,7 @@ static rt_err_t rtlink_dev_tx_done(rt_device_t dev, void *buffer)
return RT_EOK;
}
-#ifdef RT_USING_POSIX
+#ifdef RT_USING_POSIX_DEVIO
#include <dfs_posix.h>
#include <poll.h>
#include <sys/select.h>
@@ -205,7 +205,7 @@ static void rtlink_fselect()
}
}
MSH_CMD_EXPORT(rtlink_fselect, rtlink posix interface example);
-#endif /* RT_USING_POSIX */
+#endif /* RT_USING_POSIX_DEVIO */
static void rtlink_dread(void)
{
diff --git a/examples/utest/testcases/kernel/mutex_tc.c b/examples/utest/testcases/kernel/mutex_tc.c
index f50e3e43f7..9a25219a1a 100644
--- a/examples/utest/testcases/kernel/mutex_tc.c
+++ b/examples/utest/testcases/kernel/mutex_tc.c
@@ -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);