mirror of
https://git.savannah.gnu.org/git/grub.git
synced 2026-10-22 15:22:39 +00:00
merge mainline into net
This commit is contained in:
commit
d53bf34924
14 files changed
+264
-11
No files matched your search
@@ -18,7 +18,7 @@
|
||||
|
||||
#include <grub/dl.h>
|
||||
#include <grub/i386/vga_common.h>
|
||||
#include <grub/i386/io.h>
|
||||
#include <grub/cpu/io.h>
|
||||
#include <grub/types.h>
|
||||
#include <grub/vga.h>
|
||||
|
||||
@@ -29,7 +29,11 @@ GRUB_MOD_LICENSE ("GPLv3+");
|
||||
|
||||
static int grub_curr_x, grub_curr_y;
|
||||
|
||||
#ifdef __mips__
|
||||
#define VGA_TEXT_SCREEN ((grub_uint16_t *) 0xb00b8000)
|
||||
#else
|
||||
#define VGA_TEXT_SCREEN ((grub_uint16_t *) 0xb8000)
|
||||
#endif
|
||||
|
||||
static void
|
||||
screen_write_char (int x, int y, short c)
|
||||
|
||||
Reference in new issue
Block a user