diff options
| author | HubretXie <[email protected]> | 2019-04-28 15:14:42 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-04-28 15:14:42 +0800 |
| commit | 08a9887a28de879bbb4c8801d6c065a45e0beed8 (patch) | |
| tree | 21abaa91d5b0549ec6496412ad928810a27c1f5f /include | |
| parent | 25cdd8bba95499656594a1d3dfd42fd014df1f9f (diff) | |
| parent | b57e075867ec075f520863757906ced4d181357e (diff) | |
Merge pull request #3 from RT-Thread/master
sync
Diffstat (limited to 'include')
| -rw-r--r-- | include/libc/libc_errno.h | 2 | ||||
| -rw-r--r-- | include/rtdbg.h | 20 | ||||
| -rw-r--r-- | include/rtdef.h | 2 |
3 files changed, 20 insertions, 4 deletions
diff --git a/include/libc/libc_errno.h b/include/libc/libc_errno.h index bb9a4dea2a..0f3bc7635a 100644 --- a/include/libc/libc_errno.h +++ b/include/libc/libc_errno.h @@ -13,7 +13,7 @@ #include <rtconfig.h> -#if defined(RT_USING_NEWLIB) || defined(_WIN32) || defined(__CC_ARM) || defined(__IAR_SYSTEMS_ICC__) +#if defined(RT_USING_NEWLIB) || defined(_WIN32) /* use errno.h file in toolchains */ #include <errno.h> #endif diff --git a/include/rtdbg.h b/include/rtdbg.h index 77382c656b..a2dfbd9697 100644 --- a/include/rtdbg.h +++ b/include/rtdbg.h @@ -18,9 +18,9 @@ * In your C/C++ file, enable/disable DEBUG_ENABLE macro, and then include this * header file. * - * #define DBG_SECTION_NAME "MOD" - * #define DBG_LEVEL DBG_INFO - * #include <rtdbg.h> // must after of DBG_LEVEL, DBG_SECTION_NAME or other options + * #define DBG_TAG "MOD_TAG" + * #define DBG_LVL DBG_INFO + * #include <rtdbg.h> // must after of DBG_LVL, DBG_TAG or other options * * Then in your C/C++ file, you can use LOG_X macro to print out logs: * LOG_D("this is a debug log!"); @@ -53,15 +53,29 @@ #define DBG_INFO 2 #define DBG_LOG 3 +#ifdef DBG_TAG +#ifndef DBG_SECTION_NAME +#define DBG_SECTION_NAME DBG_TAG +#endif +#else +/* compatible with old version */ #ifndef DBG_SECTION_NAME #define DBG_SECTION_NAME "DBG" #endif +#endif /* DBG_TAG */ #ifdef DBG_ENABLE +#ifdef DBG_LVL +#ifndef DBG_LEVEL +#define DBG_LEVEL DBG_LVL +#endif +#else +/* compatible with old version */ #ifndef DBG_LEVEL #define DBG_LEVEL DBG_WARNING #endif +#endif /* DBG_LVL */ /* * The color for terminal (foreground) diff --git a/include/rtdef.h b/include/rtdef.h index 9af4320112..743b91d959 100644 --- a/include/rtdef.h +++ b/include/rtdef.h @@ -656,6 +656,7 @@ struct rt_semaphore struct rt_ipc_object parent; /**< inherit from ipc_object */ rt_uint16_t value; /**< value of semaphore. */ + rt_uint16_t reserved; /**< reserved field */ }; typedef struct rt_semaphore *rt_sem_t; #endif @@ -1020,6 +1021,7 @@ enum RTGRAPHIC_PIXEL_FORMAT_ABGR888, RTGRAPHIC_PIXEL_FORMAT_ARGB565, RTGRAPHIC_PIXEL_FORMAT_ALPHA, + RTGRAPHIC_PIXEL_FORMAT_COLOR, }; /** |