From 841edd3ea4ac000155bfcdbaf49f74427483c4f6 Mon Sep 17 00:00:00 2001 From: cjp Date: Fri, 31 Aug 2018 16:48:27 +0800 Subject: [PATCH] Android->camera:add sys.hdmiin.data to check hdmi if insert --- .../rockchip/camera/CameraHal/CameraIspAdapter.cpp | 1 + .../source/TC358749XBG_PARREL.c | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/hardware/rockchip/camera/CameraHal/CameraIspAdapter.cpp b/hardware/rockchip/camera/CameraHal/CameraIspAdapter.cpp index 4468c5c0c2..a0ae5b9656 100644 --- a/hardware/rockchip/camera/CameraHal/CameraIspAdapter.cpp +++ b/hardware/rockchip/camera/CameraHal/CameraIspAdapter.cpp @@ -218,6 +218,7 @@ int CameraIspAdapter::cameraDestroy() mHdmiinListenerThread->requestExitAndWait(); mHdmiinListenerThread.clear(); } + property_set("sys.hdmiin.data", "0"); osQueueDestroy(&mAfListenerQue.queue); } diff --git a/hardware/rockchip/camera/SiliconImage/isi/drv/TC358749XBG_MIPI_YUV/source/TC358749XBG_PARREL.c b/hardware/rockchip/camera/SiliconImage/isi/drv/TC358749XBG_MIPI_YUV/source/TC358749XBG_PARREL.c index bf02147712..f61bcc4d38 100644 --- a/hardware/rockchip/camera/SiliconImage/isi/drv/TC358749XBG_MIPI_YUV/source/TC358749XBG_PARREL.c +++ b/hardware/rockchip/camera/SiliconImage/isi/drv/TC358749XBG_MIPI_YUV/source/TC358749XBG_PARREL.c @@ -140,6 +140,7 @@ static RESULT TC358749XBG_HdmiInputCheckRegReadIss( IsiSensorHandle_t handle, int ret = 0; uint8_t p_value=0x00; uint8_t p_color=0x00; + uint8_t p_data=0x00; TRACE( TC358749XBG_INFO, "%s: -----hdmiin--- thread--------\n", __FUNCTION__ ); while(!bHdmiinExit){ @@ -156,6 +157,18 @@ static RESULT TC358749XBG_HdmiInputCheckRegReadIss( IsiSensorHandle_t handle, ret = IsiI2cReadSensorRegister( handle, 0x8528, &p_color, 1, BOOL_TRUE ); TRACE( TC358749XBG_DEBUG, "%s (exit: 0x8528 0x%08x)\n", __FUNCTION__, p_color); TRACE( TC358749XBG_DEBUG, "%s: -------- thread--------\n", __FUNCTION__ ); + + ret = IsiI2cReadSensorRegister( handle, 0x8520, &p_data, 1, BOOL_TRUE ); + if(p_data > 0 && ((p_data & 0x01) == 1)) + { + property_set("sys.hdmiin.data", "1"); + } + else + { + property_set("sys.hdmiin.data", "0"); + } + + TRACE( TC358749XBG_DEBUG, "%s (exit: 0x8520 0x%08x)\n", __FUNCTION__, p_data); osSleep( 2000 ); } return 0;