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

Fix build problems on i386-ieee1275 and *-efi (introduced by vga_text
        split).

        * include/grub/i386/pc/console.h: Include `<grub/i386/vga_common.h>'.
        (grub_console_cur_color, grub_console_real_putchar)
        (grub_console_putchar, grub_console_getcharwidth, grub_console_getwh)
        (grub_console_setcolorstate, grub_console_setcolor)
        (grub_console_getcolor): Move from here ...
        * include/grub/i386/vga_common.h: ... to here (new file).

        * term/i386/pc/vga_text.c: Replace `<grub/machine/console.h>' with
        `<grub/i386/vga_common.h>' and `<grub/cpu/io.h>' with
        `<grub/i386/io.h>'.
        * term/i386/vga_common.c: Replace `<grub/machine/console.h>' with
        `<grub/i386/vga_common.h>'.
This commit is contained in:
robertmh 2008-11-12 17:43:39 +00:00
parent 76679cd3a4
commit 976b07d044
6 changed files with 63 additions and 13 deletions

View file

@ -17,8 +17,8 @@
*/
#include <grub/dl.h>
#include <grub/machine/console.h>
#include <grub/cpu/io.h>
#include <grub/i386/vga_common.h>
#include <grub/i386/io.h>
#include <grub/types.h>
#define COLS 80

View file

@ -16,7 +16,7 @@
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
*/
#include <grub/machine/console.h>
#include <grub/i386/vga_common.h>
#include <grub/term.h>
#include <grub/types.h>