Piteball/android_hardware_samsung
1
0
Fork 0
mirror of https://github.com/team-infusion-developers/android_hardware_samsung.git synced 2024-11-06 21:55:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Resolve compiler errors

Browse source 
* remove all unused variables
* remove all unused functions
* build with -no-error

Change-Id: I8cdf30b9e650b4905c6c122122cd3630bf153275
This commit is contained in:
Dominggoes Isakh 2018-08-13 22:39:50 +02:00
parent 46996ee4d4
commit b31f428d60
31 changed files with 63 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
exynos/multimedia/codecs/video/exynos4/mfc/Android.mk
View file

@ -20,9 +20,10 @@ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/include/ $(LOCAL_PATH)/include/
LOCAL_PRELINK_MODULE := false LOCAL_PRELINK_MODULE := false
LOCAL_CFLAGS := -Wno-error
ifeq ($(BOARD_USES_MFC_FPS),true) ifeq ($(BOARD_USES_MFC_FPS),true)
LOCAL_CFLAGS := -DCONFIG_MFC_FPS LOCAL_CFLAGS += -DCONFIG_MFC_FPS
#LOCAL_CFLAGS += -DCONFIG_MFC_PERF_ALOG #LOCAL_CFLAGS += -DCONFIG_MFC_PERF_ALOG
endif endif
@ -58,9 +59,10 @@ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/include/ $(LOCAL_PATH)/include/
LOCAL_PRELINK_MODULE := false LOCAL_PRELINK_MODULE := false
LOCAL_CFLAGS := -Wno-error
ifeq ($(BOARD_USES_MFC_FPS),true) ifeq ($(BOARD_USES_MFC_FPS),true)
LOCAL_CFLAGS := -DCONFIG_MFC_FPS LOCAL_CFLAGS += -DCONFIG_MFC_FPS
#LOCAL_CFLAGS += -DCONFIG_MFC_PERF_ALOG #LOCAL_CFLAGS += -DCONFIG_MFC_PERF_ALOG
endif endif
@ -96,9 +98,10 @@ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/include/ $(LOCAL_PATH)/include/
LOCAL_PRELINK_MODULE := false LOCAL_PRELINK_MODULE := false
LOCAL_CFLAGS := -Wno-error
ifeq ($(BOARD_USES_MFC_FPS),true) ifeq ($(BOARD_USES_MFC_FPS),true)
LOCAL_CFLAGS := -DCONFIG_MFC_FPS LOCAL_CFLAGS += -DCONFIG_MFC_FPS
#LOCAL_CFLAGS += -DCONFIG_MFC_PERF_ALOG #LOCAL_CFLAGS += -DCONFIG_MFC_PERF_ALOG
endif endif

4
exynos/multimedia/openmax/component/common/Android.mk
View file

@ -9,7 +9,7 @@ LOCAL_SRC_FILES := \
LOCAL_MODULE := libsecbasecomponent LOCAL_MODULE := libsecbasecomponent
LOCAL_CFLAGS := LOCAL_CFLAGS := -Wno-error
LOCAL_STATIC_LIBRARIES := libsecosal LOCAL_STATIC_LIBRARIES := libsecosal
LOCAL_SHARED_LIBRARIES := libcutils libutils LOCAL_SHARED_LIBRARIES := libcutils libutils
@ -31,7 +31,7 @@ LOCAL_SRC_FILES := \
LOCAL_PRELINK_MODULE := false LOCAL_PRELINK_MODULE := false
LOCAL_MODULE := libSEC_OMX_Resourcemanager LOCAL_MODULE := libSEC_OMX_Resourcemanager
LOCAL_CFLAGS := LOCAL_CFLAGS := -Wno-error
LOCAL_STATIC_LIBRARIES := libsecosal LOCAL_STATIC_LIBRARIES := libsecosal
LOCAL_SHARED_LIBRARIES := libcutils libutils LOCAL_SHARED_LIBRARIES := libcutils libutils

2
exynos/multimedia/openmax/component/video/dec/Android.mk
View file

@ -20,4 +20,6 @@ LOCAL_STATIC_LIBRARIES := libsecosal
LOCAL_CFLAGS += -DUSE_ANB LOCAL_CFLAGS += -DUSE_ANB
endif endif
LOCAL_CFLAGS += -Wno-error
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)

2
exynos/multimedia/openmax/component/video/dec/h264/Android.mk
View file

@ -11,7 +11,7 @@ LOCAL_PRELINK_MODULE := false
LOCAL_MODULE := libOMX.SEC.AVC.Decoder LOCAL_MODULE := libOMX.SEC.AVC.Decoder
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/omx LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/omx
LOCAL_CFLAGS := LOCAL_CFLAGS := -Wno-error
ifeq ($(BOARD_NONBLOCK_MODE_PROCESS), true) ifeq ($(BOARD_NONBLOCK_MODE_PROCESS), true)
LOCAL_CFLAGS += -DNONBLOCK_MODE_PROCESS LOCAL_CFLAGS += -DNONBLOCK_MODE_PROCESS

