vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2005-08-19 Yoshinori K. Okuji <okuji@enbug.org>

Browse source 
* DISTLIST: Replace commands/i386/pc/vbe_list_modes.c and
        commands/i386/pc/vbe_test.c with commands/i386/pc/vbeinfo.c and
        commands/i386/pc/vbetest.c.

        * video/i386/pc/vbe.c (grub_vbe_probe): If INFOBLOCK is not NULL,
        call grub_vbe_get_controller_info again, because the returned
        information is volatile.
        (grub_vbe_set_video_mode): Mostly rewritten.
        (grub_vbe_get_video_mode): Use grub_vbe_probe and use
        grub_vbe_status_t correctly.
        (grub_vbe_get_video_mode_info): Likewise.
        (grub_vbe_set_pixel_rgb): Use a switch statement rather than
        several if statements.

        * commands/i386/pc/vbe_list_modes.c: Renamed to ...
        * commands/i386/pc/vbeinfo.c: ... this.

        * commands/i386/pc/vbe_test.c: Renamed to ...
        * commands/i386/pc/vbetest.c: ... this.

        * commands/i386/pc/vbeinfo.c (grub_cmd_vbe_list_modes): Renamed to
        ...
        (grub_cmd_vbeinfo): ... this. Save video modes before
        iterating. Skip a video mode, if it is not available, not enough
        information is given or it is monochrome. Show the memory
        model. Leave the interpretation of MODEVAR to grub_strtoul
        completely.
        (GRUB_MOD_INIT): Rename vbe_list_modes to vbeinfo.
        (GRUB_MOD_FINI): Likewise.

        * commands/i386/pc/vbetest.c (grub_cmd_vbe_test): Renamed to ...
        (grub_cmd_vbetest): ... this. Don't print unnecessarily. Use
        grub_err_t instead of grub_uint32_t. Don't use SPTR. Remove a
        duplicated grub_env_get. Leave the interpretation of MODEVAR to
        grub_strtoul completely.
        (real2pm): Removed.
        (GRUB_MOD_INIT): Rename vbe_test to vbetest.
        (GRUB_MOD_FINI): Likewise.

        * normal/misc.c: Include grub/mm.h.

        * conf/i386-pc.rmk (pkgdata_MODULES): Replaced vbe_test.mod and
        vbe_list_modes with vbetest.mod and vbeinfo.mod.
        (vbe_list_modes_mod_SOURCES): Removed.
        (vbe_list_modes_mod_CFLAGS): Likewise.
        (vbe_test_mod_SOURCES): Likewise.
        (vbe_test_mod_CFLAGS): Likewise.
        (vbeinfo_mod_SOURCES): New variable.
        (vbeinfo_mod_CFLAGS): Likewise.
        (vbetest_mod_SOURCES): Likewise.
        (vbetest_mod_CFLAGS): Likewise.
This commit is contained in:
okuji 2005-08-19 00:32:01 +00:00
parent a7db563eb6
commit 1f0a95e481
9 changed files with 461 additions and 426 deletions
Download patch file Download diff file Expand all files Collapse all files

147
commands/i386/pc/vbe_list_modes.c
View file

