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

2009-11-28 Vladimir Serbinenko <phcoder@gmail.com>

Browse source 
Rename efi_fb to efi_uga.

	* conf/i386-efi.rmk (pkglib_MODULES): Rename 'efi_fb.mod' to
	'efi_uga.mod'.
	(efi_fb_mod_SOURCES): Rename this ...
	(efi_uga_mod_SOURCES): ... to this.
	(efi_fb_mod_CFLAGS): Rename this ...
	(efi_uga_mod_CFLAGS): ... to this.
	(efi_fb_mod_LDFLAGS): Rename this ...
	(efi_uga_mod_LDFLAGS): ... to this.
	* conf/x86_64-efi.rmk (pkglib_MODULES): Rename 'efi_fb.mod' to
	'efi_uga.mod'.
	(efi_fb_mod_SOURCES): Rename this ...
	(efi_uga_mod_SOURCES): ... to this.
	(efi_fb_mod_CFLAGS): Rename this ...
	(efi_uga_mod_CFLAGS): ... to this.
	(efi_fb_mod_LDFLAGS): Rename this ...
	(efi_uga_mod_LDFLAGS): ... to this.
	* video/efi_fb.c: Move this ...
	* video/efi_uga.c: ... to this. Change prefix to 'grub_video_uga_'.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2009-11-28 00:13:51 +01:00
commit 8a4c48d86f
4 changed files with 47 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
ChangeLog
View file

@ -1,3 +1,26 @@
2009-11-28 Vladimir Serbinenko <phcoder@gmail.com>
Rename efi_fb to efi_uga.
* conf/i386-efi.rmk (pkglib_MODULES): Rename 'efi_fb.mod' to
'efi_uga.mod'.
(efi_fb_mod_SOURCES): Rename this ...
(efi_uga_mod_SOURCES): ... to this.
(efi_fb_mod_CFLAGS): Rename this ...
(efi_uga_mod_CFLAGS): ... to this.
(efi_fb_mod_LDFLAGS): Rename this ...
(efi_uga_mod_LDFLAGS): ... to this.
* conf/x86_64-efi.rmk (pkglib_MODULES): Rename 'efi_fb.mod' to
'efi_uga.mod'.
(efi_fb_mod_SOURCES): Rename this ...
(efi_uga_mod_SOURCES): ... to this.
(efi_fb_mod_CFLAGS): Rename this ...
(efi_uga_mod_CFLAGS): ... to this.
(efi_fb_mod_LDFLAGS): Rename this ...
(efi_uga_mod_LDFLAGS): ... to this.
* video/efi_fb.c: Move this ...
* video/efi_uga.c: ... to this. Change prefix to 'grub_video_uga_'.
2009-11-27 Robert Millan <rmh.grub@aybabtu.com> 2009-11-27 Robert Millan <rmh.grub@aybabtu.com>
* po/README: New file. Explain our PO file workflow. * po/README: New file. Explain our PO file workflow.

8
conf/i386-efi.rmk
View file

@ -143,10 +143,10 @@ fixvideo_mod_SOURCES = commands/efi/fixvideo.c
fixvideo_mod_CFLAGS = $(COMMON_CFLAGS) fixvideo_mod_CFLAGS = $(COMMON_CFLAGS)
fixvideo_mod_LDFLAGS = $(COMMON_LDFLAGS) fixvideo_mod_LDFLAGS = $(COMMON_LDFLAGS)
pkglib_MODULES += efi_fb.mod pkglib_MODULES += efi_uga.mod
efi_fb_mod_SOURCES = video/efi_fb.c efi_uga_mod_SOURCES = video/efi_uga.c
efi_fb_mod_CFLAGS = $(COMMON_CFLAGS) efi_uga_mod_CFLAGS = $(COMMON_CFLAGS)
efi_fb_mod_LDFLAGS = $(COMMON_LDFLAGS) efi_uga_mod_LDFLAGS = $(COMMON_LDFLAGS)
pkglib_MODULES += xnu.mod pkglib_MODULES += xnu.mod
xnu_mod_SOURCES = loader/xnu_resume.c loader/i386/xnu.c loader/i386/efi/xnu.c\ xnu_mod_SOURCES = loader/xnu_resume.c loader/i386/xnu.c loader/i386/efi/xnu.c\

8
conf/x86_64-efi.rmk
View file

@ -149,10 +149,10 @@ fixvideo_mod_SOURCES = commands/efi/fixvideo.c
fixvideo_mod_CFLAGS = $(COMMON_CFLAGS) fixvideo_mod_CFLAGS = $(COMMON_CFLAGS)
fixvideo_mod_LDFLAGS = $(COMMON_LDFLAGS) fixvideo_mod_LDFLAGS = $(COMMON_LDFLAGS)
pkglib_MODULES += efi_fb.mod pkglib_MODULES += efi_uga.mod
efi_fb_mod_SOURCES = video/efi_fb.c efi_uga_mod_SOURCES = video/efi_uga.c
efi_fb_mod_CFLAGS = $(COMMON_CFLAGS) efi_uga_mod_CFLAGS = $(COMMON_CFLAGS)
efi_fb_mod_LDFLAGS = $(COMMON_LDFLAGS) efi_uga_mod_LDFLAGS = $(COMMON_LDFLAGS)
pkglib_MODULES += xnu.mod pkglib_MODULES += xnu.mod
xnu_mod_SOURCES = loader/xnu_resume.c loader/i386/xnu.c loader/i386/efi/xnu.c\ xnu_mod_SOURCES = loader/xnu_resume.c loader/i386/xnu.c loader/i386/efi/xnu.c\

