mirror of
https://github.com/nyanmisaka/mpp.git
synced 2025-10-05 09:06:50 +08:00
[all]: change osal file name prefix from rk_ to mpp_
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@58 6e48237b-75ef-9749-8fc9-41990f28c85a
This commit is contained in:
@@ -14,13 +14,15 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef __RK_ERR_H__
|
#ifndef __MPP_ERR_H__
|
||||||
#define __RK_ERR_H__
|
#define __MPP_ERR_H__
|
||||||
|
|
||||||
#define RK_OK 0
|
#define RK_OK 0
|
||||||
|
#define RK_SUCCESS 0
|
||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
RK_SUCCESS = RK_OK,
|
MPP_SUCCESS = RK_SUCCESS,
|
||||||
|
MPP_OK = RK_OK,
|
||||||
} RK_RET;
|
} RK_RET;
|
||||||
|
|
||||||
#endif /*__RK_ERR_H__*/
|
#endif /*__MPP_ERR_H__*/
|
@@ -25,7 +25,6 @@
|
|||||||
#define __RK_TYPE_H__
|
#define __RK_TYPE_H__
|
||||||
|
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
#include "rk_err.h"
|
|
||||||
|
|
||||||
#if defined(_WIN32) && !defined(__MINGW32CE__)
|
#if defined(_WIN32) && !defined(__MINGW32CE__)
|
||||||
|
|
||||||
|
@@ -12,10 +12,10 @@ endif()
|
|||||||
include_directories(.)
|
include_directories(.)
|
||||||
|
|
||||||
add_library(osal STATIC
|
add_library(osal STATIC
|
||||||
rk_malloc.cpp
|
mpp_malloc.cpp
|
||||||
rk_list.cpp
|
mpp_list.cpp
|
||||||
rk_env.cpp
|
mpp_env.cpp
|
||||||
rk_log.cpp
|
mpp_log.cpp
|
||||||
${OS_DIR}/os_malloc.c
|
${OS_DIR}/os_malloc.c
|
||||||
${OS_DIR}/os_env.c
|
${OS_DIR}/os_env.c
|
||||||
${OS_DIR}/os_log.c
|
${OS_DIR}/os_log.c
|
||||||
|
@@ -20,6 +20,7 @@
|
|||||||
#include "rk_env.h"
|
#include "rk_env.h"
|
||||||
#include "rk_malloc.h"
|
#include "rk_malloc.h"
|
||||||
#include "rk_list.h"
|
#include "rk_list.h"
|
||||||
|
#include "mpp_err.h"
|
||||||
|
|
||||||
#include "os_malloc.h"
|
#include "os_malloc.h"
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
@@ -70,7 +71,7 @@ void *rk_mpp_malloc(char *tag, size_t size)
|
|||||||
void *ptr;
|
void *ptr;
|
||||||
get_osal_mem_flag();
|
get_osal_mem_flag();
|
||||||
|
|
||||||
if (RK_OK == os_malloc(&ptr, RK_OSAL_MEM_ALIGN, size)) {
|
if (MPP_OK == os_malloc(&ptr, RK_OSAL_MEM_ALIGN, size)) {
|
||||||
if (osal_mem_flag & OSAL_MEM_LIST_EN) {
|
if (osal_mem_flag & OSAL_MEM_LIST_EN) {
|
||||||
struct mem_node *node = (struct mem_node *)malloc(sizeof(struct mem_node));
|
struct mem_node *node = (struct mem_node *)malloc(sizeof(struct mem_node));
|
||||||
INIT_LIST_HEAD(&node->list);
|
INIT_LIST_HEAD(&node->list);
|
@@ -19,14 +19,14 @@ macro(add_mpp_osal_test module)
|
|||||||
endmacro()
|
endmacro()
|
||||||
|
|
||||||
# log system unit test
|
# log system unit test
|
||||||
add_mpp_osal_test(rk_log)
|
add_mpp_osal_test(mpp_log)
|
||||||
|
|
||||||
# env system unit test
|
# env system unit test
|
||||||
add_mpp_osal_test(rk_env)
|
add_mpp_osal_test(mpp_env)
|
||||||
|
|
||||||
# malloc system unit test
|
# malloc system unit test
|
||||||
add_mpp_osal_test(rk_malloc)
|
add_mpp_osal_test(mpp_malloc)
|
||||||
|
|
||||||
# thread implement unit test
|
# thread implement unit test
|
||||||
add_mpp_osal_test(rk_thread)
|
add_mpp_osal_test(mpp_thread)
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user