@ -1,147 +0,0 @@
/* vbe_list_modes.c - command to list compatible VBE video modes. */
/*
* GRUB -- GRand Unified Bootloader
* Copyright (C) 2005 Free Software Foundation, Inc.
*
* GRUB is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with GRUB; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <grub/normal.h>
#include <grub/dl.h>
#include <grub/arg.h>
#include <grub/env.h>
#include <grub/misc.h>
#include <grub/machine/init.h>
#include <grub/machine/vbe.h>
static void *
real2pm(grub_vbe_farptr_t ptr)
{
return (void *)((((unsigned long)ptr & 0xFFFF0000) >> 12UL)
+ ((unsigned long)ptr & 0x0000FFFF));
}
static grub_err_t
grub_cmd_vbe_list_modes(struct grub_arg_list *state __attribute__ ((unused)),
int argc __attribute__ ((unused)),
char **args __attribute__ ((unused)))
{
struct grub_vbe_info_block controller_info;
struct grub_vbe_mode_info_block mode_info_tmp;
grub_uint32_t use_mode = GRUB_VBE_DEFAULT_VIDEO_MODE;
grub_uint16_t *sptr;
grub_uint32_t rc;
char *modevar;
grub_printf ("List of compatible video modes:\n");
rc = grub_vbe_probe (&controller_info);
if (rc != GRUB_ERR_NONE)
{
grub_printf ("VESA BIOS Extension not detected!\n");
return rc;
}
sptr = real2pm (controller_info.video_mode_ptr);
/* Walk thru all video modes listed. */
for (;*sptr != 0xFFFF; sptr++)
{
int valid_mode = 1;
rc = grub_vbe_get_video_mode_info (*sptr, &mode_info_tmp);
if (rc != GRUB_ERR_NONE) continue;
if ((mode_info_tmp.mode_attributes & 0x080) == 0)
{
/* We support only linear frame buffer modes. */
continue;
}
if ((mode_info_tmp.mode_attributes & 0x010) == 0)
{
/* We allow only graphical modes. */
continue;
}
switch(mode_info_tmp.memory_model)
{
case 0x04:
case 0x06:
break;
default:
valid_mode = 0;
break;
}
if (valid_mode == 0) continue;
grub_printf ("0x%03x: %d x %d x %d bpp\n",
*sptr,
mode_info_tmp.x_resolution,
mode_info_tmp.y_resolution,
mode_info_tmp.bits_per_pixel);
}
/* Check existence of vbe_mode environment variable. */
modevar = grub_env_get ("vbe_mode");
/* Check existence of vbe_mode environment variable. */
modevar = grub_env_get ("vbe_mode");
if (modevar != 0)
{
unsigned long value = 0;
if ((grub_strncmp (modevar, "0x", 2) == 0) ||
(grub_strncmp (modevar, "0X", 2) == 0))
{
/* Convert HEX mode number. */
value = grub_strtoul (modevar + 2, 0, 16);
}
else
{
/* Convert DEC mode number. */
value = grub_strtoul (modevar, 0, 10);
}
if (value != 0)
{
use_mode = value;
}
}
grub_printf ("Configured VBE mode (vbe_mode) = 0x%03x\n", use_mode);
return 0;
}
GRUB_MOD_INIT
{
(void)mod; /* To stop warning. */
grub_register_command ("vbe_list_modes",
grub_cmd_vbe_list_modes,
GRUB_COMMAND_FLAG_BOTH,
"vbe_list_modes",
"List compatible VESA BIOS extension video modes.",
0);
}
GRUB_MOD_FINI
{
grub_unregister_command ("vbe_list_modes");
}

163
commands/i386/pc/vbeinfo.c Normal file
View file

