summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYongqin Liu <yongqin.liu@linaro.org>2014-05-17 03:00:59 +0800
committerYongqin Liu <yongqin.liu@linaro.org>2014-05-17 03:00:59 +0800
commit9ed7090009874109914406cfefb9fd5deee44949 (patch)
tree56c68f39042da20dbb5f8dda57f81e8268612154
parentcfee685cca056e8f21892d3f6209f5fd6dbbbcf7 (diff)
downloadlinaro-android-kernel-test-9ed7090009874109914406cfefb9fd5deee44949.tar.gz
evdev and logger: fix compiling errors
fix compiling errors when use LSK and latest AOSP master branch Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
-rw-r--r--ashmemtest-basic/ashmemtest.c2
-rw-r--r--ashmemtest-expanded/ashmemtest-expanded.l2
-rw-r--r--evdevtest/kernel_module/Makefile2
-rw-r--r--logger/logger-dev-test.c20
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 <stdio.h>
#include <stdlib.h>
#include <fcntl.h>
-
-#ifdef UBUNTU_LOGGER
-
#include <sys/ioctl.h>
-#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 <log/logger.h>
-
#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()
{