diff options
| author | Bernard Xiong <[email protected]> | 2015-08-09 00:03:40 +0800 |
|---|---|---|
| committer | Bernard Xiong <[email protected]> | 2015-08-09 00:03:40 +0800 |
| commit | 1a5c579e71c26bd14e5bf7309c06e13f40ad8210 (patch) | |
| tree | eb98a085c8d3a215b2efe91e9598460bbbc38179 /include | |
| parent | f5217d6a9c8c317bfc650b8402b4a866f445fc58 (diff) | |
| parent | 2bea2fdea8d99f0f86e9f6904c8025fcbdfb8905 (diff) | |
[Tools] merge local modification
Diffstat (limited to 'include')
| -rw-r--r-- | include/rtdebug.h | 9 | ||||
| -rw-r--r-- | include/rtdef.h | 6 | ||||
| -rw-r--r-- | include/rtthread.h | 2 |
3 files changed, 8 insertions, 9 deletions
diff --git a/include/rtdebug.h b/include/rtdebug.h index a324a29623..69a33b391f 100644 --- a/include/rtdebug.h +++ b/include/rtdebug.h @@ -83,14 +83,7 @@ while (0) #define RT_ASSERT(EX) \ if (!(EX)) \ { \ - volatile char dummy = 0; \ - if (rt_assert_hook == RT_NULL) \ - { \ - rt_kprintf("(%s) assert failed at %s:%d \n", #EX, __FUNCTION__, __LINE__);\ - while (dummy == 0); \ - } else { \ - rt_assert_hook(#EX, __FUNCTION__, __LINE__); \ - } \ + rt_assert_handler(#EX, __FUNCTION__, __LINE__); \ } /* Macro to check current context */ diff --git a/include/rtdef.h b/include/rtdef.h index 4c3581b91a..daa35a1d25 100644 --- a/include/rtdef.h +++ b/include/rtdef.h @@ -217,6 +217,7 @@ typedef int (*init_fn_t)(void); #define FINSH_VAR_EXPORT(name, type, desc) #define MSH_CMD_EXPORT(command, desc) +#define MSH_CMD_EXPORT_ALIAS(command, alias, desc) #elif !defined(FINSH_USING_SYMTAB) #define FINSH_FUNCTION_EXPORT_CMD(name, cmd, desc) #endif @@ -891,7 +892,8 @@ enum RTGRAPHIC_PIXEL_FORMAT_BGR565 = RTGRAPHIC_PIXEL_FORMAT_RGB565P, RTGRAPHIC_PIXEL_FORMAT_RGB666, RTGRAPHIC_PIXEL_FORMAT_RGB888, - RTGRAPHIC_PIXEL_FORMAT_ARGB888 + RTGRAPHIC_PIXEL_FORMAT_ARGB888, + RTGRAPHIC_PIXEL_FORMAT_ABGR888, }; /** @@ -964,6 +966,8 @@ struct rt_module { struct rt_object parent; /**< inherit from object */ + rt_uint32_t vstart_addr; /**< VMA base address for the + first LOAD segment. */ rt_uint8_t *module_space; /**< module memory space */ void *module_entry; /**< the entry address of module */ diff --git a/include/rtthread.h b/include/rtthread.h index 705795b522..c7f35d163e 100644 --- a/include/rtthread.h +++ b/include/rtthread.h @@ -518,6 +518,8 @@ void rt_show_version(void); #ifdef RT_DEBUG extern void (*rt_assert_hook)(const char* ex, const char* func, rt_size_t line); void rt_assert_set_hook(void (*hook)(const char* ex, const char* func, rt_size_t line)); + +void rt_assert_handler(const char* ex, const char* func, rt_size_t line); #endif /* RT_DEBUG */ /*@}*/ |