From d0509803a9c1423042d19e7d28841d5edc40c678 Mon Sep 17 00:00:00 2001 From: Per Persson Date: Wed, 1 Jun 2011 10:51:05 +0200 Subject: HDMIservice: Improve error handling EDID block 1 error handling is improved. ST-Ericsson ID: 326691 ST-Ericsson FOSS-OUT ID: STETL-FOSS-OUT-10177 Signed-off-by: Per Persson Change-Id: I83d0f1fb1b9dace539f851cc240e2da81bd14404 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24314 Reviewed-by: Per-Daniel OLSSON Reviewed-by: Marcel TUNNISSEN Reviewed-by: Jimmy RUBIN --- include/hdmi_service_api.h | 2 +- include/hdmi_service_local.h | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/hdmi_service_api.h b/include/hdmi_service_api.h index 8133d33..53dd08b 100644 --- a/include/hdmi_service_api.h +++ b/include/hdmi_service_api.h @@ -16,7 +16,7 @@ extern "C" { * Set to 1 to stay alive when system suspends. * Set to 0 to sleep when system suspends. */ -#define HDMI_SERVICE_STAY_ALIVE_DURING_SUSPEND 1 +#define HDMI_SERVICE_STAY_ALIVE_DURING_SUSPEND 0 /* If defined, socket usage is hidden for messages from service, * and a callback function is used instead diff --git a/include/hdmi_service_local.h b/include/hdmi_service_local.h index 8e6afdb..d3ea3db 100644 --- a/include/hdmi_service_local.h +++ b/include/hdmi_service_local.h @@ -216,6 +216,7 @@ int hdmi_service_vesa_cea_prio_set(__u8 vesa_cea1, __u8 nr1, #define EDIDREAD_FAIL -3 #define EDIDREAD_NOEXT -4 #define EDIDREAD_NOVIDEO -5 +#define EDIDREAD_BL1_TAG_REV_ERR -6 #define HDCP_OK 0 #define AESKEYS_FAIL -1 #define HDCPSTATE_FAIL -2 @@ -230,6 +231,7 @@ int hdmi_service_vesa_cea_prio_set(__u8 vesa_cea1, __u8 nr1, #define EDID_BL0_ESTTIM1_OFFSET 0x23 #define EDID_BL0_ESTTIM2_OFFSET 0x24 #define EDID_BL0_STDTIM1_OFFSET 0x26 +#define EDID_BL1_TAG_OFFSET 0x00 #define EDID_BL1_REVNR_OFFSET 0x01 #define EDID_BL1_OFFSET_OFFSET 0x02 #define EDID_BL1_AUDIO_SUPPORT_OFFSET 0x03 @@ -242,6 +244,8 @@ int hdmi_service_vesa_cea_prio_set(__u8 vesa_cea1, __u8 nr1, #define EDID_BL1_STDTIM9_2_FLAG_OFFSET 0x5A #define EDID_BL1_STDTIM9_3_FLAG_OFFSET 0x6C #define EDID_BL1_STDTIM9_BYTE_START 5 +#define EDID_BL1_TAG_EXPECTED 0x02 +#define EDID_BL1_REV_EXPECTED 0x03 #define EDID_SVD_ID_MASK 0x7F #define EDID_EXTVER_3 0x03 #define EDID_NO_DATA 0x04 @@ -282,7 +286,8 @@ int hdmi_service_vesa_cea_prio_set(__u8 vesa_cea1, __u8 nr1, #define STARTUP_DELAY_US 6000000 #define HDCPAUTH_WAITTIME 1000000 #define LOADAES_WAITTIME 250000 -#define EDIDREAD_WAITTIME 2000000 +#define EDIDREAD_WAITTIME0 2000000 +#define EDIDREAD_WAITTIME1 100000 /* Socket listen thread */ #define SOCKET_DATA_MAX 256 -- cgit v1.2.3