@ -0,0 +1,163 @@
/* vbeinfo.c - command to list compatible VBE video modes. */
/*
* GRUB -- GRand Unified Bootloader
* Copyright (C) 2005 Free Software Foundation, Inc.
*
* GRUB is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with GRUB; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <grub/normal.h>
#include <grub/dl.h>
#include <grub/arg.h>
#include <grub/env.h>
#include <grub/misc.h>
#include <grub/machine/init.h>
#include <grub/machine/vbe.h>
#include <grub/mm.h>
static void *
real2pm (grub_vbe_farptr_t ptr)
{
return (void *) ((((unsigned long) ptr & 0xFFFF0000) >> 12UL)
+ ((unsigned long) ptr & 0x0000FFFF));
}
static grub_err_t
grub_cmd_vbeinfo (struct grub_arg_list *state __attribute__ ((unused)),
int argc __attribute__ ((unused)),
char **args __attribute__ ((unused)))
{
struct grub_vbe_info_block controller_info;
struct grub_vbe_mode_info_block mode_info_tmp;
grub_uint32_t use_mode = GRUB_VBE_DEFAULT_VIDEO_MODE;
grub_uint16_t *video_mode_list;
grub_uint16_t *p;
grub_uint16_t *saved_video_mode_list;
grub_size_t video_mode_list_size;
grub_err_t err;
char *modevar;
grub_printf ("List of compatible video modes:\n");
err = grub_vbe_probe (&controller_info);
if (err != GRUB_ERR_NONE)
return err;
/* Because the information on video modes is stored in a temporary place,
it is better to copy it to somewhere safe. */
p = video_mode_list = real2pm (controller_info.video_mode_ptr);
while (*p++ != 0xFFFF)
;
video_mode_list_size = (grub_addr_t) p - (grub_addr_t) video_mode_list;
saved_video_mode_list = grub_malloc (video_mode_list_size);
if (! saved_video_mode_list)
return grub_errno;
grub_memcpy (saved_video_mode_list, video_mode_list, video_mode_list_size);
/* Walk through all video modes listed. */
for (p = saved_video_mode_list; *p != 0xFFFF; p++)
{
const char *memory_model = 0;
grub_uint32_t mode = (grub_uint32_t) *p;
err = grub_vbe_get_video_mode_info (mode, &mode_info_tmp);
if (err != GRUB_ERR_NONE)
{
grub_errno = GRUB_ERR_NONE;
continue;
}
if ((mode_info_tmp.mode_attributes & 0x001) == 0)
/* If not available, skip it. */
continue;
if ((mode_info_tmp.mode_attributes & 0x002) == 0)
/* Not enough information. */
continue;
if ((mode_info_tmp.mode_attributes & 0x008) == 0)
/* Monochrome is unusable. */
continue;
if ((mode_info_tmp.mode_attributes & 0x080) == 0)
/* We support only linear frame buffer modes. */
continue;
if ((mode_info_tmp.mode_attributes & 0x010) == 0)
/* We allow only graphical modes. */
continue;
switch (mode_info_tmp.memory_model)
{
case 0x04:
memory_model = "Packed Pixel";
break;
case 0x06:
memory_model = "Direct Color";
break;
default:
break;
}
if (! memory_model)
continue;
grub_printf ("0x%03x: %d x %d x %d bpp (%s)\n",
mode,
mode_info_tmp.x_resolution,
mode_info_tmp.y_resolution,
mode_info_tmp.bits_per_pixel,
memory_model);
}
grub_free (saved_video_mode_list);
/* Check existence of vbe_mode environment variable. */
modevar = grub_env_get ("vbe_mode");
if (modevar != 0)
{
unsigned long value;
value = grub_strtoul (modevar, 0, 0);
if (grub_errno == GRUB_ERR_NONE)
use_mode = value;
else
grub_errno = GRUB_ERR_NONE;
}
grub_printf ("Configured VBE mode (vbe_mode) = 0x%03x\n", use_mode);
return 0;
}
GRUB_MOD_INIT
{
(void) mod; /* To stop warning. */
grub_register_command ("vbeinfo",
grub_cmd_vbeinfo,
GRUB_COMMAND_FLAG_BOTH,
"vbeinfo",
"List compatible VESA BIOS extension video modes.",
0);
}
GRUB_MOD_FINI
{
grub_unregister_command ("vbeinfo");
}

87
commands/i386/pc/vbe_test.c → commands/i386/pc/vbetest.c
View file