2
exynos/multimedia/openmax/component/video/dec/mpeg4/Android.mk
View file

@ -11,7 +11,7 @@ LOCAL_PRELINK_MODULE := false
LOCAL_MODULE := libOMX.SEC.M4V.Decoder LOCAL_MODULE := libOMX.SEC.M4V.Decoder
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/omx LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/omx
LOCAL_CFLAGS := LOCAL_CFLAGS := -Wno-error
ifeq ($(BOARD_NONBLOCK_MODE_PROCESS), true) ifeq ($(BOARD_NONBLOCK_MODE_PROCESS), true)
LOCAL_CFLAGS += -DNONBLOCK_MODE_PROCESS LOCAL_CFLAGS += -DNONBLOCK_MODE_PROCESS

2
exynos/multimedia/openmax/component/video/dec/vc1/Android.mk
View file

@ -11,7 +11,7 @@ LOCAL_PRELINK_MODULE := false
LOCAL_MODULE := libOMX.SEC.WMV.Decoder LOCAL_MODULE := libOMX.SEC.WMV.Decoder
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/omx LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/omx
LOCAL_CFLAGS := LOCAL_CFLAGS := -Wno-error
ifeq ($(BOARD_NONBLOCK_MODE_PROCESS), true) ifeq ($(BOARD_NONBLOCK_MODE_PROCESS), true)
LOCAL_CFLAGS += -DNONBLOCK_MODE_PROCESS LOCAL_CFLAGS += -DNONBLOCK_MODE_PROCESS

2
exynos/multimedia/openmax/component/video/dec/vp8/Android.mk
View file

@ -11,7 +11,7 @@ LOCAL_PRELINK_MODULE := false
LOCAL_MODULE := libOMX.SEC.VP8.Decoder LOCAL_MODULE := libOMX.SEC.VP8.Decoder
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/omx LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/omx
LOCAL_CFLAGS := LOCAL_CFLAGS := -Wno-error
ifeq ($(BOARD_NONBLOCK_MODE_PROCESS), true) ifeq ($(BOARD_NONBLOCK_MODE_PROCESS), true)
LOCAL_CFLAGS += -DNONBLOCK_MODE_PROCESS LOCAL_CFLAGS += -DNONBLOCK_MODE_PROCESS

2
exynos/multimedia/openmax/component/video/enc/Android.mk
View file

@ -24,4 +24,6 @@ ifeq ($(BOARD_USE_STOREMETADATA), true)
LOCAL_CFLAGS += -DUSE_STOREMETADATA LOCAL_CFLAGS += -DUSE_STOREMETADATA
endif endif
LOCAL_CFLAGS += -Wno-error
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)

2
exynos/multimedia/openmax/component/video/enc/h264/Android.mk
View file

@ -11,7 +11,7 @@ LOCAL_PRELINK_MODULE := false
LOCAL_MODULE := libOMX.SEC.AVC.Encoder LOCAL_MODULE := libOMX.SEC.AVC.Encoder
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/omx LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/omx
LOCAL_CFLAGS := LOCAL_CFLAGS := -Wno-error
ifeq ($(BOARD_NONBLOCK_MODE_PROCESS), true) ifeq ($(BOARD_NONBLOCK_MODE_PROCESS), true)
LOCAL_CFLAGS += -DNONBLOCK_MODE_PROCESS LOCAL_CFLAGS += -DNONBLOCK_MODE_PROCESS

2
exynos/multimedia/openmax/component/video/enc/mpeg4/Android.mk
View file

@ -11,7 +11,7 @@ LOCAL_PRELINK_MODULE := false
LOCAL_MODULE := libOMX.SEC.M4V.Encoder LOCAL_MODULE := libOMX.SEC.M4V.Encoder
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/omx LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/omx
LOCAL_CFLAGS := LOCAL_CFLAGS := -Wno-error
ifeq ($(BOARD_NONBLOCK_MODE_PROCESS), true) ifeq ($(BOARD_NONBLOCK_MODE_PROCESS), true)
LOCAL_CFLAGS += -DNONBLOCK_MODE_PROCESS LOCAL_CFLAGS += -DNONBLOCK_MODE_PROCESS

2
exynos/multimedia/openmax/core/Android.mk
View file

@ -9,7 +9,7 @@ LOCAL_SRC_FILES := SEC_OMX_Component_Register.c \
LOCAL_PRELINK_MODULE := false LOCAL_PRELINK_MODULE := false
LOCAL_MODULE := libSEC_OMX_Core LOCAL_MODULE := libSEC_OMX_Core
LOCAL_CFLAGS := LOCAL_CFLAGS := -Wno-error
LOCAL_ARM_MODE := arm LOCAL_ARM_MODE := arm

2
exynos/multimedia/openmax/osal/Android.mk
View file

