* grub-core/kern/emu/console.c: Move to ...

* grub-core/term/emu/console.c: ...here.
	(grub_ncurses_getkey): Fix return value if no key is detected.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-18 19:51:43 +01:00
parent e51b56667a
commit b500bcfeed
3 changed files with 8 additions and 2 deletions

View file

@ -1,3 +1,9 @@
2012-02-18 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/kern/emu/console.c: Move to ...
* grub-core/term/emu/console.c: ...here.
(grub_ncurses_getkey): Fix return value if no key is detected.
2012-02-12 Vladimir Serbinenko <phcoder@gmail.com> 2012-02-12 Vladimir Serbinenko <phcoder@gmail.com>
* include/grub/test.h (grub_unit_test_init): Add missing prototype. * include/grub/test.h (grub_unit_test_init): Add missing prototype.

View file

@ -207,7 +207,6 @@ kernel = {
emu = gnulib/progname.c; emu = gnulib/progname.c;
emu = gnulib/error.c; emu = gnulib/error.c;
emu = kern/emu/cache_s.S; emu = kern/emu/cache_s.S;
emu = kern/emu/console.c;
emu = kern/emu/hostdisk.c; emu = kern/emu/hostdisk.c;
emu = kern/emu/hostfs.c; emu = kern/emu/hostfs.c;
emu = kern/emu/main.c; emu = kern/emu/main.c;
@ -215,6 +214,7 @@ kernel = {
emu = kern/emu/mm.c; emu = kern/emu/mm.c;
emu = kern/emu/time.c; emu = kern/emu/time.c;
emu = kern/emu/cache.c; emu = kern/emu/cache.c;
emu = term/emu/console.c;
videoinkernel = term/gfxterm.c; videoinkernel = term/gfxterm.c;
videoinkernel = font/font.c; videoinkernel = font/font.c;

View file

@ -116,7 +116,7 @@ grub_ncurses_getkey (struct grub_term_input *term __attribute__ ((unused)))
switch (c) switch (c)
{ {
case ERR: case ERR:
return -1; return GRUB_TERM_NO_KEY;
case KEY_LEFT: case KEY_LEFT:
c = GRUB_TERM_KEY_LEFT; c = GRUB_TERM_KEY_LEFT;
break; break;