From 49923809689076225ab0c1c9df74f031b9d4310e Mon Sep 17 00:00:00 2001 From: Dmitry Antipov Date: Thu, 14 Feb 2013 17:23:32 +0400 Subject: Sync-up with the latest juice-aosp kernel (as of build 121). Since frameworks/native/include/utils/ashmem.h is a subject to removal, do not rely on this header and use the same header as bionic. Adjust ioctl names to match ones in kernel header. --- ashmemtest-basic/Android.mk | 1 - ashmemtest-basic/ashmem.h | 6 +++--- ashmemtest-basic/ashmemtest.c | 18 +++++++++--------- ashmemtest-expanded/Android.mk | 1 - ashmemtest-expanded/ashmem.h | 6 +++--- ashmemtest-expanded/ashmemtest-expanded.l | 2 +- 6 files changed, 16 insertions(+), 18 deletions(-) diff --git a/ashmemtest-basic/Android.mk b/ashmemtest-basic/Android.mk index e6d401c..0c70ebf 100644 --- a/ashmemtest-basic/Android.mk +++ b/ashmemtest-basic/Android.mk @@ -4,6 +4,5 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := ashmemtest.c LOCAL_MODULE := ashmemtest LOCAL_MODULE_TAGS := optional tests -LOCAL_C_INCLUDES := $(TOP)/frameworks/native/include include $(BUILD_EXECUTABLE) diff --git a/ashmemtest-basic/ashmem.h b/ashmemtest-basic/ashmem.h index 519fcfb..7218ec5 100644 --- a/ashmemtest-basic/ashmem.h +++ b/ashmemtest-basic/ashmem.h @@ -26,8 +26,8 @@ #define ASHMEM_WAS_REAPED 1 /* Return values from ASHMEM_ISPINNED: Is the mapping now pinned or unpinned? */ -#define ASHMEM_NOW_UNPINNED 0 -#define ASHMEM_NOW_PINNED 1 +#define ASHMEM_IS_UNPINNED 0 +#define ASHMEM_IS_PINNED 1 #define __ASHMEMIOC 0x77 @@ -39,7 +39,7 @@ #define ASHMEM_GET_PROT_MASK _IO(__ASHMEMIOC, 6) #define ASHMEM_PIN _IOW(__ASHMEMIOC, 7, struct ashmem_pin) #define ASHMEM_UNPIN _IOW(__ASHMEMIOC, 8, struct ashmem_pin) -#define ASHMEM_ISPINNED _IOW(__ASHMEMIOC, 9, struct ashmem_pin) +#define ASHMEM_GET_PIN_STATUS _IO(__ASHMEMIOC, 9) #define ASHMEM_PURGE_ALL_CACHES _IO(__ASHMEMIOC, 10) #endif /* _UTILS_ASHMEM_H */ diff --git a/ashmemtest-basic/ashmemtest.c b/ashmemtest-basic/ashmemtest.c index 0b20952..8d1be39 100644 --- a/ashmemtest-basic/ashmemtest.c +++ b/ashmemtest-basic/ashmemtest.c @@ -16,8 +16,8 @@ #include #ifdef ANDROID -/* In-tree compilation, use frameworks/native/include/utils/ashmem.h */ -#include +/* In-tree compilation */ +#include #else /* Freestanding compilation, use local copy */ #include "ashmem.h" @@ -275,26 +275,26 @@ void ashmem_pin_status (void) /* make sure we can examine zero-sized region (means everything onward) */ pin.offset = 0, pin.len = 0; - ret = ioctl (fd, ASHMEM_ISPINNED, &pin); + ret = ioctl (fd, ASHMEM_GET_PIN_STATUS, &pin); if (ret < 0) fatal (errno, "should be able to ask status of zero-sized region"); /* make sure we can't examine across page boundaries */ pin.offset = pagesize + 11, pin.len = pagesize + 17; - ret = ioctl (fd, ASHMEM_ISPINNED, &pin); + ret = ioctl (fd, ASHMEM_GET_PIN_STATUS, &pin); if (ret >= 0) fatal (errno, "should not be able to ask across page boundaries"); /* make sure we can't examine beyond the region */ pin.offset = size * 2, pin.len = pagesize; - ret = ioctl (fd, ASHMEM_ISPINNED, &pin); + ret = ioctl (fd, ASHMEM_GET_PIN_STATUS, &pin); if (ret >= 0) fatal (errno, "should not be able to ask beyond the region"); /* make sure it's initially pinned */ pin.offset = 0, pin.len = size; - ret = ioctl (fd, ASHMEM_ISPINNED, &pin); - if (ret != ASHMEM_NOW_PINNED) + ret = ioctl (fd, ASHMEM_GET_PIN_STATUS, &pin); + if (ret != ASHMEM_IS_PINNED) fatal (0, "expect initially pinned region"); /* unpin it */ @@ -305,8 +305,8 @@ void ashmem_pin_status (void) /* make sure it's not pinned now */ pin.offset = 0, pin.len = size; - ret = ioctl (fd, ASHMEM_ISPINNED, &pin); - if (ret != ASHMEM_NOW_UNPINNED) + ret = ioctl (fd, ASHMEM_GET_PIN_STATUS, &pin); + if (ret != ASHMEM_IS_UNPINNED) fatal (0, "expect unpinned region"); if (munmap (mem, size)) diff --git a/ashmemtest-expanded/Android.mk b/ashmemtest-expanded/Android.mk index 75aa6ef..33df3ef 100644 --- a/ashmemtest-expanded/Android.mk +++ b/ashmemtest-expanded/Android.mk @@ -4,6 +4,5 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := ashmemtest-expanded.l LOCAL_MODULE := ashmemtest-expanded LOCAL_MODULE_TAGS := optional tests -LOCAL_C_INCLUDES := $(TOP)/frameworks/native/include include $(BUILD_EXECUTABLE) diff --git a/ashmemtest-expanded/ashmem.h b/ashmemtest-expanded/ashmem.h index 519fcfb..7218ec5 100644 --- a/ashmemtest-expanded/ashmem.h +++ b/ashmemtest-expanded/ashmem.h @@ -26,8 +26,8 @@ #define ASHMEM_WAS_REAPED 1 /* Return values from ASHMEM_ISPINNED: Is the mapping now pinned or unpinned? */ -#define ASHMEM_NOW_UNPINNED 0 -#define ASHMEM_NOW_PINNED 1 +#define ASHMEM_IS_UNPINNED 0 +#define ASHMEM_IS_PINNED 1 #define __ASHMEMIOC 0x77 @@ -39,7 +39,7 @@ #define ASHMEM_GET_PROT_MASK _IO(__ASHMEMIOC, 6) #define ASHMEM_PIN _IOW(__ASHMEMIOC, 7, struct ashmem_pin) #define ASHMEM_UNPIN _IOW(__ASHMEMIOC, 8, struct ashmem_pin) -#define ASHMEM_ISPINNED _IOW(__ASHMEMIOC, 9, struct ashmem_pin) +#define ASHMEM_GET_PIN_STATUS _IO(__ASHMEMIOC, 9) #define ASHMEM_PURGE_ALL_CACHES _IO(__ASHMEMIOC, 10) #endif /* _UTILS_ASHMEM_H */ diff --git a/ashmemtest-expanded/ashmemtest-expanded.l b/ashmemtest-expanded/ashmemtest-expanded.l index f13c7a5..8372be6 100644 --- a/ashmemtest-expanded/ashmemtest-expanded.l +++ b/ashmemtest-expanded/ashmemtest-expanded.l @@ -15,7 +15,7 @@ #include #ifdef ANDROID -#include +#include #else #include "ashmem.h" #endif -- cgit v1.2.3