tablet/grub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

powerpc: Drop Open Hack'Ware - remove GRUB_IEEE1275_FLAG_CANNOT_SET_COLORS

Browse Source 
Open Hack'Ware was the only user.

Signed-off-by: Daniel Axtens <dja@axtens.net>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Daniel Axtens 2021-09-06 15:46:13 +10:00 committed by Daniel Kiper
parent 333e63b356
commit fcf9ff2ac5
3 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
grub-core/term/ieee1275/console.c
View File

@ -171,6 +171,7 @@ static grub_err_t
grub_console_init_output (struct grub_term_output *term) grub_console_init_output (struct grub_term_output *term)
{ {
grub_ssize_t actual; grub_ssize_t actual;
unsigned int col;
/* The latest PowerMacs don't actually initialize the screen for us, so we /* The latest PowerMacs don't actually initialize the screen for us, so we
* use this trick to re-open the output device (but we avoid doing this on * use this trick to re-open the output device (but we avoid doing this on
@ -184,16 +185,12 @@ grub_console_init_output (struct grub_term_output *term)
return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "cannot find stdout"); return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "cannot find stdout");
/* Initialize colors. */ /* Initialize colors. */
if (! grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_CANNOT_SET_COLORS)) for (col = 0; col < ARRAY_SIZE (colors); col++)
{ grub_ieee1275_set_color (stdout_ihandle, col, colors[col].red,
unsigned col; colors[col].green, colors[col].blue);
for (col = 0; col < ARRAY_SIZE (colors); col++)
grub_ieee1275_set_color (stdout_ihandle, col, colors[col].red,
colors[col].green, colors[col].blue);
/* Set the right fg and bg colors. */ /* Set the right fg and bg colors. */
grub_terminfo_setcolorstate (term, GRUB_TERM_COLOR_NORMAL); grub_terminfo_setcolorstate (term, GRUB_TERM_COLOR_NORMAL);
}
grub_console_dimensions (); grub_console_dimensions ();

7
grub-core/video/ieee1275.c
View File

@ -93,10 +93,9 @@ grub_video_ieee1275_init (void)
grub_memset (&framebuffer, 0, sizeof(framebuffer)); grub_memset (&framebuffer, 0, sizeof(framebuffer));
if (! grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_CANNOT_SET_COLORS) if (!grub_ieee1275_get_integer_property (grub_ieee1275_chosen,
&& !grub_ieee1275_get_integer_property (grub_ieee1275_chosen, "stdout", &stdout_ihandle,
"stdout", &stdout_ihandle, sizeof (stdout_ihandle), &actual)
sizeof (stdout_ihandle), &actual)
&& actual == sizeof (stdout_ihandle)) && actual == sizeof (stdout_ihandle))
have_setcolors = 1; have_setcolors = 1;

3
include/grub/ieee1275/ieee1275.h
View File

@ -105,9 +105,6 @@ enum grub_ieee1275_flag
/* OLPC / XO firmware hangs when accessing USB devices. */ /* OLPC / XO firmware hangs when accessing USB devices. */
GRUB_IEEE1275_FLAG_OFDISK_SDCARD_ONLY, GRUB_IEEE1275_FLAG_OFDISK_SDCARD_ONLY,
/* Open Hack'Ware stops when trying to set colors */
GRUB_IEEE1275_FLAG_CANNOT_SET_COLORS,
/* Open Hack'Ware stops when grub_ieee1275_interpret is used. */ /* Open Hack'Ware stops when grub_ieee1275_interpret is used. */
GRUB_IEEE1275_FLAG_CANNOT_INTERPRET, GRUB_IEEE1275_FLAG_CANNOT_INTERPRET,