From 4234e13c3542ca769c21f6cde9207550bda0d8dd Mon Sep 17 00:00:00 2001 From: Joursoir Date: Tue, 10 May 2022 01:30:31 +0300 Subject: graphics: store color names --- UefiMonitorTest/Graphics.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'UefiMonitorTest/Graphics.c') diff --git a/UefiMonitorTest/Graphics.c b/UefiMonitorTest/Graphics.c index 592f674..a9c0290 100644 --- a/UefiMonitorTest/Graphics.c +++ b/UefiMonitorTest/Graphics.c @@ -24,23 +24,23 @@ CONST EFI_PIXEL_BITMASK mBgrPixelMasks = { 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000 }; -CONST GRAPHICS_PIXEL_COLOR gUmtColors[UMT_COLOR_END] = { - { 0x00, 0x00, 0x00, 0x00 }, - { 0xFF, 0xFF, 0xFF, 0x00 }, - { 0x00, 0x00, 0xFF, 0x00 }, - { 0x00, 0xFF, 0x00, 0x00 }, - { 0xFF, 0x00, 0x00, 0x00 }, - { 0x00, 0xFF, 0xFF, 0x00 }, - { 0xFF, 0xFF, 0x00, 0x00 }, - { 0xFF, 0x00, 0xFF, 0x00 }, - { 0xC0, 0xC0, 0xC0, 0x00 }, - { 0x80, 0x80, 0x80, 0x00 }, - { 0x00, 0x00, 0x80, 0x00 }, - { 0x00, 0x80, 0x80, 0x00 }, - { 0x00, 0x80, 0x00, 0x00 }, - { 0x80, 0x00, 0x80, 0x00 }, - { 0x80, 0x80, 0x00, 0x00 }, - { 0x80, 0x00, 0x00, 0x00 } +CONST UMT_COLORS gUmtColors[UMT_COLOR_END] = { + { STRING_TOKEN (STR_COLOR_BLACK), { 0x00, 0x00, 0x00, 0x00 } }, + { STRING_TOKEN (STR_COLOR_WHITE), { 0xFF, 0xFF, 0xFF, 0x00 } }, + { STRING_TOKEN (STR_COLOR_RED), { 0x00, 0x00, 0xFF, 0x00 } }, + { STRING_TOKEN (STR_COLOR_LIME), { 0x00, 0xFF, 0x00, 0x00 } }, + { STRING_TOKEN (STR_COLOR_BLUE), { 0xFF, 0x00, 0x00, 0x00 } }, + { STRING_TOKEN (STR_COLOR_YELLOW), { 0x00, 0xFF, 0xFF, 0x00 } }, + { STRING_TOKEN (STR_COLOR_AQUA), { 0xFF, 0xFF, 0x00, 0x00 } }, + { STRING_TOKEN (STR_COLOR_MAGENTA), { 0xFF, 0x00, 0xFF, 0x00 } }, + { STRING_TOKEN (STR_COLOR_SILVER), { 0xC0, 0xC0, 0xC0, 0x00 } }, + { STRING_TOKEN (STR_COLOR_GRAY), { 0x80, 0x80, 0x80, 0x00 } }, + { STRING_TOKEN (STR_COLOR_MAROON), { 0x00, 0x00, 0x80, 0x00 } }, + { STRING_TOKEN (STR_COLOR_OLIVE), { 0x00, 0x80, 0x80, 0x00 } }, + { STRING_TOKEN (STR_COLOR_GREEN), { 0x00, 0x80, 0x00, 0x00 } }, + { STRING_TOKEN (STR_COLOR_PURPLE), { 0x80, 0x00, 0x80, 0x00 } }, + { STRING_TOKEN (STR_COLOR_TEAL), { 0x80, 0x80, 0x00, 0x00 } }, + { STRING_TOKEN (STR_COLOR_NAVY), { 0x80, 0x00, 0x00, 0x00 } } }; STATIC -- cgit v1.2.3-18-g5258