From 9ed7090009874109914406cfefb9fd5deee44949 Mon Sep 17 00:00:00 2001 From: Yongqin Liu Date: Sat, 17 May 2014 03:00:59 +0800 Subject: evdev and logger: fix compiling errors fix compiling errors when use LSK and latest AOSP master branch Signed-off-by: Yongqin Liu --- ashmemtest-basic/ashmemtest.c | 2 ++ ashmemtest-expanded/ashmemtest-expanded.l | 2 ++ evdevtest/kernel_module/Makefile | 2 +- logger/logger-dev-test.c | 20 ++++++++------------ 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ashmemtest-basic/ashmemtest.c b/ashmemtest-basic/ashmemtest.c index 6142fff..3958217 100644 --- a/ashmemtest-basic/ashmemtest.c +++ b/ashmemtest-basic/ashmemtest.c @@ -42,12 +42,14 @@ #define DEFAULT_PROT_MASK (PROT_READ | PROT_WRITE | PROT_EXEC) #ifndef _LINUX_ASHMEM_H +#ifndef _UAPI_LINUX_ASHMEM_H /* only if not defined already */ struct ashmem_pin { uint32_t offset; uint32_t len; }; #endif +#endif /* current test run */ int testno = -1; diff --git a/ashmemtest-expanded/ashmemtest-expanded.l b/ashmemtest-expanded/ashmemtest-expanded.l index cc1c850..4e7fbaa 100644 --- a/ashmemtest-expanded/ashmemtest-expanded.l +++ b/ashmemtest-expanded/ashmemtest-expanded.l @@ -32,11 +32,13 @@ #endif #ifndef _LINUX_ASHMEM_H +#ifndef _UAPI_LINUX_ASHMEM_H struct ashmem_pin { uint32_t offset; uint32_t len; }; #endif +#endif typedef struct { int beg; diff --git a/evdevtest/kernel_module/Makefile b/evdevtest/kernel_module/Makefile index cd62ba4..10b04d9 100644 --- a/evdevtest/kernel_module/Makefile +++ b/evdevtest/kernel_module/Makefile @@ -6,6 +6,6 @@ evdevtest_driver: android_kernel_modules $(INSTALLED_KERNEL_TARGET) $(ACP) export PATH=$(KERNEL_COMPILER_PATHS):$(PATH) &&\ cd $(TOP)/external/linaro-android-kernel-test/evdevtest/kernel_module &&\ if [ -e $(KERNEL_TOOLS_PREFIX)ld.bfd ]; then LD=$(KERNEL_TOOLS_PREFIX)ld.bfd; else LD=$(KERNEL_TOOLS_PREFIX)ld; fi && \ - $(MAKE) O=$(KERNEL_OUT) ARCH=$(ARCH) CROSS_COMPILE=$(KERNEL_TOOLS_PREFIX) LD=$$LD KCFLAGS="$(TARGET_EXTRA_CFLAGS) -fno-pic $(LOCAL_CFLAGS)" -C $(KERNEL_PATH) M=`pwd` modules + $(MAKE) O=$(KERNEL_OUT) ARCH=$(ARCH) CROSS_COMPILE=$(KERNEL_TOOLS_PREFIX) LD=$$LD KCFLAGS="$(TARGET_EXTRA_CFLAGS) -fno-pic $(LOCAL_CFLAGS)" -C $(realpath $(TOP))/$(KERNEL_SRC) M=`pwd` modules mkdir -p $(TARGET_OUT)/modules find $(TOP)/external/linaro-android-kernel-test/evdevtest/kernel_module -name "*.ko" -exec $(ACP) -fpt {} $(TARGET_OUT)/modules/ \; diff --git a/logger/logger-dev-test.c b/logger/logger-dev-test.c index 03fa8f3..78c496c 100644 --- a/logger/logger-dev-test.c +++ b/logger/logger-dev-test.c @@ -19,17 +19,9 @@ #include #include #include - -#ifdef UBUNTU_LOGGER - #include -#define __LOGGERIO 0xAE - -#define LOGGER_GET_LOG_BUF_SIZE _IO(__LOGGERIO, 1) /* size of log */ -#define LOGGER_GET_LOG_LEN _IO(__LOGGERIO, 2) /* used log len */ -#define LOGGER_GET_NEXT_ENTRY_LEN _IO(__LOGGERIO, 3) /* next entry len */ -#define LOGGER_FLUSH_LOG _IO(__LOGGERIO, 4) /* flush log */ +#ifdef UBUNTU_LOGGER #define LOGGER_LOG_RADIO "/dev/log_radio" #define LOGGER_LOG_EVENTS "/dev/log_events" @@ -38,16 +30,20 @@ #else -#include - #define LOGGER_LOG_RADIO "/dev/log/radio" #define LOGGER_LOG_EVENTS "/dev/log/events" #define LOGGER_LOG_SYSTEM "/dev/log/system" #define LOGGER_LOG_MAIN "/dev/log/main" - #endif // UBUNTU_LOGGER +#define __LOGGERIO 0xAE +#define LOGGER_GET_LOG_BUF_SIZE _IO(__LOGGERIO, 1) /* size of log */ +#define LOGGER_GET_LOG_LEN _IO(__LOGGERIO, 2) /* used log len */ +#define LOGGER_GET_NEXT_ENTRY_LEN _IO(__LOGGERIO, 3) /* next entry len */ +#define LOGGER_FLUSH_LOG _IO(__LOGGERIO, 4) /* flush log */ +#define LOGGER_GET_VERSION _IO(__LOGGERIO, 5) /* abi version */ +#define LOGGER_SET_VERSION _IO(__LOGGERIO, 6) /* abi version */ void show_help() { -- cgit v1.2.3