@ -18,7 +18,7 @@ LOCAL_SRC_FILES := \
LOCAL_PRELINK_MODULE := false LOCAL_PRELINK_MODULE := false
LOCAL_MODULE := libsecosal LOCAL_MODULE := libsecosal
LOCAL_CFLAGS := LOCAL_CFLAGS := -Wno-error
ifeq ($(TARGET_NEEDS_EXYNOS4_ENHANCEMENTS),true) ifeq ($(TARGET_NEEDS_EXYNOS4_ENHANCEMENTS),true)
LOCAL_CFLAGS += -DEXYNOS4_ENHANCEMENTS LOCAL_CFLAGS += -DEXYNOS4_ENHANCEMENTS

1
exynos/multimedia/utils/csc/exynos4/Android.mk
View file

@ -28,6 +28,7 @@ LOCAL_C_INCLUDES := \
ifeq ($(BOARD_USE_SAMSUNG_COLORFORMAT), true) ifeq ($(BOARD_USE_SAMSUNG_COLORFORMAT), true)
LOCAL_CFLAGS += -DUSE_SAMSUNG_COLORFORMAT LOCAL_CFLAGS += -DUSE_SAMSUNG_COLORFORMAT
endif endif
LOCAL_CFLAGS += -Wno-error
LOCAL_MODULE := libseccscapi LOCAL_MODULE := libseccscapi

7
exynos/multimedia/utils/csc/exynos4/color_space_convertor.c
View file

