From 1b5d44e56e55d8d0ee09d36235689e289945c4de Mon Sep 17 00:00:00 2001 From: ChenHengming Date: Fri, 7 Aug 2015 09:00:27 +0000 Subject: [PATCH] [all]: rename file and macro from RK to MPP git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@59 6e48237b-75ef-9749-8fc9-41990f28c85a --- mpp/mpp_info.cpp | 4 ++-- mpp/test/mpp_info_test.c | 2 +- osal/inc/{rk_env.h => mpp_env.h} | 6 +++--- osal/inc/{rk_list.h => mpp_list.h} | 9 +++++---- osal/inc/{rk_log.h => mpp_log.h} | 6 +++--- osal/inc/{rk_malloc.h => mpp_malloc.h} | 7 ++++--- osal/inc/{rk_thread.h => mpp_thread.h} | 6 +++--- osal/mpp_env.cpp | 2 +- osal/mpp_list.cpp | 4 ++-- osal/mpp_log.cpp | 5 ++++- osal/mpp_malloc.cpp | 13 ++++++++----- osal/test/mpp_env_test.c | 4 ++-- osal/test/mpp_log_test.c | 2 +- osal/test/mpp_malloc_test.c | 7 ++++--- osal/test/mpp_thread_test.c | 6 ++++-- 15 files changed, 47 insertions(+), 36 deletions(-) rename osal/inc/{rk_env.h => mpp_env.h} (90%) rename osal/inc/{rk_list.h => mpp_list.h} (97%) rename osal/inc/{rk_log.h => mpp_log.h} (93%) rename osal/inc/{rk_malloc.h => mpp_malloc.h} (89%) rename osal/inc/{rk_thread.h => mpp_thread.h} (90%) diff --git a/mpp/mpp_info.cpp b/mpp/mpp_info.cpp index a37d4fcb..07243172 100644 --- a/mpp/mpp_info.cpp +++ b/mpp/mpp_info.cpp @@ -19,8 +19,8 @@ #include #include -#include "rk_log.h" -#include "rk_env.h" +#include "mpp_log.h" +#include "mpp_env.h" #include "mpp_info.h" #include "svn_info.h" diff --git a/mpp/test/mpp_info_test.c b/mpp/test/mpp_info_test.c index 055b8be9..67b4bda3 100644 --- a/mpp/test/mpp_info_test.c +++ b/mpp/test/mpp_info_test.c @@ -16,7 +16,7 @@ #define MODULE_TAG "mpp_info_test" -#include "rk_log.h" +#include "mpp_log.h" #include "mpp_info.h" int main() diff --git a/osal/inc/rk_env.h b/osal/inc/mpp_env.h similarity index 90% rename from osal/inc/rk_env.h rename to osal/inc/mpp_env.h index 543c32f1..3f575b3e 100644 --- a/osal/inc/rk_env.h +++ b/osal/inc/mpp_env.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef __RK_ENV_H__ -#define __RK_ENV_H__ +#ifndef __MPP_ENV_H__ +#define __MPP_ENV_H__ #include "rk_type.h" @@ -33,5 +33,5 @@ RK_S32 rk_set_env_str(const char *name, char *value); } #endif -#endif /*__RK_ENV_H__*/ +#endif /*__MPP_ENV_H__*/ diff --git a/osal/inc/rk_list.h b/osal/inc/mpp_list.h similarity index 97% rename from osal/inc/rk_list.h rename to osal/inc/mpp_list.h index 80603bf0..2062f69f 100644 --- a/osal/inc/rk_list.h +++ b/osal/inc/mpp_list.h @@ -14,11 +14,12 @@ * limitations under the License. */ -#ifndef __RK_LIST_H__ -#define __RK_LIST_H__ +#ifndef __MPP_LIST_H__ +#define __MPP_LIST_H__ #include "rk_type.h" -#include "rk_thread.h" + +#include "mpp_thread.h" /* * two list structures are defined, one for C++, the other for C @@ -161,4 +162,4 @@ static inline int list_empty(struct list_head *head) #endif -#endif /*__RK_LIST_H__*/ +#endif /*__MPP_LIST_H__*/ diff --git a/osal/inc/rk_log.h b/osal/inc/mpp_log.h similarity index 93% rename from osal/inc/rk_log.h rename to osal/inc/mpp_log.h index 476ee0d9..2f2168ef 100644 --- a/osal/inc/rk_log.h +++ b/osal/inc/mpp_log.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef __RK_LOG_H__ -#define __RK_LOG_H__ +#ifndef __MPP_LOG_H__ +#define __MPP_LOG_H__ #include "rk_type.h" @@ -76,4 +76,4 @@ void _rk_err(const char *tag, const char *fmt, ...); #endif -#endif /*__RK_LOG_H__*/ +#endif /*__MPP_LOG_H__*/ diff --git a/osal/inc/rk_malloc.h b/osal/inc/mpp_malloc.h similarity index 89% rename from osal/inc/rk_malloc.h rename to osal/inc/mpp_malloc.h index 224c02b5..85a6534e 100644 --- a/osal/inc/rk_malloc.h +++ b/osal/inc/mpp_malloc.h @@ -14,10 +14,11 @@ * limitations under the License. */ -#ifndef __RK_MALLOC_H__ -#define __RK_MALLOC_H__ +#ifndef __MPP_MALLOC_H__ +#define __MPP_MALLOC_H__ #include + #include "rk_type.h" #define rk_malloc_tagged(type, count, tag) \ @@ -40,5 +41,5 @@ void rk_mpp_free(void *ptr); } #endif -#endif /*__RK_MPP_MALLOC_H__*/ +#endif /*__MPP_MALLOC_H__*/ diff --git a/osal/inc/rk_thread.h b/osal/inc/mpp_thread.h similarity index 90% rename from osal/inc/rk_thread.h rename to osal/inc/mpp_thread.h index b4cf4d02..74c3c56a 100644 --- a/osal/inc/rk_thread.h +++ b/osal/inc/mpp_thread.h @@ -21,8 +21,8 @@ * Date : 9:47 2015/7/27 */ -#ifndef __RK_THREAD_H__ -#define __RK_THREAD_H__ +#ifndef __MPP_THREAD_H__ +#define __MPP_THREAD_H__ #if defined(_WIN32) && !defined(__MINGW32CE__) @@ -42,4 +42,4 @@ #endif -#endif /*__RK_THREAD_H__*/ +#endif /*__MPP_THREAD_H__*/ diff --git a/osal/mpp_env.cpp b/osal/mpp_env.cpp index 52d2e159..46874619 100644 --- a/osal/mpp_env.cpp +++ b/osal/mpp_env.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "rk_env.h" +#include "mpp_env.h" #include "os_env.h" // TODO: add previous value compare to save call times diff --git a/osal/mpp_list.cpp b/osal/mpp_list.cpp index 0fca76f9..16fc3a4a 100644 --- a/osal/mpp_list.cpp +++ b/osal/mpp_list.cpp @@ -20,8 +20,8 @@ #include #include -#include "rk_log.h" -#include "rk_list.h" +#include "mpp_log.h" +#include "mpp_list.h" #define LIST_DEBUG(fmt, ...) rk_log(fmt, ## __VA_ARGS__) diff --git a/osal/mpp_log.cpp b/osal/mpp_log.cpp index bc33f40b..46c3968a 100644 --- a/osal/mpp_log.cpp +++ b/osal/mpp_log.cpp @@ -15,9 +15,12 @@ */ #define MODULE_TAG "rk_log" + #include #include -#include "rk_log.h" + +#include "mpp_log.h" + #include "os_log.h" #ifdef __cplusplus diff --git a/osal/mpp_malloc.cpp b/osal/mpp_malloc.cpp index d1084964..5a9a15e2 100644 --- a/osal/mpp_malloc.cpp +++ b/osal/mpp_malloc.cpp @@ -15,15 +15,18 @@ */ #define MODULE_TAG "rk_malloc" + +#include + #include "rk_type.h" -#include "rk_log.h" -#include "rk_env.h" -#include "rk_malloc.h" -#include "rk_list.h" #include "mpp_err.h" +#include "mpp_log.h" +#include "mpp_env.h" +#include "mpp_malloc.h" +#include "mpp_list.h" + #include "os_malloc.h" -#include // export configure for script detection #define CONFIG_OSAL_MEM_LIST "osal_mem_list" diff --git a/osal/test/mpp_env_test.c b/osal/test/mpp_env_test.c index 65e3377f..af0ca1af 100644 --- a/osal/test/mpp_env_test.c +++ b/osal/test/mpp_env_test.c @@ -15,8 +15,8 @@ */ #define MODULE_TAG "rk_env_test" -#include "rk_env.h" -#include "rk_log.h" +#include "mpp_env.h" +#include "mpp_log.h" const char env_debug[] = "test_env_debug"; const char env_string[] = "test_env_string"; diff --git a/osal/test/mpp_log_test.c b/osal/test/mpp_log_test.c index e19a8670..7a462460 100644 --- a/osal/test/mpp_log_test.c +++ b/osal/test/mpp_log_test.c @@ -15,8 +15,8 @@ */ #define MODULE_TAG "rk_log_test" -#include "rk_log.h" +#include "mpp_log.h" int main() { diff --git a/osal/test/mpp_malloc_test.c b/osal/test/mpp_malloc_test.c index 09f3034f..28c1b3a0 100644 --- a/osal/test/mpp_malloc_test.c +++ b/osal/test/mpp_malloc_test.c @@ -15,9 +15,10 @@ */ #define MODULE_TAG "rk_malloc_test" -#include "rk_log.h" -#include "rk_env.h" -#include "rk_malloc.h" + +#include "mpp_log.h" +#include "mpp_env.h" +#include "mpp_malloc.h" // TODO: need to add pressure test case and parameter scan case diff --git a/osal/test/mpp_thread_test.c b/osal/test/mpp_thread_test.c index 01b1b695..ff99f598 100644 --- a/osal/test/mpp_thread_test.c +++ b/osal/test/mpp_thread_test.c @@ -16,13 +16,15 @@ */ #define MODULE_TAG "rk_thread_test" + #include #include #include #include "rk_type.h" -#include "rk_log.h" -#include "rk_thread.h" + +#include "mpp_log.h" +#include "mpp_thread.h" // TODO: add thread mutex and condition test case