LineageOS/android_hardware_libhardware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "AArch64: Calculate private_handle_t's numInts"

Browse Source
This commit is contained in:
Greg Hackmann
2014-02-13 20:41:17 +00:00
committed by Gerrit Code Review
parent 037335ebe8 d2be74aa57
commit f4c46752df
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/gralloc/gralloc_priv.h
View File

@@ -79,7 +79,9 @@ struct private_handle_t {
int pid; int pid;
#ifdef __cplusplus #ifdef __cplusplus
static const int sNumInts = 6; static inline int sNumInts() {
return (((sizeof(private_handle_t) - sizeof(native_handle_t))/sizeof(int)) - sNumFds);
}
static const int sNumFds = 1; static const int sNumFds = 1;
static const int sMagic = 0x3141592; static const int sMagic = 0x3141592;
@@ -88,7 +90,7 @@ struct private_handle_t {
base(0), pid(getpid()) base(0), pid(getpid())
{ {
version = sizeof(native_handle); version = sizeof(native_handle);
numInts = sNumInts; numInts = sNumInts();
numFds = sNumFds; numFds = sNumFds;
} }
~private_handle_t() { ~private_handle_t() {
@@ -98,7 +100,7 @@ struct private_handle_t {
static int validate(const native_handle* h) { static int validate(const native_handle* h) {
const private_handle_t* hnd = (const private_handle_t*)h; const private_handle_t* hnd = (const private_handle_t*)h;
if (!h || h->version != sizeof(native_handle) || if (!h || h->version != sizeof(native_handle) ||
h->numInts != sNumInts || h->numFds != sNumFds || h->numInts != sNumInts() || h->numFds != sNumFds ||
hnd->magic != sMagic) hnd->magic != sMagic)
{ {
ALOGE("invalid gralloc handle (at %p)", h); ALOGE("invalid gralloc handle (at %p)", h);