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

2010-01-15 Vladimir Serbinenko <phcoder@gmail.com>

Browse source 
Video driver ids.

	* include/grub/video.h (grub_video_driver_id): New type.
	(grub_video_adapter): New member 'id'. All users updated.
	(grub_video_get_driver_id): New proto.
	* video/video.c (grub_video_get_driver_id): New function.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-01-15 16:11:18 +01:00
parent 5c71db1b9b
commit 0d90e8a6fb
6 changed files with 32 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2010-01-15 Vladimir Serbinenko <phcoder@gmail.com>
Video driver ids.
* include/grub/video.h (grub_video_driver_id): New type.
(grub_video_adapter): New member 'id'. All users updated.
(grub_video_get_driver_id): New proto.
* video/video.c (grub_video_get_driver_id): New function.
2010-01-14 Carles Pina i Estany <carles@pina.cat> 2010-01-14 Carles Pina i Estany <carles@pina.cat>
* util/grub.d/30_os-prober.in: Use `set var=val' rather than plain * util/grub.d/30_os-prober.in: Use `set var=val' rather than plain

12
include/grub/video.h
View file

@ -159,10 +159,19 @@ struct grub_video_palette_data
grub_uint8_t a; /* Reserved bits value (0-255). */ grub_uint8_t a; /* Reserved bits value (0-255). */
}; };
typedef enum grub_video_driver_id
{
GRUB_VIDEO_DRIVER_NONE,
GRUB_VIDEO_DRIVER_VBE,
GRUB_VIDEO_DRIVER_EFI_UGA,
GRUB_VIDEO_DRIVER_EFI_GOP
} grub_video_driver_id_t;
struct grub_video_adapter struct grub_video_adapter
{ {
/* The video adapter name. */ /* The video adapter name. */
const char *name; const char *name;
grub_video_driver_id_t id;
/* Initialize the video adapter. */ /* Initialize the video adapter. */
grub_err_t (*init) (void); grub_err_t (*init) (void);
@ -310,4 +319,7 @@ grub_err_t grub_video_set_mode (const char *modestring,
int NESTED_FUNC_ATTR (*hook) (grub_video_adapter_t p, int NESTED_FUNC_ATTR (*hook) (grub_video_adapter_t p,
struct grub_video_mode_info *mode_info)); struct grub_video_mode_info *mode_info));
grub_video_driver_id_t
grub_video_get_driver_id (void);
#endif /* ! GRUB_VIDEO_HEADER */ #endif /* ! GRUB_VIDEO_HEADER */

1
video/efi_gop.c
View file

@ -353,6 +353,7 @@ grub_video_gop_get_info_and_fini (struct grub_video_mode_info *mode_info,
static struct grub_video_adapter grub_video_gop_adapter = static struct grub_video_adapter grub_video_gop_adapter =
{ {
.name = "EFI GOP driver", .name = "EFI GOP driver",
.id = GRUB_VIDEO_DRIVER_EFI_GOP,
.init = grub_video_gop_init, .init = grub_video_gop_init,
.fini = grub_video_gop_fini, .fini = grub_video_gop_fini,

1
video/efi_uga.c
View file

@ -300,6 +300,7 @@ grub_video_uga_get_info_and_fini (struct grub_video_mode_info *mode_info,
static struct grub_video_adapter grub_video_uga_adapter = static struct grub_video_adapter grub_video_uga_adapter =
{ {
.name = "EFI UGA driver", .name = "EFI UGA driver",
.id = GRUB_VIDEO_DRIVER_EFI_UGA,
.init = grub_video_uga_init, .init = grub_video_uga_init,
.fini = grub_video_uga_fini, .fini = grub_video_uga_fini,

1
video/i386/pc/vbe.c
View file

@ -557,6 +557,7 @@ grub_video_vbe_get_info_and_fini (struct grub_video_mode_info *mode_info,
static struct grub_video_adapter grub_video_vbe_adapter = static struct grub_video_adapter grub_video_vbe_adapter =
{ {
.name = "VESA BIOS Extension Video Driver", .name = "VESA BIOS Extension Video Driver",
.id = GRUB_VIDEO_DRIVER_VBE,
.init = grub_video_vbe_init, .init = grub_video_vbe_init,
.fini = grub_video_vbe_fini, .fini = grub_video_vbe_fini,

8
video/video.c
View file

@ -93,6 +93,14 @@ grub_video_get_info (struct grub_video_mode_info *mode_info)
return grub_video_adapter_active->get_info (mode_info); return grub_video_adapter_active->get_info (mode_info);
} }
grub_video_driver_id_t
grub_video_get_driver_id (void)
{
if (! grub_video_adapter_active)
return GRUB_VIDEO_DRIVER_NONE;
return grub_video_adapter_active->id;
}
/* Get information about active video mode. */ /* Get information about active video mode. */
grub_err_t grub_err_t
grub_video_get_info_and_fini (struct grub_video_mode_info *mode_info, grub_video_get_info_and_fini (struct grub_video_mode_info *mode_info,