@ -1564,9 +1564,6 @@ void csc_RGB565_to_YUV420P(
unsigned int R, G, B; unsigned int R, G, B;
unsigned int Y, U, V; unsigned int Y, U, V;
unsigned int offset1 = width * height;
unsigned int offset2 = width/2 * height/2;
unsigned short int *pSrc = (unsigned short int *)rgb_src; unsigned short int *pSrc = (unsigned short int *)rgb_src;
unsigned char *pDstY = (unsigned char *)y_dst; unsigned char *pDstY = (unsigned char *)y_dst;
@ -1638,8 +1635,6 @@ void csc_RGB565_to_YUV420SP(
unsigned int R, G, B; unsigned int R, G, B;
unsigned int Y, U, V; unsigned int Y, U, V;
unsigned int offset = width * height;
unsigned short int *pSrc = (unsigned short int *)rgb_src; unsigned short int *pSrc = (unsigned short int *)rgb_src;
unsigned char *pDstY = (unsigned char *)y_dst; unsigned char *pDstY = (unsigned char *)y_dst;
@ -1693,8 +1688,6 @@ void csc_ARGB8888_to_YUV420SP(
unsigned int R, G, B; unsigned int R, G, B;
unsigned int Y, U, V; unsigned int Y, U, V;
unsigned int offset = width * height;
unsigned int *pSrc = (unsigned int *)rgb_src; unsigned int *pSrc = (unsigned int *)rgb_src;
unsigned char *pDstY = (unsigned char *)y_dst; unsigned char *pDstY = (unsigned char *)y_dst;

2
exynos4/hal/libUMP/arch_011_udd/ump_arch.c
View file

@ -176,7 +176,7 @@ ump_secure_id ump_arch_ion_import(int ion_fd, unsigned long *size, ump_alloc_con
call_arg.size = *size; call_arg.size = *size;
call_arg.constraints = (ump_uk_alloc_constraints)constraints; call_arg.constraints = (ump_uk_alloc_constraints)constraints;
UMP_DEBUG_PRINT(4, ("%s ion_fd=%d size=%x constraints=x", __func__, ion_fd, size, constraints)); UMP_DEBUG_PRINT(4, ("%s ion_fd=%d size=%lu constraints=%x", __func__, ion_fd, (unsigned long)size, constraints));
if ( _UMP_OSU_ERR_OK != _ump_uku_ion_import(&call_arg) ) if ( _UMP_OSU_ERR_OK != _ump_uku_ion_import(&call_arg) )
{ {

1
exynos4/hal/libUMP/arch_011_udd/ump_arch.h
View file

@ -71,6 +71,7 @@ int ump_arch_lock( ump_secure_id secure_id, ump_lock_usage lock_usage );
/** Unlocking buffer. Let other users lock the buffer for their usage */ /** Unlocking buffer. Let other users lock the buffer for their usage */
int ump_arch_unlock( ump_secure_id secure_id ); int ump_arch_unlock( ump_secure_id secure_id );
ump_secure_id ump_arch_ion_import(int ion_fd, unsigned long *size, ump_alloc_constraints constraints);
#ifdef __cplusplus #ifdef __cplusplus
} }

12
exynos4/hal/libfimc/SecFimc.cpp
View file

@ -181,7 +181,7 @@ void v4l2_overlay_dump_state(int fd)
} }
int fimc_v4l2_query_buf(int fd, SecBuffer *secBuf, enum v4l2_buf_type type, enum v4l2_memory memory, int buf_index, int num_plane) int fimc_v4l2_query_buf(int fd, SecBuffer *secBuf, enum v4l2_buf_type type, enum v4l2_memory memory __unused, int buf_index, int num_plane)
{ {
struct v4l2_buffer buf; struct v4l2_buffer buf;
memset(&buf, 0, sizeof(struct v4l2_buffer)); memset(&buf, 0, sizeof(struct v4l2_buffer));
@ -691,8 +691,6 @@ err :
bool SecFimc::destroy() bool SecFimc::destroy()
{ {
s5p_fimc_params_t *params = &(mS5pFimc.params);
if (mFlagCreate == false) { if (mFlagCreate == false) {
ALOGE("%s::Already Destroyed fail", __func__); ALOGE("%s::Already Destroyed fail", __func__);
return false; return false;
@ -1191,8 +1189,6 @@ bool SecFimc::setDstAddr(unsigned int physYAddr, unsigned int physCbAddr, unsign
bool SecFimc::setRotVal(unsigned int rotVal) bool SecFimc::setRotVal(unsigned int rotVal)
{ {
struct v4l2_control vc;
if (mFlagCreate == false) { if (mFlagCreate == false) {
ALOGE("%s::Not yet created", __func__); ALOGE("%s::Not yet created", __func__);
return false; return false;
@ -1337,7 +1333,7 @@ bool SecFimc::setColorKey(bool enable, int colorKey)
return true; return true;
} }
bool SecFimc::draw(int src_index, int dst_index) bool SecFimc::draw(int src_index, int dst_index __unused)
{ {
#ifdef DEBUG_LIB_FIMC #ifdef DEBUG_LIB_FIMC
ALOGD("%s", __func__); ALOGD("%s", __func__);
@ -1481,7 +1477,7 @@ bool SecFimc::m_streamOn()
} }
bool SecFimc::m_checkSrcSize(unsigned int width, unsigned int height, bool SecFimc::m_checkSrcSize(unsigned int width, unsigned int height,
unsigned int cropX, unsigned int cropY, unsigned int cropX __unused, unsigned int cropY __unused,
unsigned int *cropWidth, unsigned int *cropHeight, unsigned int *cropWidth, unsigned int *cropHeight,
int colorFormat, int colorFormat,
bool forceChange) bool forceChange)
@ -1531,7 +1527,7 @@ bool SecFimc::m_checkSrcSize(unsigned int width, unsigned int height,
} }
bool SecFimc::m_checkDstSize(unsigned int width, unsigned int height, bool SecFimc::m_checkDstSize(unsigned int width, unsigned int height,
unsigned int cropX, unsigned int cropY, unsigned int cropX __unused, unsigned int cropY __unused,
unsigned int *cropWidth, unsigned int *cropHeight, unsigned int *cropWidth, unsigned int *cropHeight,
int colorFormat, int rotVal, bool forceChange) int colorFormat, int rotVal, bool forceChange)
{ {

2
exynos4/hal/libfimg3x/Android.mk
View file

@ -17,6 +17,8 @@ LOCAL_MODULE:= libfimg
LOCAL_PRELINK_MODULE := false LOCAL_PRELINK_MODULE := false
LOCAL_CFLAGS := -Wno-error
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
endif endif

1
exynos4/hal/libgralloc_ump/Android.mk
View file

@ -45,6 +45,7 @@ LOCAL_VENDOR_MODULE := true
LOCAL_CFLAGS:= -DLOG_TAG=\"gralloc\" -DGRALLOC_32_BITS LOCAL_CFLAGS:= -DLOG_TAG=\"gralloc\" -DGRALLOC_32_BITS
#LOCAL_CFLAGS+= -DMALI_VSYNC_EVENT_REPORT_ENABLE #LOCAL_CFLAGS+= -DMALI_VSYNC_EVENT_REPORT_ENABLE
LOCAL_CFLAGS += -Wno-error
LOCAL_CFLAGS += -DSAMSUNG_EXYNOS LOCAL_CFLAGS += -DSAMSUNG_EXYNOS
LOCAL_CFLAGS += -DSAMSUNG_EXYNOS_CACHE_UMP LOCAL_CFLAGS += -DSAMSUNG_EXYNOS_CACHE_UMP

2
exynos4/hal/libgralloc_ump/alloc_device.cpp
View file

@ -523,7 +523,7 @@ static int alloc_device_close(struct hw_device_t *device)
return 0; return 0;
} }
int alloc_device_open(hw_module_t const* module, const char* name, hw_device_t** device) int alloc_device_open(hw_module_t const* module, const char* name __unused, hw_device_t** device)
{ {
alloc_device_t *dev; alloc_device_t *dev;

6
exynos4/hal/libgralloc_ump/framebuffer_device.cpp
View file

@ -85,13 +85,13 @@ static int fb_post(struct framebuffer_device_t* dev, buffer_handle_t buffer)
0, 0, m->info.xres, m->info.yres, NULL); 0, 0, m->info.xres, m->info.yres, NULL);
const size_t offset = hnd->base - m->framebuffer->base; const size_t offset = hnd->base - m->framebuffer->base;
int interrupt;
m->info.activate = FB_ACTIVATE_VBL; m->info.activate = FB_ACTIVATE_VBL;
m->info.yoffset = offset / m->finfo.line_length; m->info.yoffset = offset / m->finfo.line_length;
#ifdef STANDARD_LINUX_SCREEN #ifdef STANDARD_LINUX_SCREEN
#define FBIO_WAITFORVSYNC _IOW('F', 0x20, __u32) #define FBIO_WAITFORVSYNC _IOW('F', 0x20, __u32)
#define S3CFB_SET_VSYNC_INT _IOW('F', 206, unsigned int) #define S3CFB_SET_VSYNC_INT _IOW('F', 206, unsigned int)
int interrupt;
if (ioctl(m->framebuffer->fd, FBIOPAN_DISPLAY, &m->info) == -1) { if (ioctl(m->framebuffer->fd, FBIOPAN_DISPLAY, &m->info) == -1) {
ALOGE("FBIOPAN_DISPLAY failed"); ALOGE("FBIOPAN_DISPLAY failed");
m->base.unlock(&m->base, buffer); m->base.unlock(&m->base, buffer);
@ -389,7 +389,7 @@ static int fb_close(struct hw_device_t *device)
return 0; return 0;
} }
int compositionComplete(struct framebuffer_device_t* dev) int compositionComplete(struct framebuffer_device_t* dev __unused)
{ {
#ifndef HWC_HWOVERLAY #ifndef HWC_HWOVERLAY
unsigned char pixels[4]; unsigned char pixels[4];
@ -413,7 +413,7 @@ int compositionComplete(struct framebuffer_device_t* dev)
return 0; return 0;
} }
int framebuffer_device_open(hw_module_t const* module, const char* name, hw_device_t** device) int framebuffer_device_open(hw_module_t const* module, const char* name __unused, hw_device_t** device)
{ {
int status = -EINVAL; int status = -EINVAL;

10
exynos4/hal/libgralloc_ump/gralloc_module.cpp
View file

@ -32,6 +32,7 @@
#include <errno.h> #include <errno.h>
#include <pthread.h> #include <pthread.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <cutils/log.h> #include <cutils/log.h>
@ -118,7 +119,7 @@ int release_rect(int secure_id)
} }
#endif #endif
static int gralloc_map(gralloc_module_t const* module, static int gralloc_map(gralloc_module_t const* module __unused,
buffer_handle_t handle, void** vaddr) buffer_handle_t handle, void** vaddr)
{ {
private_handle_t* hnd = (private_handle_t*)handle; private_handle_t* hnd = (private_handle_t*)handle;
@ -161,7 +162,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 __unused,
buffer_handle_t handle) buffer_handle_t handle)
{ {
private_handle_t* hnd = (private_handle_t*)handle; private_handle_t* hnd = (private_handle_t*)handle;
@ -374,8 +375,9 @@ static int gralloc_unregister_buffer(gralloc_module_t const* module, buffer_hand
return 0; return 0;
} }
static int gralloc_lock(gralloc_module_t const* module, buffer_handle_t handle, static int gralloc_lock(gralloc_module_t const* module __unused, buffer_handle_t handle,
int usage, int l, int t, int w, int h, void** vaddr) int usage, int l __unused, int t __unused, int w __unused,
int h __unused, void** vaddr)
{ {
int err = 0; int err = 0;
if (private_handle_t::validate(handle) < 0) { if (private_handle_t::validate(handle) < 0) {

1
exynos4/hal/libhwcomposer/Android.mk
View file

@ -30,6 +30,7 @@ LOCAL_C_INCLUDES := \
LOCAL_SRC_FILES := SecHWCLog.cpp SecHWCUtils.cpp SecHWC.cpp LOCAL_SRC_FILES := SecHWCLog.cpp SecHWCUtils.cpp SecHWC.cpp
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../libfimg LOCAL_C_INCLUDES += $(LOCAL_PATH)/../libfimg
LOCAL_CFLAGS += -Wno-error
ifeq ($(TARGET_NEEDS_EXYNOS4_ENHANCEMENTS),true) ifeq ($(TARGET_NEEDS_EXYNOS4_ENHANCEMENTS),true)
LOCAL_CFLAGS += -DEXYNOS4_ENHANCEMENTS LOCAL_CFLAGS += -DEXYNOS4_ENHANCEMENTS

1
exynos4/hal/libhwcomposer/SecHWC.cpp
View file

@ -30,6 +30,7 @@
#include <EGL/egl.h> #include <EGL/egl.h>
#include <fcntl.h> #include <fcntl.h>
#include <hardware_legacy/uevent.h> #include <hardware_legacy/uevent.h>
#include <string.h>
#include <sys/prctl.h> #include <sys/prctl.h>
#include <sys/resource.h> #include <sys/resource.h>

9
exynos4/hal/libhwcomposer/SecHWCUtils.cpp
View file

@ -24,6 +24,7 @@
* *
*/ */
#include <string.h>
#include "SecHWCUtils.h" #include "SecHWCUtils.h"
#define V4L2_BUF_TYPE_OUTPUT V4L2_BUF_TYPE_VIDEO_OUTPUT #define V4L2_BUF_TYPE_OUTPUT V4L2_BUF_TYPE_VIDEO_OUTPUT
#define V4L2_BUF_TYPE_CAPTURE V4L2_BUF_TYPE_VIDEO_CAPTURE #define V4L2_BUF_TYPE_CAPTURE V4L2_BUF_TYPE_VIDEO_CAPTURE
@ -84,9 +85,7 @@ struct yuv_fmt_list yuv_list[] = {
int window_open(struct hwc_win_info_t *win, int id) int window_open(struct hwc_win_info_t *win, int id)
{ {
int fd = 0;
char name[64]; char name[64];
int vsync = 1;
int real_id = id; int real_id = id;
char const * const device_template = "/dev/graphics/fb%u"; char const * const device_template = "/dev/graphics/fb%u";
@ -135,6 +134,8 @@ int window_open(struct hwc_win_info_t *win, int id)
} }
#ifdef ENABLE_FIMD_VSYNC #ifdef ENABLE_FIMD_VSYNC
int vsync = 1;
if (ioctl(win->fd, S3CFB_SET_VSYNC_INT, &vsync) < 0) { if (ioctl(win->fd, S3CFB_SET_VSYNC_INT, &vsync) < 0) {
SEC_HWC_Log(HWC_LOG_ERROR, "%s::S3CFB_SET_VSYNC_INT fail", __func__); SEC_HWC_Log(HWC_LOG_ERROR, "%s::S3CFB_SET_VSYNC_INT fail", __func__);
goto error; goto error;
@ -461,7 +462,7 @@ int fimc_v4l2_queue(int fd, struct fimc_buf *fimc_buf, enum v4l2_buf_type type,
return 0; return 0;
} }
int fimc_v4l2_dequeue(int fd, struct fimc_buf *fimc_buf, enum v4l2_buf_type type) int fimc_v4l2_dequeue(int fd, struct fimc_buf *fimc_buf __unused, enum v4l2_buf_type type)
{ {
struct v4l2_buffer buf; struct v4l2_buffer buf;
@ -516,7 +517,7 @@ int fimc_v4l2_S_ctrl(int fd)
return 0; return 0;
} }
int fimc_handle_oneshot(int fd, struct fimc_buf *fimc_src_buf, struct fimc_buf *fimc_dst_buf) int fimc_handle_oneshot(int fd, struct fimc_buf *fimc_src_buf, struct fimc_buf *fimc_dst_buf __unused)
{ {
#ifdef CHECK_FPS #ifdef CHECK_FPS
check_fps(); check_fps();

24
exynos4/hal/libs5pjpeg/jpeg_api.c
View file

@ -133,7 +133,7 @@ int api_jpeg_decode_init()
return -1; return -1;
} }
ALOGV("api_jpeg_decode_init jpeg_ctx->args.mmapped_addr 0x%08x\n", ALOGV("api_jpeg_decode_init jpeg_ctx->args.mmapped_addr 0x%08x\n",
jpeg_ctx->args.mmapped_addr); (unsigned int)jpeg_ctx->args.mmapped_addr);
#endif /* S5P_VMEM */ #endif /* S5P_VMEM */
return jpeg_ctx->jpeg_fd; return jpeg_ctx->jpeg_fd;
@ -165,12 +165,12 @@ int api_jpeg_encode_init()
return -1; return -1;
} }
ALOGV("api_jpeg_encode_init jpeg_ctx->args.mmapped_addr 0x%08x\n", ALOGV("api_jpeg_encode_init jpeg_ctx->args.mmapped_addr 0x%08x\n",
jpeg_ctx->args.mmapped_addr); (unsigned int)jpeg_ctx->args.mmapped_addr);
#endif /* S5P_VMEM */ #endif /* S5P_VMEM */
return jpeg_ctx->jpeg_fd; return jpeg_ctx->jpeg_fd;
} }
int api_jpeg_decode_deinit(int dev_fd) int api_jpeg_decode_deinit(int dev_fd __unused)
{ {
if (jpeg_ctx->args.mmapped_addr != NULL) if (jpeg_ctx->args.mmapped_addr != NULL)
munmap(jpeg_ctx->args.mmapped_addr, JPEG_TOTAL_BUF_SIZE); munmap(jpeg_ctx->args.mmapped_addr, JPEG_TOTAL_BUF_SIZE);
@ -191,7 +191,7 @@ int api_jpeg_decode_deinit(int dev_fd)
return JPEG_OK; return JPEG_OK;
} }
int api_jpeg_encode_deinit(int dev_fd) int api_jpeg_encode_deinit(int dev_fd __unused)
{ {
if (jpeg_ctx->args.mmapped_addr != NULL) if (jpeg_ctx->args.mmapped_addr != NULL)
munmap(jpeg_ctx->args.mmapped_addr, JPEG_TOTAL_BUF_SIZE); munmap(jpeg_ctx->args.mmapped_addr, JPEG_TOTAL_BUF_SIZE);
@ -211,7 +211,7 @@ int api_jpeg_encode_deinit(int dev_fd)
return JPEG_OK; return JPEG_OK;
} }
void *api_jpeg_get_decode_in_buf(int dev_fd, unsigned int size) void *api_jpeg_get_decode_in_buf(int dev_fd __unused, unsigned int size)
{ {
if (size < 0 || size > MAX_JPEG_RES) { if (size < 0 || size > MAX_JPEG_RES) {
ALOGE("Invalid decode input buffer size\r\n"); ALOGE("Invalid decode input buffer size\r\n");
@ -231,7 +231,7 @@ void *api_jpeg_get_decode_in_buf(int dev_fd, unsigned int size)
return (void *)(jpeg_ctx->args.in_buf); return (void *)(jpeg_ctx->args.in_buf);
} }
void *api_jpeg_get_encode_in_buf(int dev_fd, unsigned int size) void *api_jpeg_get_encode_in_buf(int dev_fd __unused, unsigned int size)
{ {
#ifdef S5P_VMEM #ifdef S5P_VMEM
jpeg_ctx->args.in_cookie = (unsigned int)ioctl(jpeg_ctx->jpeg_fd, jpeg_ctx->args.in_cookie = (unsigned int)ioctl(jpeg_ctx->jpeg_fd,
@ -247,12 +247,12 @@ void *api_jpeg_get_encode_in_buf(int dev_fd, unsigned int size)
#endif #endif
ALOGV("api_jpeg_get_encode_in_buf: 0x%x\n", ALOGV("api_jpeg_get_encode_in_buf: 0x%x\n",
jpeg_ctx->args.in_buf); (unsigned int)jpeg_ctx->args.in_buf);
return (void *)(jpeg_ctx->args.in_buf); return (void *)(jpeg_ctx->args.in_buf);
} }
void *api_jpeg_get_decode_out_buf(int dev_fd) void *api_jpeg_get_decode_out_buf(int dev_fd __unused)
{ {
#ifdef S5P_VMEM #ifdef S5P_VMEM
jpeg_ctx->args.out_cookie = (unsigned int)ioctl(jpeg_ctx->jpeg_fd, jpeg_ctx->args.out_cookie = (unsigned int)ioctl(jpeg_ctx->jpeg_fd,
@ -272,7 +272,7 @@ void *api_jpeg_get_decode_out_buf(int dev_fd)
return (void *)(jpeg_ctx->args.out_buf); return (void *)(jpeg_ctx->args.out_buf);
} }
void *api_jpeg_get_encode_out_buf(int dev_fd) void *api_jpeg_get_encode_out_buf(int dev_fd __unused)
{ {
#ifdef S5P_VMEM #ifdef S5P_VMEM
jpeg_ctx->args.out_cookie = (unsigned int)ioctl(jpeg_ctx->jpeg_fd, jpeg_ctx->args.out_cookie = (unsigned int)ioctl(jpeg_ctx->jpeg_fd,
@ -287,7 +287,7 @@ void *api_jpeg_get_encode_out_buf(int dev_fd)
#endif /* S5P_VMEM */ #endif /* S5P_VMEM */
ALOGV("api_jpeg_get_encode_out_buf: 0x%x\n", ALOGV("api_jpeg_get_encode_out_buf: 0x%x\n",
jpeg_ctx->args.out_buf); (unsigned int)jpeg_ctx->args.out_buf);
return (void *)(jpeg_ctx->args.out_buf); return (void *)(jpeg_ctx->args.out_buf);
} }
@ -304,7 +304,7 @@ void api_jpeg_set_encode_param(struct jpeg_enc_param *param)
ioctl(jpeg_ctx->jpeg_fd, IOCTL_SET_ENC_PARAM, jpeg_ctx->args.enc_param); ioctl(jpeg_ctx->jpeg_fd, IOCTL_SET_ENC_PARAM, jpeg_ctx->args.enc_param);
} }
enum jpeg_ret_type api_jpeg_decode_exe(int dev_fd, enum jpeg_ret_type api_jpeg_decode_exe(int dev_fd __unused,
struct jpeg_dec_param *dec_param) struct jpeg_dec_param *dec_param)
{ {
struct jpeg_args *arg; struct jpeg_args *arg;
@ -326,7 +326,7 @@ enum jpeg_ret_type api_jpeg_decode_exe(int dev_fd,
return JPEG_DECODE_OK; return JPEG_DECODE_OK;
} }
enum jpeg_ret_type api_jpeg_encode_exe(int dev_fd, enum jpeg_ret_type api_jpeg_encode_exe(int dev_fd __unused,
struct jpeg_enc_param *enc_param) struct jpeg_enc_param *enc_param)
{ {
struct jpeg_args *arg; struct jpeg_args *arg;

2
exynos4/interfaces/gralloc/Android.bp
View file

@ -27,7 +27,7 @@ cc_library_static {
defaults: ["hidl_defaults"], defaults: ["hidl_defaults"],
srcs: ["gralloc1-adapter.cpp", "Gralloc1On0Adapter.cpp"], srcs: ["gralloc1-adapter.cpp", "Gralloc1On0Adapter.cpp"],
include_dirs: ["system/core/libsync/include"], include_dirs: ["system/core/libsync/include"],
cflags: ["-Wall", "-Wextra"], cflags: ["-Wall", "-Wextra", "-Wno-error"],
export_include_dirs: ["."], export_include_dirs: ["."],
whole_static_libs: ["libgrallocusage"], whole_static_libs: ["libgrallocusage"],
} }

1
liblights/lights.c
View file

@ -178,7 +178,6 @@ static int write_leds(const struct led_config *led)
char blink[32]; char blink[32];
int count, err; int count, err;
int color;
if (led == NULL) if (led == NULL)
led = &led_off; led = &led_off;

2
ril/libril/Android.mk
View file

@ -29,7 +29,7 @@ LOCAL_SHARED_LIBRARIES := \
LOCAL_STATIC_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := \
libprotobuf-c-nano-enable_malloc \ libprotobuf-c-nano-enable_malloc \
LOCAL_CFLAGS += -Wno-unused-parameter LOCAL_CFLAGS += -Wno-unused-parameter -Wno-error
ifeq ($(SIM_COUNT), 2) ifeq ($(SIM_COUNT), 2)
LOCAL_CFLAGS += -DANDROID_MULTI_SIM -DDSDA_RILD1 LOCAL_CFLAGS += -DANDROID_MULTI_SIM -DDSDA_RILD1

4
ril/libril/ril_service.cpp
View file

@ -1428,7 +1428,6 @@ Return<void> RadioImpl::writeSmsToSim(int32_t serial, const SmsWriteArgs& smsWri
RIL_SMS_WriteArgs args; RIL_SMS_WriteArgs args;
args.status = (int) smsWriteArgs.status; args.status = (int) smsWriteArgs.status;
int len;
if (!copyHidlStringToRil(&args.pdu, smsWriteArgs.pdu, pRI)) { if (!copyHidlStringToRil(&args.pdu, smsWriteArgs.pdu, pRI)) {
return Void(); return Void();
} }
@ -2328,7 +2327,6 @@ Return<void> RadioImpl::requestIccSimAuthentication(int32_t serial, int32_t auth
pf.authContext = authContext; pf.authContext = authContext;
int len;
if (!copyHidlStringToRil(&pf.authData, authData, pRI)) { if (!copyHidlStringToRil(&pf.authData, authData, pRI)) {
return Void(); return Void();
} }
@ -4329,7 +4327,6 @@ int radio::getNetworkSelectionModeResponse(int slotId,
RadioResponseInfo responseInfo = {}; RadioResponseInfo responseInfo = {};
populateResponseInfo(responseInfo, serial, responseType, e); populateResponseInfo(responseInfo, serial, responseType, e);
bool manual = false; bool manual = false;
int serviceClass;
if (response == NULL || responseLen % sizeof(int) != 0) { if (response == NULL || responseLen % sizeof(int) != 0) {
RLOGE("getNetworkSelectionModeResponse Invalid response: NULL"); RLOGE("getNetworkSelectionModeResponse Invalid response: NULL");
if (e == RIL_E_SUCCESS) responseInfo.error = RadioError::INVALID_RESPONSE; if (e == RIL_E_SUCCESS) responseInfo.error = RadioError::INVALID_RESPONSE;
@ -4568,7 +4565,6 @@ int radio::getMuteResponse(int slotId,
RadioResponseInfo responseInfo = {}; RadioResponseInfo responseInfo = {};
populateResponseInfo(responseInfo, serial, responseType, e); populateResponseInfo(responseInfo, serial, responseType, e);
bool enable = false; bool enable = false;
int serviceClass;
if (response == NULL || responseLen % sizeof(int) != 0) { if (response == NULL || responseLen % sizeof(int) != 0) {
RLOGE("getMuteResponse Invalid response: NULL"); RLOGE("getMuteResponse Invalid response: NULL");
if (e == RIL_E_SUCCESS) responseInfo.error = RadioError::INVALID_RESPONSE; if (e == RIL_E_SUCCESS) responseInfo.error = RadioError::INVALID_RESPONSE;

2
ril/libsecril-client/Android.mk
View file

@ -14,7 +14,7 @@ LOCAL_SHARED_LIBRARIES := \
libhardware_legacy \ libhardware_legacy \
liblog liblog
LOCAL_CFLAGS := LOCAL_CFLAGS := -Wno-error
ifeq ($(TARGET_BOARD_PLATFORM),exynos4) ifeq ($(TARGET_BOARD_PLATFORM),exynos4)
LOCAL_CFLAGS += -DRIL_CALL_AUDIO_PATH_EXTRAVOLUME LOCAL_CFLAGS += -DRIL_CALL_AUDIO_PATH_EXTRAVOLUME