diff options
| author | QuIC Gerrit Code Review <gerrit@quicinc.com> | 2009-11-23 21:07:50 -0800 |
|---|---|---|
| committer | QuIC Gerrit Code Review <gerrit@quicinc.com> | 2009-11-23 21:07:50 -0800 |
| commit | 80a265ee8f5589ea68a69dd6b890318fddce0436 (patch) | |
| tree | 5a99d08fbd5e414eb93a81dce52f7ddb9f27ba70 /libc/kernel/common | |
| parent | 2348a566a21c4cbee99cc05b3bed2f047937862a (diff) | |
| parent | 2edd7a3e34420aaebd0d96e114680edfbf8770be (diff) | |
| download | bionic-80a265ee8f5589ea68a69dd6b890318fddce0436.zip bionic-80a265ee8f5589ea68a69dd6b890318fddce0436.tar.gz bionic-80a265ee8f5589ea68a69dd6b890318fddce0436.tar.bz2 | |
Merge change I2edd7a3e into eclair
* changes:
bionic: Updating android_pmem.h as per current kernel
Diffstat (limited to 'libc/kernel/common')
| -rw-r--r-- | libc/kernel/common/linux/android_pmem.h | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/libc/kernel/common/linux/android_pmem.h b/libc/kernel/common/linux/android_pmem.h index bdf3aba..bc980c8 100644 --- a/libc/kernel/common/linux/android_pmem.h +++ b/libc/kernel/common/linux/android_pmem.h @@ -12,6 +12,15 @@ #ifndef _ANDROID_PMEM_H_ #define _ANDROID_PMEM_H_ +#include <linux/fs.h> + +#define PMEM_KERNEL_TEST_MAGIC 0xc0 +#define PMEM_KERNEL_TEST_NOMINAL_TEST_IOCTL _IO(PMEM_KERNEL_TEST_MAGIC, 1) +#define PMEM_KERNEL_TEST_ADVERSARIAL_TEST_IOCTL _IO(PMEM_KERNEL_TEST_MAGIC, 2) +#define PMEM_KERNEL_TEST_HUGE_ALLOCATION_TEST_IOCTL _IO(PMEM_KERNEL_TEST_MAGIC, 3) +#define PMEM_KERNEL_TEST_FREE_UNALLOCATED_TEST_IOCTL _IO(PMEM_KERNEL_TEST_MAGIC, 4) +#define PMEM_KERNEL_TEST_LARGE_REGION_NUMBER_TEST_IOCTL _IO(PMEM_KERNEL_TEST_MAGIC, 5) + #define PMEM_IOCTL_MAGIC 'p' #define PMEM_GET_PHYS _IOW(PMEM_IOCTL_MAGIC, 1, unsigned int) #define PMEM_MAP _IOW(PMEM_IOCTL_MAGIC, 2, unsigned int) @@ -24,25 +33,24 @@ #define PMEM_GET_TOTAL_SIZE _IOW(PMEM_IOCTL_MAGIC, 7, unsigned int) -struct android_pmem_platform_data -{ - const char* name; - - unsigned long start; - - unsigned long size; - - unsigned no_allocator; +#define HW3D_REVOKE_GPU _IOW(PMEM_IOCTL_MAGIC, 8, unsigned int) +#define HW3D_GRANT_GPU _IOW(PMEM_IOCTL_MAGIC, 9, unsigned int) +#define HW3D_WAIT_FOR_INTERRUPT _IOW(PMEM_IOCTL_MAGIC, 10, unsigned int) - unsigned cached; - - unsigned buffered; -}; +#define PMEM_CLEAN_INV_CACHES _IOW(PMEM_IOCTL_MAGIC, 11, unsigned int) +#define PMEM_CLEAN_CACHES _IOW(PMEM_IOCTL_MAGIC, 12, unsigned int) +#define PMEM_INV_CACHES _IOW(PMEM_IOCTL_MAGIC, 13, unsigned int) struct pmem_region { unsigned long offset; unsigned long len; }; +struct pmem_addr { + unsigned long vaddr; + unsigned long offset; + unsigned long length; +}; + #endif |