commit cf3d881f15c36271165986933ae902bdc16fcc79
author Mathias Agopian <mathias@google.com> Thu Apr 28 19:02:07 2011 -0700
committer Mathias Agopian <mathias@google.com> Thu Apr 28 19:02:07 2011 -0700
tree ac50f53629c7eb88e13244d200751a0e4330213e
parent 70fdb9e9011b43826aba4ea277a46d481676c525

remove support for GRALLOC_MODULE_PERFORM_CREATE_HANDLE_FROM_BUFFER

this is not used anymore.

Change-Id: Ie9e44ae8d1aa43c51f03c8cf29057ceae18a55c1

libgralloc-qsd8k/mapper.cpp

diff --git a/libgralloc-qsd8k/mapper.cpp b/libgralloc-qsd8k/mapper.cpp
index 26fadbc..6de7346 100644
--- a/libgralloc-qsd8k/mapper.cpp
+++ b/libgralloc-qsd8k/mapper.cpp
@@ -321,38 +321,5 @@
         int operation, ... )
 {
     int res = -EINVAL;
-    va_list args;
-    va_start(args, operation);
-
-    switch (operation) {
-        case GRALLOC_MODULE_PERFORM_CREATE_HANDLE_FROM_BUFFER: {
-            int fd = va_arg(args, int);
-            size_t size = va_arg(args, size_t);
-            size_t offset = va_arg(args, size_t);
-            void* base = va_arg(args, void*);
-
-            // validate that it's indeed a pmem buffer
-            pmem_region region;
-            if (ioctl(fd, PMEM_GET_SIZE, &region) < 0) {
-                break;
-            }
-
-            native_handle_t** handle = va_arg(args, native_handle_t**);
-            private_handle_t* hnd = (private_handle_t*)native_handle_create(
-                    private_handle_t::sNumFds, private_handle_t::sNumInts);
-            hnd->magic = private_handle_t::sMagic;
-            hnd->fd = fd;
-            hnd->flags = private_handle_t::PRIV_FLAGS_USES_PMEM;
-            hnd->size = size;
-            hnd->offset = offset;
-            hnd->base = intptr_t(base) + offset;
-            hnd->lockState = private_handle_t::LOCK_STATE_MAPPED;
-            *handle = (native_handle_t *)hnd;
-            res = 0;
-            break;
-        }
-    }
-
-    va_end(args);
     return res;
 }

libgralloc/mapper.cpp

diff --git a/libgralloc/mapper.cpp b/libgralloc/mapper.cpp
index 8be6b71..7a5fdc6 100644
--- a/libgralloc/mapper.cpp
+++ b/libgralloc/mapper.cpp
@@ -205,37 +205,5 @@
         int operation, ... )
 {
     int res = -EINVAL;
-    va_list args;
-    va_start(args, operation);
-
-    switch (operation) {
-        case GRALLOC_MODULE_PERFORM_CREATE_HANDLE_FROM_BUFFER: {
-            int fd = va_arg(args, int);
-            size_t size = va_arg(args, size_t);
-            size_t offset = va_arg(args, size_t);
-            void* base = va_arg(args, void*);
-
-            // validate that it's indeed a pmem buffer
-            pmem_region region;
-            if (ioctl(fd, PMEM_GET_SIZE, &region) < 0) {
-                break;
-            }
-
-            native_handle_t** handle = va_arg(args, native_handle_t**);
-            private_handle_t* hnd = (private_handle_t*)native_handle_create(
-                    private_handle_t::sNumFds, private_handle_t::sNumInts);
-            hnd->magic = private_handle_t::sMagic;
-            hnd->fd = fd;
-            hnd->flags = private_handle_t::PRIV_FLAGS_USES_PMEM;
-            hnd->size = size;
-            hnd->offset = offset;
-            hnd->base = intptr_t(base) + offset;
-            *handle = (native_handle_t *)hnd;
-            res = 0;
-            break;
-        }
-    }
-
-    va_end(args);
     return res;
 }