mirror of
https://github.com/RT-Thread/rt-thread.git
synced 2026-09-20 17:44:20 +08:00
Merge branch 'master' into removeinit
This commit is contained in:
Man, Jianting (Meco)
+27
-11
@@ -38,6 +38,8 @@
|
||||
* 2021-05-10 armink change version number to v4.0.4
|
||||
* 2021-11-19 Meco Man change version number to v4.1.0
|
||||
* 2021-12-21 Meco Man re-implement RT_UNUSED
|
||||
* 2022-01-01 Gabriel improve hooking method
|
||||
* 2022-01-07 Gabriel move some __on_rt_xxxxx_hook to dedicated c soure files
|
||||
*/
|
||||
|
||||
#ifndef __RT_DEF_H__
|
||||
@@ -115,10 +117,6 @@ typedef rt_base_t rt_off_t; /**< Type for offset */
|
||||
#define RT_MB_ENTRY_MAX RT_UINT16_MAX /**< Maxium number of mailbox .entry */
|
||||
#define RT_MQ_ENTRY_MAX RT_UINT16_MAX /**< Maxium number of message queue .entry */
|
||||
|
||||
#if defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
|
||||
#define __CLANG_ARM
|
||||
#endif
|
||||
|
||||
#define RT_UNUSED(x) ((void)x)
|
||||
|
||||
/* Compiler Related Definitions */
|
||||
@@ -441,13 +439,29 @@ struct rt_object_information
|
||||
/**
|
||||
* The hook function call macro
|
||||
*/
|
||||
#ifdef RT_USING_HOOK
|
||||
#define RT_OBJECT_HOOK_CALL(func, argv) \
|
||||
do { if ((func) != RT_NULL) func argv; } while (0)
|
||||
#ifndef RT_USING_HOOK
|
||||
#define __ON_HOOK_ARGS(__hook, argv)
|
||||
#define RT_OBJECT_HOOK_CALL(func, argv)
|
||||
#else
|
||||
#define RT_OBJECT_HOOK_CALL(func, argv)
|
||||
#define RT_OBJECT_HOOK_CALL(func, argv) __on_##func argv
|
||||
#ifdef RT_HOOK_USING_FUNC_PTR
|
||||
#define __ON_HOOK_ARGS(__hook, argv) do {if ((__hook) != RT_NULL) __hook argv; } while (0)
|
||||
#else
|
||||
#define __ON_HOOK_ARGS(__hook, argv)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifndef __on_rt_interrupt_switch_hook
|
||||
#define __on_rt_interrupt_switch_hook() __ON_HOOK_ARGS(rt_interrupt_switch_hook, ())
|
||||
#endif
|
||||
#ifndef __on_rt_malloc_hook
|
||||
#define __on_rt_malloc_hook(addr, size) __ON_HOOK_ARGS(rt_malloc_hook, (addr, size))
|
||||
#endif
|
||||
#ifndef __on_rt_free_hook
|
||||
#define __on_rt_free_hook(rmem) __ON_HOOK_ARGS(rt_free_hook, (rmem))
|
||||
#endif
|
||||
|
||||
|
||||
/**@}*/
|
||||
|
||||
/**
|
||||
@@ -866,9 +880,9 @@ struct rt_memheap
|
||||
|
||||
void *start_addr; /**< pool start address and size */
|
||||
|
||||
rt_uint32_t pool_size; /**< pool size */
|
||||
rt_uint32_t available_size; /**< available size */
|
||||
rt_uint32_t max_used_size; /**< maximum allocated size */
|
||||
rt_size_t pool_size; /**< pool size */
|
||||
rt_size_t available_size; /**< available size */
|
||||
rt_size_t max_used_size; /**< maximum allocated size */
|
||||
|
||||
struct rt_memheap_item *block_list; /**< used block list */
|
||||
|
||||
@@ -1097,6 +1111,8 @@ struct rt_device_blk_sectors
|
||||
#define RTGRAPHIC_CTRL_GET_BRIGHTNESS 7
|
||||
#define RTGRAPHIC_CTRL_GET_MODE 8
|
||||
#define RTGRAPHIC_CTRL_GET_STATUS 9
|
||||
#define RTGRAPHIC_CTRL_PAN_DISPLAY 10
|
||||
#define RTGRAPHIC_CTRL_WAIT_VSYNC 11
|
||||
|
||||
/* graphic deice */
|
||||
enum
|
||||
|
||||
+17
-7
@@ -155,7 +155,6 @@ rt_err_t rt_thread_mdelay(rt_int32_t ms);
|
||||
rt_err_t rt_thread_control(rt_thread_t thread, int cmd, void *arg);
|
||||
rt_err_t rt_thread_suspend(rt_thread_t thread);
|
||||
rt_err_t rt_thread_resume(rt_thread_t thread);
|
||||
void rt_thread_timeout(void *parameter);
|
||||
|
||||
#ifdef RT_USING_SIGNALS
|
||||
void rt_thread_alloc_sig(rt_thread_t tid);
|
||||
@@ -267,9 +266,9 @@ void *rt_calloc(rt_size_t count, rt_size_t size);
|
||||
void *rt_malloc_align(rt_size_t size, rt_size_t align);
|
||||
void rt_free_align(void *ptr);
|
||||
|
||||
void rt_memory_info(rt_uint32_t *total,
|
||||
rt_uint32_t *used,
|
||||
rt_uint32_t *max_used);
|
||||
void rt_memory_info(rt_size_t *total,
|
||||
rt_size_t *used,
|
||||
rt_size_t *max_used);
|
||||
|
||||
#if defined(RT_USING_SLAB) && defined(RT_USING_SLAB_AS_HEAP)
|
||||
void *rt_page_alloc(rt_size_t npages);
|
||||
@@ -309,9 +308,9 @@ void *rt_memheap_alloc(struct rt_memheap *heap, rt_size_t size);
|
||||
void *rt_memheap_realloc(struct rt_memheap *heap, void *ptr, rt_size_t newsize);
|
||||
void rt_memheap_free(void *ptr);
|
||||
void rt_memheap_info(struct rt_memheap *heap,
|
||||
rt_uint32_t *total,
|
||||
rt_uint32_t *used,
|
||||
rt_uint32_t *max_used);
|
||||
rt_size_t *total,
|
||||
rt_size_t *used,
|
||||
rt_size_t *max_used);
|
||||
#endif
|
||||
|
||||
#ifdef RT_USING_SLAB
|
||||
@@ -411,6 +410,7 @@ rt_err_t rt_mb_send(rt_mailbox_t mb, rt_ubase_t value);
|
||||
rt_err_t rt_mb_send_wait(rt_mailbox_t mb,
|
||||
rt_ubase_t value,
|
||||
rt_int32_t timeout);
|
||||
rt_err_t rt_mb_urgent(rt_mailbox_t mb, rt_ubase_t value);
|
||||
rt_err_t rt_mb_recv(rt_mailbox_t mb, rt_ubase_t *value, rt_int32_t timeout);
|
||||
rt_err_t rt_mb_control(rt_mailbox_t mb, int cmd, void *arg);
|
||||
#endif
|
||||
@@ -596,8 +596,12 @@ int *_rt_errno(void);
|
||||
|
||||
int __rt_ffs(int value);
|
||||
|
||||
#ifndef RT_KSERVICE_USING_STDLIB_MEMSET
|
||||
void *rt_memset(void *src, int c, rt_ubase_t n);
|
||||
#endif /* RT_KSERVICE_USING_STDLIB_MEMSET */
|
||||
#ifndef RT_KSERVICE_USING_STDLIB_MEMCPY
|
||||
void *rt_memcpy(void *dest, const void *src, rt_ubase_t n);
|
||||
#endif /* RT_KSERVICE_USING_STDLIB_MEMCPY */
|
||||
char *rt_strdup(const char *s);
|
||||
|
||||
#ifndef RT_KSERVICE_USING_STDLIB
|
||||
@@ -612,6 +616,12 @@ rt_int32_t rt_strcmp(const char *cs, const char *ct);
|
||||
rt_size_t rt_strlen(const char *src);
|
||||
#else
|
||||
#include <string.h>
|
||||
#ifdef RT_KSERVICE_USING_STDLIB_MEMSET
|
||||
#define rt_memset(s, c, count) memset(s, c, count)
|
||||
#endif /* RT_KSERVICE_USING_STDLIB_MEMSET */
|
||||
#ifdef RT_KSERVICE_USING_STDLIB_MEMCPY
|
||||
#define rt_memcpy(dst, src, count) memcpy(dst, src, count)
|
||||
#endif /* RT_KSERVICE_USING_STDLIB_MEMCPY */
|
||||
#define rt_memmove(dest, src, n) memmove(dest, src, n)
|
||||
#define rt_memcmp(cs, ct, count) memcmp(cs, ct, count)
|
||||
#define rt_strstr(str1, str2) strstr(str1, str2)
|
||||
|
||||
Reference in New Issue
Block a user