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

am 037335eb: Merge "gralloc: fix warnings"

Browse Source 
* commit '037335ebe826289445fd2ba14e95ff41d57ad928':
  gralloc: fix warnings
This commit is contained in:
Colin Cross
2014-02-06 03:03:12 +00:00
committed by Android Git Automerger
parent 8ded7780c6 037335ebe8
commit 5dbc98ff2c
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gralloc/Android.mk
View File

@@ -28,6 +28,6 @@ LOCAL_SRC_FILES := \
mapper.cpp mapper.cpp
LOCAL_MODULE := gralloc.default LOCAL_MODULE := gralloc.default
LOCAL_CFLAGS:= -DLOG_TAG=\"gralloc\" LOCAL_CFLAGS:= -DLOG_TAG=\"gralloc\" -Wno-missing-field-initializers
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

2
modules/gralloc/gralloc.cpp
View File

@@ -166,7 +166,7 @@ static int gralloc_alloc_framebuffer(alloc_device_t* dev,
} }
static int gralloc_alloc_buffer(alloc_device_t* dev, static int gralloc_alloc_buffer(alloc_device_t* dev,
size_t size, int usage, buffer_handle_t* pHandle) size_t size, int /*usage*/, buffer_handle_t* pHandle)
{ {
int err = 0; int err = 0;
int fd = -1; int fd = -1;

2
modules/gralloc/gralloc_priv.h
View File

@@ -75,7 +75,7 @@ struct private_handle_t {
int offset; int offset;
// FIXME: the attributes below should be out-of-line // FIXME: the attributes below should be out-of-line
int base; uintptr_t base;
int pid; int pid;
#ifdef __cplusplus #ifdef __cplusplus

14
modules/gralloc/mapper.cpp
View File

@@ -43,7 +43,7 @@ pid_t gettid() { return syscall(__NR_gettid);}
/*****************************************************************************/ /*****************************************************************************/
static int gralloc_map(gralloc_module_t const* module, static int gralloc_map(gralloc_module_t const* /*module*/,
buffer_handle_t handle, buffer_handle_t handle,
void** vaddr) void** vaddr)
{ {
@@ -56,7 +56,7 @@ static int gralloc_map(gralloc_module_t const* module,
ALOGE("Could not mmap %s", strerror(errno)); ALOGE("Could not mmap %s", strerror(errno));
return -errno; return -errno;
} }
hnd->base = intptr_t(mappedAddress) + hnd->offset; hnd->base = uintptr_t(mappedAddress) + hnd->offset;
//ALOGD("gralloc_map() succeeded fd=%d, off=%d, size=%d, vaddr=%p", //ALOGD("gralloc_map() succeeded fd=%d, off=%d, size=%d, vaddr=%p",
// hnd->fd, hnd->offset, hnd->size, mappedAddress); // hnd->fd, hnd->offset, hnd->size, mappedAddress);
} }
@@ -64,7 +64,7 @@ static int gralloc_map(gralloc_module_t const* module,
return 0; return 0;
} }
static int gralloc_unmap(gralloc_module_t const* module, static int gralloc_unmap(gralloc_module_t const* /*module*/,
buffer_handle_t handle) buffer_handle_t handle)
{ {
private_handle_t* hnd = (private_handle_t*)handle; private_handle_t* hnd = (private_handle_t*)handle;
@@ -163,9 +163,9 @@ int terminateBuffer(gralloc_module_t const* module,
return 0; return 0;
} }
int gralloc_lock(gralloc_module_t const* module, int gralloc_lock(gralloc_module_t const* /*module*/,
buffer_handle_t handle, int usage, buffer_handle_t handle, int /*usage*/,
int l, int t, int w, int h, int /*l*/, int /*t*/, int /*w*/, int /*h*/,
void** vaddr) void** vaddr)
{ {
// this is called when a buffer is being locked for software // this is called when a buffer is being locked for software
@@ -184,7 +184,7 @@ int gralloc_lock(gralloc_module_t const* module,
return 0; return 0;
} }
int gralloc_unlock(gralloc_module_t const* module, int gralloc_unlock(gralloc_module_t const* /*module*/,
buffer_handle_t handle) buffer_handle_t handle)
{ {
// we're done with a software buffer. nothing to do in this // we're done with a software buffer. nothing to do in this