[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

@@ -19,8 +19,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "rk_log.h"
+#include "mpp_log.h"
-#include "rk_env.h"
+#include "mpp_env.h"
 #include "mpp_info.h"
 
 #include "svn_info.h"

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()

osal/inc/mpp_env.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef __RK_ENV_H__
+#ifndef __MPP_ENV_H__
-#define __RK_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__*/
 

osal/inc/mpp_list.h

@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-#ifndef __RK_LIST_H__
+#ifndef __MPP_LIST_H__
-#define __RK_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__*/

osal/inc/mpp_log.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef __RK_LOG_H__
+#ifndef __MPP_LOG_H__
-#define __RK_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__*/

osal/inc/mpp_malloc.h

@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-#ifndef __RK_MALLOC_H__
+#ifndef __MPP_MALLOC_H__
-#define __RK_MALLOC_H__
+#define __MPP_MALLOC_H__
 
 #include <stdlib.h>
+
 #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__*/
 

osal/inc/mpp_thread.h

@@ -21,8 +21,8 @@
  * Date         : 9:47 2015/7/27
  */
 
-#ifndef __RK_THREAD_H__
+#ifndef __MPP_THREAD_H__
-#define __RK_THREAD_H__
+#define __MPP_THREAD_H__
 
 #if defined(_WIN32) && !defined(__MINGW32CE__)
 
@@ -42,4 +42,4 @@
 
 #endif
 
-#endif /*__RK_THREAD_H__*/
+#endif /*__MPP_THREAD_H__*/

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

osal/mpp_list.cpp

@@ -20,8 +20,8 @@
 #include <stdarg.h>
 #include <errno.h>
 
-#include "rk_log.h"
+#include "mpp_log.h"
-#include "rk_list.h"
+#include "mpp_list.h"
 
 
 #define LIST_DEBUG(fmt, ...) rk_log(fmt, ## __VA_ARGS__)

osal/mpp_log.cpp

@@ -15,9 +15,12 @@
  */
 
 #define MODULE_TAG "rk_log"
+
 #include <stdio.h>
 #include <stdarg.h>
-#include "rk_log.h"
+
+#include "mpp_log.h"
+
 #include "os_log.h"
 
 #ifdef __cplusplus

osal/mpp_malloc.cpp

@@ -15,15 +15,18 @@
  */
 
 #define MODULE_TAG "rk_malloc"
+
+#include <string.h>
+
 #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 <string.h>
 
 // export configure for script detection
 #define CONFIG_OSAL_MEM_LIST        "osal_mem_list"

osal/test/mpp_env_test.c

@@ -15,8 +15,8 @@
  */
 
 #define MODULE_TAG "rk_env_test"
-#include "rk_env.h"
+#include "mpp_env.h"
-#include "rk_log.h"
+#include "mpp_log.h"
 
 const char env_debug[] = "test_env_debug";
 const char env_string[] = "test_env_string";

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()
 {

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 "mpp_log.h"
-#include "rk_malloc.h"
+#include "mpp_env.h"
+#include "mpp_malloc.h"
 
 // TODO: need to add pressure test case and parameter scan case
 

osal/test/mpp_thread_test.c

@@ -16,13 +16,15 @@
  */
 
 #define MODULE_TAG "rk_thread_test"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #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