diff options
author | Pavel Pisa <ppisa@pikron.com> | 2016-04-16 15:01:47 +0200 |
---|---|---|
committer | Pavel Pisa <ppisa@pikron.com> | 2016-04-16 15:01:47 +0200 |
commit | b752f9454fd412b0c4e3b15ee853afd4870ccc54 (patch) | |
tree | 5b83b8af3cf4729e8eae7a4a302710f1180ed7d2 /c/src/lib/libbsp/i386/pc386 | |
parent | Obsolete rtems_clock_get() directive. (diff) | |
download | rtems-b752f9454fd412b0c4e3b15ee853afd4870ccc54.tar.bz2 |
i386/pc386: reimplemented check for unused EDID entry in fb_vesa.c to suppress GCC 6 warning.
closes #2634
Diffstat (limited to '')
-rw-r--r-- | c/src/lib/libbsp/i386/pc386/console/fb_vesa_rm.c | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/pc386/include/edid.h | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/c/src/lib/libbsp/i386/pc386/console/fb_vesa_rm.c b/c/src/lib/libbsp/i386/pc386/console/fb_vesa_rm.c index b758564df1..fa41d01570 100644 --- a/c/src/lib/libbsp/i386/pc386/console/fb_vesa_rm.c +++ b/c/src/lib/libbsp/i386/pc386/console/fb_vesa_rm.c @@ -499,7 +499,7 @@ static int32_t find_mode_using_EDID( Mode_params *mode_list, while (index < 8) { /* check if descriptor is unused */ - if (*(uint16_t*)&edid.STI[index] == EDID_STI_DescriptorUnused) + if (edid1_STI_is_unused(&edid.STI[index])) { index++; continue; diff --git a/c/src/lib/libbsp/i386/pc386/include/edid.h b/c/src/lib/libbsp/i386/pc386/include/edid.h index b8c00b1461..836294dcad 100644 --- a/c/src/lib/libbsp/i386/pc386/include/edid.h +++ b/c/src/lib/libbsp/i386/pc386/include/edid.h @@ -473,6 +473,14 @@ EDID_INLINE_ROUTINE uint16_t edid1_WhiteY (EDID_edid1 *edid) { return (edid->WhiteYHigh<<2) | (edid->WhiteBlueLow&0x3); } +EDID_INLINE_ROUTINE int edid1_STI_is_unused ( + const EDID_standard_timing_identification *edid_sti) { + return (edid_sti->HorizontalActivePixels == + (uint8_t)EDID_STI_DescriptorUnused) && + (edid_sti->ImageAspectRatio_RefreshRate == + (uint8_t)(EDID_STI_DescriptorUnused >> 8)); +} + enum edid1_established_timings { /* Established Timings I */ EST_800x600_60Hz = 0, |