diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/edid.h | 22 | ||||
| -rw-r--r-- | src/include/vbe.h | 2 |
2 files changed, 22 insertions, 2 deletions
diff --git a/src/include/edid.h b/src/include/edid.h index 4a2f13858b..867a82ff28 100644 --- a/src/include/edid.h +++ b/src/include/edid.h @@ -35,7 +35,27 @@ struct edid { unsigned int version[2]; unsigned int nonconformant; unsigned int type; - unsigned int bpp; + /* These next three things used to all be called bpp. + * Merriment ensued. The identifier + * 'bpp' is herewith banished from our + * Kingdom. + */ + /* How many bits in the framebuffer per pixel. + * Under all reasonable circumstances, it's 32. + */ + unsigned int framebuffer_bits_per_pixel; + /* On the panel, how many bits per color? + * In almost all cases, it's 6 or 8. + * The standard allows for much more! + */ + unsigned int panel_bits_per_color; + /* On the panel, how many bits per pixel. + * On Planet Earth, there are three colors + * per pixel, but this is convenient to have here + * instead of having 3*panel_bits_per_color + * all over the place. + */ + unsigned int panel_bits_per_pixel; unsigned int xres; unsigned int yres; unsigned int voltage; diff --git a/src/include/vbe.h b/src/include/vbe.h index 8ad9d2eb31..009dabd531 100644 --- a/src/include/vbe.h +++ b/src/include/vbe.h @@ -20,7 +20,7 @@ typedef struct { u16 screen_width; u16 screen_height; u16 screen_linebytes; // bytes per line in framebuffer, may be more than screen_width - u8 color_depth; // color depth in bpp + u8 color_depth; // color depth in bits per pixel u32 framebuffer_address; u8 edid_block_zero[128]; } __attribute__ ((__packed__)) screen_info_t; |