Ticket #2634: correct-fb_vesa_rm-warning.diff

File correct-fb_vesa_rm-warning.diff, 1.4 KB (added by Pavel Pisa, on 03/09/16 at 19:51:08)

Proposed solution to make GCC happy and made code readable better than worse

  • c/src/lib/libbsp/i386/pc386/console/fb_vesa_rm.c 

    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 b758564..fa41d01 100644
    a b static int32_t find_mode_using_EDID( Mode_params *mode_list, 
    499499        while (index < 8)
    500500        {
    501501            /* check if descriptor is unused */
    502             if (*(uint16_t*)&edid.STI[index] == EDID_STI_DescriptorUnused)
     502            if (edid1_STI_is_unused(&edid.STI[index]))
    503503            {
    504504                index++;
    505505                continue;

  • c/src/lib/libbsp/i386/pc386/include/edid.h 

    diff --git a/c/src/lib/libbsp/i386/pc386/include/edid.h b/c/src/lib/libbsp/i386/pc386/include/edid.h
index 1120296..45cc6e6 100644
    a b EDID_INLINE_ROUTINE uint16_t edid1_WhiteY (EDID_edid1 *edid) { 
    473473    return (edid->WhiteYHigh<<2) | (edid->WhiteBlueLow&0x3);
    474474}
    475475
     476EDID_INLINE_ROUTINE int edid1_STI_is_unused (
     477      const EDID_standard_timing_identification *edid_sti) {
     478    return (edid_sti->HorizontalActivePixels ==
     479                  (uint8_t)EDID_STI_DescriptorUnused) &&
     480           (edid_sti->ImageAspectRatio_RefreshRate ==
     481                  (uint8_t)(EDID_STI_DescriptorUnused >> 8));
     482}
     483
    476484enum edid1_established_timings {
    477485/*  Established Timings I */
    478486    EST_800x600_60Hz    = 0,