@ -1,4 +1,4 @@
/* vbe_test.c - command to test VESA BIOS Extension 2.0+ support. */
/* vbetest.c - command to test VESA BIOS Extension 2.0+ support. */
/*
* GRUB -- GRand Unified Bootloader
* Copyright (C) 2005 Free Software Foundation, Inc.
@ -26,21 +26,14 @@
#include <grub/term.h>
#include <grub/machine/init.h>
#include <grub/machine/vbe.h>
static void *
real2pm(grub_vbe_farptr_t ptr)
{
return (void *)((((unsigned long)ptr & 0xFFFF0000) >> 12UL)
+ ((unsigned long)ptr & 0x0000FFFF));
}
#include <grub/err.h>
static grub_err_t
grub_cmd_vbe_test(struct grub_arg_list *state __attribute__ ((unused)),
grub_cmd_vbetest (struct grub_arg_list *state __attribute__ ((unused)),
int argc __attribute__ ((unused)),
char **args __attribute__ ((unused)))
{
grub_uint32_t rc;
grub_uint16_t *sptr;
grub_err_t err;
char *modevar;
struct grub_vbe_mode_info_block mode_info;
struct grub_vbe_info_block controller_info;
@ -54,12 +47,10 @@ grub_cmd_vbe_test(struct grub_arg_list *state __attribute__ ((unused)),
grub_printf ("Probing for VESA BIOS Extension ... ");
/* Check if VESA BIOS exists. */
rc = grub_vbe_probe(&controller_info);
if (rc != GRUB_ERR_NONE)
{
grub_printf ("not found!\n");
return rc;
}
err = grub_vbe_probe (&controller_info);
if (err != GRUB_ERR_NONE)
return err;
grub_printf ("found!\n");
/* Dump out controller information. */
@ -77,43 +68,31 @@ grub_cmd_vbe_test(struct grub_arg_list *state __attribute__ ((unused)),
grub_printf ("Total memory = %d\n",
controller_info.total_memory);
sptr = real2pm(controller_info.video_mode_ptr);
rc = grub_vbe_get_video_mode(&old_mode);
grub_printf ("Get video mode rc = %04x\n", rc);
if (rc == GRUB_ERR_NONE)
{
grub_printf ("Old video mode = %04x\n", old_mode);
}
err = grub_vbe_get_video_mode (&old_mode);
grub_printf ("Get video mode err = %04x\n", err);
if (err == GRUB_ERR_NONE)
grub_printf ("Old video mode = %04x\n", old_mode);
else
grub_errno = GRUB_ERR_NONE;
/* Check existence of vbe_mode environment variable. */
modevar = grub_env_get ("vbe_mode");
if (modevar != 0)
{
unsigned long value = 0;
unsigned long value;
if ((grub_strncmp (modevar, "0x", 2) == 0) ||
(grub_strncmp (modevar, "0X", 2) == 0))
{
/* Convert HEX mode number. */
value = grub_strtoul (modevar + 2, 0, 16);
}
value = grub_strtoul (modevar, 0, 0);
if (grub_errno == GRUB_ERR_NONE)
use_mode = value;
else
{
/* Convert DEC mode number. */
value = grub_strtoul (modevar, 0, 10);
}
if (value != 0)
{
use_mode = value;
}
grub_errno = GRUB_ERR_NONE;
}
rc = grub_vbe_get_video_mode_info (use_mode, &mode_info);
err = grub_vbe_get_video_mode_info (use_mode, &mode_info);
if (err != GRUB_ERR_NONE)
return err;
/* Dump out details about the mode being tested. */
grub_printf ("mode: 0x%03x\n",
use_mode);
@ -144,10 +123,12 @@ grub_cmd_vbe_test(struct grub_arg_list *state __attribute__ ((unused)),
grub_getkey ();
/* Setup GFX mode. */
rc = grub_vbe_set_video_mode (use_mode, &mode_info);
err = grub_vbe_set_video_mode (use_mode, &mode_info);
if (err != GRUB_ERR_NONE)
return err;
/* Determine framebuffer address and how many bytes are in scan line. */
framebuffer = (grub_uint8_t *)mode_info.phys_base_addr;
framebuffer = (grub_uint8_t *) mode_info.phys_base_addr;
ptr = framebuffer;
if (controller_info.version >= 0x300)
@ -179,21 +160,21 @@ grub_cmd_vbe_test(struct grub_arg_list *state __attribute__ ((unused)),
/* Restore old video mode. */
grub_vbe_set_video_mode (old_mode, 0);
return 0;
return grub_errno;
}
GRUB_MOD_INIT
{
(void)mod; /* To stop warning. */
grub_register_command ("vbe_test",
grub_cmd_vbe_test,
(void) mod; /* To stop warning. */
grub_register_command ("vbetest",
grub_cmd_vbetest,
GRUB_COMMAND_FLAG_BOTH,
"vbe_test",
"vbetest",
"Test VESA BIOS Extension 2.0+ support",
0);
}
GRUB_MOD_FINI
{
grub_unregister_command ("vbe_test");
grub_unregister_command ("vbetest");
}