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

2008-11-08 Robert Millan <rmh@aybabtu.com>

Browse source 
* term/i386/pc/vesafb.c (grub_vesafb_term): Change type to
        `struct  grub_term_output'.  Remove `.checkkey' and `.getkey'
        members.  Update all users.
        * util/console.c (grub_ncurses_term): Split in ...
        (grub_ncurses_term_input): ... this, and ...
        (grub_ncurses_term_output): ... this.  Update all users.
This commit is contained in:
robertmh 2008-11-08 12:17:51 +00:00
parent 37c86336bf
commit 0025933a5e
3 changed files with 24 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2008-11-08 Robert Millan <rmh@aybabtu.com>
* term/i386/pc/vesafb.c (grub_vesafb_term): Change type to
`struct grub_term_output'. Remove `.checkkey' and `.getkey'
members. Update all users.
* util/console.c (grub_ncurses_term): Split in ...
(grub_ncurses_term_input): ... this, and ...
(grub_ncurses_term_output): ... this. Update all users.
2008-11-08 Robert Millan <rmh@aybabtu.com> 2008-11-08 Robert Millan <rmh@aybabtu.com>
* Makefile.in (PKGLIB): Add $(pkglib_BUILDDIR). * Makefile.in (PKGLIB): Add $(pkglib_BUILDDIR).

9
term/i386/pc/vesafb.c
View file

@ -578,15 +578,13 @@ grub_vesafb_setcursor (int on)
} }
} }
static struct grub_term grub_vesafb_term = static struct grub_term_output grub_vesafb_term =
{ {
.name = "vesafb", .name = "vesafb",
.init = grub_vesafb_mod_init, .init = grub_vesafb_mod_init,
.fini = grub_vesafb_mod_fini, .fini = grub_vesafb_mod_fini,
.putchar = grub_vesafb_putchar, .putchar = grub_vesafb_putchar,
.getcharwidth = grub_vesafb_getcharwidth, .getcharwidth = grub_vesafb_getcharwidth,
.checkkey = grub_console_checkkey,
.getkey = grub_console_getkey,
.getwh = grub_virtual_screen_getwh, .getwh = grub_virtual_screen_getwh,
.getxy = grub_virtual_screen_getxy, .getxy = grub_virtual_screen_getxy,
.gotoxy = grub_vesafb_gotoxy, .gotoxy = grub_vesafb_gotoxy,
@ -594,16 +592,15 @@ static struct grub_term grub_vesafb_term =
.setcolorstate = grub_virtual_screen_setcolorstate, .setcolorstate = grub_virtual_screen_setcolorstate,
.setcursor = grub_vesafb_setcursor, .setcursor = grub_vesafb_setcursor,
.flags = 0, .flags = 0,
.next = 0
}; };
GRUB_MOD_INIT(vesafb) GRUB_MOD_INIT(vesafb)
{ {
my_mod = mod; my_mod = mod;
grub_term_register (&grub_vesafb_term); grub_term_register_output (&grub_vesafb_term);
} }
GRUB_MOD_FINI(vesafb) GRUB_MOD_FINI(vesafb)
{ {
grub_term_unregister (&grub_vesafb_term); grub_term_unregister_output (&grub_vesafb_term);
} }

19
util/console.c
View file

@ -345,15 +345,20 @@ grub_ncurses_fini (void)
} }
static struct grub_term grub_ncurses_term = static struct grub_term_input grub_ncurses_term_input =
{
.name = "console",
.checkkey = grub_ncurses_checkkey,
.getkey = grub_ncurses_getkey,
};
static struct grub_term_output grub_ncurses_term_output =
{ {
.name = "console", .name = "console",
.init = grub_ncurses_init, .init = grub_ncurses_init,
.fini = grub_ncurses_fini, .fini = grub_ncurses_fini,
.putchar = grub_ncurses_putchar, .putchar = grub_ncurses_putchar,
.getcharwidth = grub_ncurses_getcharwidth, .getcharwidth = grub_ncurses_getcharwidth,
.checkkey = grub_ncurses_checkkey,
.getkey = grub_ncurses_getkey,
.getxy = grub_ncurses_getxy, .getxy = grub_ncurses_getxy,
.getwh = grub_ncurses_getwh, .getwh = grub_ncurses_getwh,
.gotoxy = grub_ncurses_gotoxy, .gotoxy = grub_ncurses_gotoxy,
@ -364,15 +369,15 @@ static struct grub_term grub_ncurses_term =
.setcursor = grub_ncurses_setcursor, .setcursor = grub_ncurses_setcursor,
.refresh = grub_ncurses_refresh, .refresh = grub_ncurses_refresh,
.flags = 0, .flags = 0,
.next = 0
}; };
void void
grub_console_init (void) grub_console_init (void)
{ {
grub_term_register (&grub_ncurses_term); grub_term_register_output (&grub_ncurses_term_output);
grub_term_set_current_input (&grub_ncurses_term); grub_term_register_input (&grub_ncurses_term_input);
grub_term_set_current_output (&grub_ncurses_term); grub_term_set_current_output (&grub_ncurses_term_output);
grub_term_set_current_input (&grub_ncurses_term_input);
} }
void void