32
video/efi_fb.c → video/efi_uga.c
View file

@ -183,20 +183,20 @@ check_protocol (void)
} }
static grub_err_t static grub_err_t
grub_video_efi_init (void) grub_video_uga_init (void)
{ {
grub_memset (&framebuffer, 0, sizeof(framebuffer)); grub_memset (&framebuffer, 0, sizeof(framebuffer));
return grub_video_fb_init (); return grub_video_fb_init ();
} }
static grub_err_t static grub_err_t
grub_video_efi_fini (void) grub_video_uga_fini (void)
{ {
return grub_video_fb_fini (); return grub_video_fb_fini ();
} }
static grub_err_t static grub_err_t
grub_video_efi_setup (unsigned int width, unsigned int height, grub_video_uga_setup (unsigned int width, unsigned int height,
unsigned int mode_type) unsigned int mode_type)
{ {
unsigned int depth; unsigned int depth;
@ -269,14 +269,14 @@ grub_video_efi_setup (unsigned int width, unsigned int height,
} }
static grub_err_t static grub_err_t
grub_video_efi_swap_buffers (void) grub_video_uga_swap_buffers (void)
{ {
/* TODO: Implement buffer swapping. */ /* TODO: Implement buffer swapping. */
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
} }
static grub_err_t static grub_err_t
grub_video_efi_set_active_render_target (struct grub_video_render_target *target) grub_video_uga_set_active_render_target (struct grub_video_render_target *target)
{ {
if (target == GRUB_VIDEO_RENDER_TARGET_DISPLAY) if (target == GRUB_VIDEO_RENDER_TARGET_DISPLAY)
target = framebuffer.render_target; target = framebuffer.render_target;
@ -285,7 +285,7 @@ grub_video_efi_set_active_render_target (struct grub_video_render_target *target
} }
static grub_err_t static grub_err_t
grub_video_efi_get_info_and_fini (struct grub_video_mode_info *mode_info, grub_video_uga_get_info_and_fini (struct grub_video_mode_info *mode_info,
void **framebuf) void **framebuf)
{ {
grub_memcpy (mode_info, &(framebuffer.mode_info), sizeof (*mode_info)); grub_memcpy (mode_info, &(framebuffer.mode_info), sizeof (*mode_info));
@ -296,15 +296,15 @@ grub_video_efi_get_info_and_fini (struct grub_video_mode_info *mode_info,
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
} }
static struct grub_video_adapter grub_video_efi_adapter = static struct grub_video_adapter grub_video_uga_adapter =
{ {
.name = "EFI frame buffer driver", .name = "EFI UGA driver",
.init = grub_video_efi_init, .init = grub_video_uga_init,
.fini = grub_video_efi_fini, .fini = grub_video_uga_fini,
.setup = grub_video_efi_setup, .setup = grub_video_uga_setup,
.get_info = grub_video_fb_get_info, .get_info = grub_video_fb_get_info,
.get_info_and_fini = grub_video_efi_get_info_and_fini, .get_info_and_fini = grub_video_uga_get_info_and_fini,
.set_palette = grub_video_fb_set_palette, .set_palette = grub_video_fb_set_palette,
.get_palette = grub_video_fb_get_palette, .get_palette = grub_video_fb_get_palette,
.set_viewport = grub_video_fb_set_viewport, .set_viewport = grub_video_fb_set_viewport,
@ -317,21 +317,21 @@ static struct grub_video_adapter grub_video_efi_adapter =
.blit_bitmap = grub_video_fb_blit_bitmap, .blit_bitmap = grub_video_fb_blit_bitmap,
.blit_render_target = grub_video_fb_blit_render_target, .blit_render_target = grub_video_fb_blit_render_target,
.scroll = grub_video_fb_scroll, .scroll = grub_video_fb_scroll,
.swap_buffers = grub_video_efi_swap_buffers, .swap_buffers = grub_video_uga_swap_buffers,
.create_render_target = grub_video_fb_create_render_target, .create_render_target = grub_video_fb_create_render_target,
.delete_render_target = grub_video_fb_delete_render_target, .delete_render_target = grub_video_fb_delete_render_target,
.set_active_render_target = grub_video_efi_set_active_render_target, .set_active_render_target = grub_video_uga_set_active_render_target,
.get_active_render_target = grub_video_fb_get_active_render_target, .get_active_render_target = grub_video_fb_get_active_render_target,
}; };
GRUB_MOD_INIT(efi_fb) GRUB_MOD_INIT(efi_fb)
{ {
if (check_protocol ()) if (check_protocol ())
grub_video_register (&grub_video_efi_adapter); grub_video_register (&grub_video_uga_adapter);
} }
GRUB_MOD_FINI(efi_fb) GRUB_MOD_FINI(efi_fb)
{ {
if (uga) if (uga)
grub_video_unregister (&grub_video_efi_adapter); grub_video_unregister (&grub_video_uga_adapter);
} }