ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Export ion_4.12.h and ion_4.19.h"

Browse source
This commit is contained in:
Hridya Valsaraju 2019-10-09 16:58:32 +00:00 • committed by Gerrit Code Review
commit 524dc3f8ef
5 changed files with 18 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libion/ion.c
View file

@ -31,7 +31,7 @@
#include <unistd.h> #include <unistd.h>
#include <ion/ion.h> #include <ion/ion.h>
#include "ion_4.19.h" #include <linux/ion_4.19.h>
#include <log/log.h> #include <log/log.h>

32
libion/ion_4.12.h → libion/kernel-headers/linux/ion_4.12.h
View file

@ -22,27 +22,27 @@
#include <linux/types.h> #include <linux/types.h>
#define ION_NUM_HEAP_IDS (sizeof(unsigned int) * 8) #define ION_NUM_HEAP_IDS (sizeof(unsigned int) * 8)
struct ion_new_allocation_data { struct ion_new_allocation_data {
__u64 len; __u64 len;
__u32 heap_id_mask; __u32 heap_id_mask;
__u32 flags; __u32 flags;
__u32 fd; __u32 fd;
__u32 unused; __u32 unused;
}; };
#define MAX_HEAP_NAME 32 #define MAX_HEAP_NAME 32
struct ion_heap_data { struct ion_heap_data {
char name[MAX_HEAP_NAME]; char name[MAX_HEAP_NAME];
__u32 type; __u32 type;
__u32 heap_id; __u32 heap_id;
__u32 reserved0; __u32 reserved0;
__u32 reserved1; __u32 reserved1;
__u32 reserved2; __u32 reserved2;
}; };
struct ion_heap_query { struct ion_heap_query {
__u32 cnt; __u32 cnt;
__u32 reserved0; __u32 reserved0;
__u64 heaps; __u64 heaps;
__u32 reserved1; __u32 reserved1;
__u32 reserved2; __u32 reserved2;
}; };
#define ION_IOC_MAGIC 'I' #define ION_IOC_MAGIC 'I'
#define ION_IOC_NEW_ALLOC _IOWR(ION_IOC_MAGIC, 0, struct ion_new_allocation_data) #define ION_IOC_NEW_ALLOC _IOWR(ION_IOC_MAGIC, 0, struct ion_new_allocation_data)

0
libion/ion_4.19.h → libion/kernel-headers/linux/ion_4.19.h
View file

50
libion/tests/ion_4.12.h
View file

@ -1,50 +0,0 @@
/****************************************************************************
****************************************************************************
***
*** This header was automatically generated from a Linux kernel header
*** of the same name, to make information necessary for userspace to
*** call into the kernel available to libc. It contains only constants,
*** structures, and macros generated from the original header, and thus,
*** contains no copyrightable information.
***
*** To edit the content of this header, modify the corresponding
*** source file (e.g. under external/kernel-headers/original/) then
*** run bionic/libc/kernel/tools/update_all.py
***
*** Any manual change here will be lost the next time this script will
*** be run. You've been warned!
***
****************************************************************************
****************************************************************************/
#ifndef _UAPI_LINUX_ION_NEW_H
#define _UAPI_LINUX_ION_NEW_H
#include <linux/ioctl.h>
#include <linux/types.h>
#define ION_NUM_HEAP_IDS (sizeof(unsigned int) * 8)
struct ion_new_allocation_data {
__u64 len;
__u32 heap_id_mask;
__u32 flags;
__u32 fd;
__u32 unused;
};
#define MAX_HEAP_NAME 32
struct ion_heap_data {
char name[MAX_HEAP_NAME];
__u32 type;
__u32 heap_id;
__u32 reserved0;
__u32 reserved1;
__u32 reserved2;
};
struct ion_heap_query {
__u32 cnt;
__u32 reserved0;
__u64 heaps;
__u32 reserved1;
__u32 reserved2;
};
#define ION_IOC_MAGIC 'I'
#define ION_IOC_NEW_ALLOC _IOWR(ION_IOC_MAGIC, 0, struct ion_new_allocation_data)
#define ION_IOC_HEAP_QUERY _IOWR(ION_IOC_MAGIC, 8, struct ion_heap_query)
#endif

2
libion/tests/ion_test_fixture.h
View file

@ -18,8 +18,8 @@
#define ION_TEST_FIXTURE_H_ #define ION_TEST_FIXTURE_H_
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <linux/ion_4.12.h>
#include <vector> #include <vector>
#include "ion_4.12.h"
using ::testing::Test; using ::testing::Test;