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

merge trunk

Browse source
This commit is contained in:
Colin Watson 2011-01-07 17:26:15 +00:00
commit b7d86d53c4
12 changed files with 108 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/grub/i386/linux.h
View file

@ -68,7 +68,7 @@
#define GRUB_E820_RESERVED 2
#define GRUB_E820_ACPI 3
#define GRUB_E820_NVS 4
#define GRUB_E820_EXEC_CODE 5
#define GRUB_E820_BADRAM 5
#define GRUB_E820_MAX_ENTRY 128

1
include/grub/terminfo.h
View file

@ -56,6 +56,7 @@ struct grub_terminfo_output_state
void (*put) (struct grub_term_output *term, const int c);
};
grub_err_t EXPORT_FUNC(grub_terminfo_output_init) (struct grub_term_output *term);
void EXPORT_FUNC(grub_terminfo_gotoxy) (grub_term_output_t term,
grub_uint8_t x, grub_uint8_t y);
void EXPORT_FUNC(grub_terminfo_cls) (grub_term_output_t term);