diff options
| author | Per Persson <per.xb.persson@stericsson.com> | 2011-06-01 10:51:05 +0200 |
|---|---|---|
| committer | Jimmy RUBIN <jimmy.rubin@stericsson.com> | 2011-06-01 12:46:10 +0200 |
| commit | d0509803a9c1423042d19e7d28841d5edc40c678 (patch) | |
| tree | abcedae999a355734adf9cae9a768f7c225c5c1d /src/edid.c | |
| parent | f82701356e5cc01e2ad60b3059c3ea5ccecde3fe (diff) | |
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 <per.xb.persson@stericsson.com>
Change-Id: I83d0f1fb1b9dace539f851cc240e2da81bd14404
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24314
Reviewed-by: Per-Daniel OLSSON <per-daniel.olsson@stericsson.com>
Reviewed-by: Marcel TUNNISSEN <marcel.tuennissen@stericsson.com>
Reviewed-by: Jimmy RUBIN <jimmy.rubin@stericsson.com>
Diffstat (limited to 'src/edid.c')
| -rw-r--r-- | src/edid.c | 12 |
1 files changed, 9 insertions, 3 deletions
@@ -322,6 +322,7 @@ int edid_parse0(__u8 *data, __u8 *extension, struct video_format formats[], int edid_parse1(__u8 *data, struct video_format formats[], int nr_formats, int *basic_audio_support, struct edid_latency *edid_latency) { + __u8 tag; __u8 rev; __u8 offset; __u8 blockp; @@ -342,11 +343,16 @@ int edid_parse1(__u8 *data, struct video_format formats[], int nr_formats, __u8 edidp; __u8 *p; + tag = *(data + EDID_BL1_TAG_OFFSET); rev = *(data + EDID_BL1_REVNR_OFFSET); + if ((tag != EDID_BL1_TAG_EXPECTED) || rev != EDID_BL1_REV_EXPECTED) { + LOGHDMILIB("edid bl1 tag:%02x or rev:%02x invalid", tag, rev); + return EDIDREAD_BL1_TAG_REV_ERR; + } + offset = *(data + EDID_BL1_OFFSET_OFFSET); LOGHDMILIB("rev:%d offset:%d", rev, offset); - if ((rev != EDID_EXTVER_3) || (offset == 0) || (offset == EDID_NO_DATA)) { LOGHDMILIB("%s", "No video block"); @@ -403,7 +409,7 @@ int edid_parse1(__u8 *data, struct video_format formats[], int nr_formats, /* Video and Audio latency */ if ((length >= EDID_VSD_AUD_LAT) && (*(p + EDID_VSD_LATENCY_IND) & - EDID_VSD_LAT_FLD_MASK )) { + EDID_VSD_LAT_FLD_MASK)) { edid_latency->video_latency = 2 * (*(p + EDID_VSD_VID_LAT) - 1); edid_latency->audio_latency = @@ -413,7 +419,7 @@ int edid_parse1(__u8 *data, struct video_format formats[], int nr_formats, /* Interlaced Video and Audio latency */ if ((length >= EDID_VSD_INTLCD_AUD_LAT) && (*(p + EDID_VSD_LATENCY_IND) & - EDID_VSD_INTLCD_LAT_FLD_MASK )) { + EDID_VSD_INTLCD_LAT_FLD_MASK)) { edid_latency->intlcd_video_latency = 2 * (*(p + EDID_VSD_INTLCD_VID_LAT) - 1); edid_latency->audio_latency = |