exynos hal: jellybean compat
diff --git a/exynos5/hal/libhwcomposer/SecHWC.cpp b/exynos5/hal/libhwcomposer/SecHWC.cpp
index 31ea1b5..aa07972 100644
--- a/exynos5/hal/libhwcomposer/SecHWC.cpp
+++ b/exynos5/hal/libhwcomposer/SecHWC.cpp
@@ -73,7 +73,7 @@
/*****************************************************************************/
static void dump_layer(hwc_layer_t const* l) {
- LOGD("\ttype=%d, flags=%08x, handle=%p, tr=%02x, blend=%04x, "
+ ALOGD("\ttype=%d, flags=%08x, handle=%p, tr=%02x, blend=%04x, "
"{%d,%d,%d,%d}, {%d,%d,%d,%d}",
l->compositionType, l->flags, l->handle, l->transform, l->blending,
l->sourceCrop.left,
@@ -243,7 +243,7 @@
}
}
- SEC_HWC_Log(HWC_LOG_DEBUG,
+ SEC_HWC_Log(HWC_ALOG_DEBUG,
"crop information()::"
"sourceCrop left(%d),top(%d),right(%d),bottom(%d),"
"src_rect x(%d),y(%d),w(%d),h(%d),"
@@ -271,7 +271,7 @@
dst_rect->h = win->rect_info.h;
/* Summery */
- SEC_HWC_Log(HWC_LOG_DEBUG,
+ SEC_HWC_Log(HWC_ALOG_DEBUG,
"set_src_dst_img_rect()::"
"SRC w(%d),h(%d),f_w(%d),f_h(%d),fmt(0x%x),"
"base(0x%x),offset(%d),paddr(0x%X)=>\r\n"
@@ -294,7 +294,7 @@
static int get_hwc_compos_decision(hwc_layer_t* cur, int iter, int win_cnt)
{
if(cur->flags & HWC_SKIP_LAYER || !cur->handle) {
- SEC_HWC_Log(HWC_LOG_DEBUG, "%s::is_skip_layer %d cur->handle %x ",
+ SEC_HWC_Log(HWC_ALOG_DEBUG, "%s::is_skip_layer %d cur->handle %x ",
__func__, cur->flags & HWC_SKIP_LAYER, cur->handle);
return HWC_FRAMEBUFFER;
@@ -358,7 +358,7 @@
break;
}
- SEC_HWC_Log(HWC_LOG_DEBUG, "2nd iter###%s:: compositionType %d bpp %d"
+ SEC_HWC_Log(HWC_ALOG_DEBUG, "2nd iter###%s:: compositionType %d bpp %d"
" format %x src[%d %d %d %d] dst[%d %d %d %d] srcImg[%d %d]",
__func__, compositionType, prev_handle->bpp,
prev_handle->format,
@@ -370,7 +370,7 @@
}
#endif
- SEC_HWC_Log(HWC_LOG_DEBUG,
+ SEC_HWC_Log(HWC_ALOG_DEBUG,
"%s::compositionType(%d)=>0:FB,1:OVERLAY \r\n"
" format(0x%x),magic(0x%x),flags(%d),size(%d),offset(%d)"
"b_addr(0x%x),usage(%d),w(%d),h(%d),bpp(%d)",
@@ -405,7 +405,7 @@
win = &ctx->win[win_idx];
- SEC_HWC_Log(HWC_LOG_DEBUG,
+ SEC_HWC_Log(HWC_ALOG_DEBUG,
"%s:: left(%d),top(%d),right(%d),bottom(%d),transform(%d)"
"lcd_info.xres(%d),lcd_info.yres(%d)",
"++assign_overlay_window()",
@@ -423,7 +423,7 @@
win->rect_info.h = rect.h;
//turnoff the window and set the window position with new conf...
if (window_set_pos(win) < 0) {
- SEC_HWC_Log(HWC_LOG_ERROR, "%s::window_set_pos is failed : %s",
+ SEC_HWC_Log(HWC_ALOG_ERROR, "%s::window_set_pos is failed : %s",
__func__, strerror(errno));
ret = -1;
}
@@ -433,7 +433,7 @@
win->layer_index = layer_idx;
win->status = HWC_WIN_RESERVED;
- SEC_HWC_Log(HWC_LOG_DEBUG,
+ SEC_HWC_Log(HWC_ALOG_DEBUG,
"%s:: win_x %d win_y %d win_w %d win_h %d lay_idx %d win_idx %d\n",
"--assign_overlay_window()",
win->rect_info.x, win->rect_info.y, win->rect_info.w,
@@ -475,7 +475,7 @@
} else {
ret = assign_overlay_window(ctx, cur, overlay_win_cnt, i);
if (ret != 0) {
- LOGE("assign_overlay_window fail, change to frambuffer");
+ ALOGE("assign_overlay_window fail, change to frambuffer");
cur->compositionType = HWC_FRAMEBUFFER;
ctx->num_of_fb_layer++;
continue;
@@ -519,7 +519,7 @@
#endif
if (list->numHwLayers != (ctx->num_of_fb_layer + ctx->num_of_hwc_layer))
- SEC_HWC_Log(HWC_LOG_DEBUG,
+ SEC_HWC_Log(HWC_ALOG_DEBUG,
"%s:: numHwLayers %d num_of_fb_layer %d num_of_hwc_layer %d ",
__func__, list->numHwLayers, ctx->num_of_fb_layer,
ctx->num_of_hwc_layer);
@@ -580,7 +580,7 @@
* double buffered (2 or more) this buffer is already rendered.
* It is the redundant src buffer for FIMC rendering.
*/
- LOGD("SKIP FIMC rendering for Layer%d", win->layer_index);
+ ALOGD("SKIP FIMC rendering for Layer%d", win->layer_index);
#if defined(BOARD_USES_HDMI)
skip_hdmi_rendering = 1;
#endif
@@ -597,7 +597,7 @@
cur->transform);
if (ret < 0) {
- SEC_HWC_Log(HWC_LOG_ERROR, "%s::runFimc fail : ret=%d\n",
+ SEC_HWC_Log(HWC_ALOG_ERROR, "%s::runFimc fail : ret=%d\n",
__func__, ret);
skipped_window_mask |= (1 << i);
continue;
@@ -609,14 +609,14 @@
if (win->power_state == 0)
window_show(win);
} else {
- SEC_HWC_Log(HWC_LOG_ERROR,
+ SEC_HWC_Log(HWC_ALOG_ERROR,
"%s:: error : layer %d compositionType should have been"
" HWC_OVERLAY ", __func__, win->layer_index);
skipped_window_mask |= (1 << i);
continue;
}
} else {
- SEC_HWC_Log(HWC_LOG_ERROR, "%s:: error : window status should have "
+ SEC_HWC_Log(HWC_ALOG_ERROR, "%s:: error : window status should have "
"been HWC_WIN_RESERVED by now... ", __func__);
skipped_window_mask |= (1 << i);
continue;
@@ -634,7 +634,7 @@
ret = runG2d(ctx, &srcRect, &dstRect,
cur->transform);
if (ret < 0) {
- SEC_HWC_Log(HWC_LOG_ERROR, "%s::runG2d fail : ret=%d\n",
+ SEC_HWC_Log(HWC_ALOG_ERROR, "%s::runG2d fail : ret=%d\n",
__func__, ret);
skipped_window_mask |= (1 << (ctx->num_of_hwc_layer - 1));
goto g2d_error;
@@ -738,7 +738,7 @@
android::SecHdmiClient::HDMI_MODE_VIDEO,
ctx->num_of_hwc_layer);
} else {
- LOGE("%s: Unsupported format = %d", __func__, src_img.format);
+ ALOGE("%s: Unsupported format = %d", __func__, src_img.format);
}
}
#endif
@@ -752,18 +752,18 @@
int i;
if (ctx) {
if (destroyVideoDev(&ctx->fimc) < 0) {
- SEC_HWC_Log(HWC_LOG_ERROR, "%s::destroyVideoDev fail", __func__);
+ SEC_HWC_Log(HWC_ALOG_ERROR, "%s::destroyVideoDev fail", __func__);
ret = -1;
}
#ifdef SUB_TITLES_HWC
if (destroyG2d(&ctx->g2d) < 0) {
- SEC_HWC_Log(HWC_LOG_ERROR, "%s::destroyG2d() fail", __func__);
+ SEC_HWC_Log(HWC_ALOG_ERROR, "%s::destroyG2d() fail", __func__);
ret = -1;
}
#endif
for (i = 0; i < NUM_OF_WIN; i++) {
if (window_close(&ctx->win[i]) < 0)
- SEC_HWC_Log(HWC_LOG_DEBUG, "%s::window_close() fail", __func__);
+ SEC_HWC_Log(HWC_ALOG_DEBUG, "%s::window_close() fail", __func__);
}
free(ctx);
@@ -806,7 +806,7 @@
/* open WIN0 & WIN1 here */
for (int i = 0; i < NUM_OF_WIN; i++) {
if (window_open(&(dev->win[i]), i) < 0) {
- SEC_HWC_Log(HWC_LOG_ERROR,
+ SEC_HWC_Log(HWC_ALOG_ERROR,
"%s:: Failed to open window %d device ", __func__, i);
status = -EINVAL;
goto err;
@@ -814,7 +814,7 @@
}
if (window_get_global_lcd_info(dev->win[0].fd, &dev->lcd_info) < 0) {
- SEC_HWC_Log(HWC_LOG_ERROR,
+ SEC_HWC_Log(HWC_ALOG_ERROR,
"%s::window_get_global_lcd_info is failed : %s",
__func__, strerror(errno));
status = -EINVAL;
@@ -838,14 +838,14 @@
win->rect_info.h = win->var_info.yres;
if (window_set_pos(win) < 0) {
- SEC_HWC_Log(HWC_LOG_ERROR, "%s::window_set_pos is failed : %s",
+ SEC_HWC_Log(HWC_ALOG_ERROR, "%s::window_set_pos is failed : %s",
__func__, strerror(errno));
status = -EINVAL;
goto err;
}
if (window_get_info(win, i) < 0) {
- SEC_HWC_Log(HWC_LOG_ERROR, "%s::window_get_info is failed : %s",
+ SEC_HWC_Log(HWC_ALOG_ERROR, "%s::window_get_info is failed : %s",
__func__, strerror(errno));
status = -EINVAL;
goto err;
@@ -855,46 +855,46 @@
#ifdef USE_HW_PMEM
if (createPmem(&dev->sec_pmem, PMEM_SIZE) < 0) {
- SEC_HWC_Log(HWC_LOG_ERROR, "%s::initPmem(%d) fail", __func__, PMEM_SIZE);
+ SEC_HWC_Log(HWC_ALOG_ERROR, "%s::initPmem(%d) fail", __func__, PMEM_SIZE);
}
#endif
//create PP
if (createVideoDev(&dev->fimc) < 0) {
- SEC_HWC_Log(HWC_LOG_ERROR, "%s::creatFimc() fail", __func__);
+ SEC_HWC_Log(HWC_ALOG_ERROR, "%s::creatFimc() fail", __func__);
status = -EINVAL;
goto err;
}
#ifdef SUB_TITLES_HWC
if (createG2d(&dev->g2d) < 0) {
- SEC_HWC_Log(HWC_LOG_ERROR, "%s::createG2d() fail", __func__);
+ SEC_HWC_Log(HWC_ALOG_ERROR, "%s::createG2d() fail", __func__);
status = -EINVAL;
goto err;
}
#endif
- SEC_HWC_Log(HWC_LOG_DEBUG, "%s:: hwc_device_open: SUCCESS", __func__);
+ SEC_HWC_Log(HWC_ALOG_DEBUG, "%s:: hwc_device_open: SUCCESS", __func__);
return 0;
err:
if (destroyVideoDev(&dev->fimc) < 0)
- SEC_HWC_Log(HWC_LOG_ERROR, "%s::destroyVideoDev() fail", __func__);
+ SEC_HWC_Log(HWC_ALOG_ERROR, "%s::destroyVideoDev() fail", __func__);
#ifdef SUB_TITLES_HWC
if (destroyG2d(&dev->g2d) < 0)
- SEC_HWC_Log(HWC_LOG_ERROR, "%s::destroyG2d() fail", __func__);
+ SEC_HWC_Log(HWC_ALOG_ERROR, "%s::destroyG2d() fail", __func__);
#endif
if (destroyMem(&dev->s3c_mem) < 0)
- SEC_HWC_Log(HWC_LOG_ERROR, "%s::destroyMem() fail", __func__);
+ SEC_HWC_Log(HWC_ALOG_ERROR, "%s::destroyMem() fail", __func__);
#ifdef USE_HW_PMEM
if (destroyPmem(&dev->sec_pmem) < 0)
- SEC_HWC_Log(HWC_LOG_ERROR, "%s::destroyPmem() fail", __func__);
+ SEC_HWC_Log(HWC_ALOG_ERROR, "%s::destroyPmem() fail", __func__);
#endif
for (int i = 0; i < NUM_OF_WIN; i++) {
if (window_close(&dev->win[i]) < 0)
- SEC_HWC_Log(HWC_LOG_DEBUG, "%s::window_close() fail", __func__);
+ SEC_HWC_Log(HWC_ALOG_DEBUG, "%s::window_close() fail", __func__);
}
return status;