summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authoryangjie <[email protected]>2019-07-23 11:00:49 +0800
committeryangjie <[email protected]>2019-07-23 11:00:49 +0800
commitc794ac0255b0347cfd98b5751155cbfba1edc6b0 (patch)
tree02ae6bc36c1bf45d5f501cbda64b89114af563e5 /src
parent85ab390750f87956bb904f4d990a4a7191aa99c9 (diff)
parentc94cac2e27fb8ac6813341a4604fdf65eed02e9e (diff)
Merge branch 'master' of https://github.com/RT-Thread/rt-thread into dma
Diffstat (limited to 'src')
-rw-r--r--src/idle.c2
-rw-r--r--src/ipc.c4
-rw-r--r--src/irq.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/idle.c b/src/idle.c
index 77b0424892..1108bc3367 100644
--- a/src/idle.c
+++ b/src/idle.c
@@ -55,7 +55,7 @@ static rt_uint8_t rt_thread_stack[_CPUS_NR][IDLE_THREAD_STACK_SIZE];
#define RT_IDEL_HOOK_LIST_SIZE 4
#endif
-static void (*idle_hook_list[RT_IDEL_HOOK_LIST_SIZE])();
+static void (*idle_hook_list[RT_IDEL_HOOK_LIST_SIZE])(void);
/**
* @ingroup Hook
diff --git a/src/ipc.c b/src/ipc.c
index e293eee8cd..39cf217baa 100644
--- a/src/ipc.c
+++ b/src/ipc.c
@@ -1960,7 +1960,7 @@ RTM_EXPORT(rt_mq_delete);
*
* @return the error code
*/
-rt_err_t rt_mq_send(rt_mq_t mq, void *buffer, rt_size_t size)
+rt_err_t rt_mq_send(rt_mq_t mq, const void *buffer, rt_size_t size)
{
register rt_ubase_t temp;
struct rt_mq_message *msg;
@@ -2050,7 +2050,7 @@ RTM_EXPORT(rt_mq_send);
*
* @return the error code
*/
-rt_err_t rt_mq_urgent(rt_mq_t mq, void *buffer, rt_size_t size)
+rt_err_t rt_mq_urgent(rt_mq_t mq, const void *buffer, rt_size_t size)
{
register rt_ubase_t temp;
struct rt_mq_message *msg;
diff --git a/src/irq.c b/src/irq.c
index 78ad586064..311d297bfe 100644
--- a/src/irq.c
+++ b/src/irq.c
@@ -105,7 +105,7 @@ RTM_EXPORT(rt_interrupt_leave);
*
* @return the number of nested interrupts.
*/
-rt_uint8_t rt_interrupt_get_nest(void)
+RT_WEAK rt_uint8_t rt_interrupt_get_nest(void)
{
rt_uint8_t ret;
rt_base_t level;