mirror of
https://git.savannah.gnu.org/git/grub.git
synced 2026-10-22 23:32:39 +00:00
merge mainline into backtrace
This commit is contained in:
Vladimir 'phcoder' Serbinenko committed
commit
245f4582f9
871 files changed
+102908
-16407
No files matched your search
@@ -20,37 +20,241 @@
|
||||
#include <grub/machine/console.h>
|
||||
#include <grub/term.h>
|
||||
#include <grub/types.h>
|
||||
#include <grub/machine/int.h>
|
||||
|
||||
static void
|
||||
int10_9 (grub_uint8_t ch, grub_uint16_t n)
|
||||
{
|
||||
struct grub_bios_int_registers regs;
|
||||
|
||||
regs.eax = ch | 0x0900;
|
||||
regs.ebx = grub_console_cur_color & 0xff;
|
||||
regs.ecx = n;
|
||||
regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT;
|
||||
grub_bios_interrupt (0x10, ®s);
|
||||
}
|
||||
|
||||
/*
|
||||
* BIOS call "INT 10H Function 03h" to get cursor position
|
||||
* Call with %ah = 0x03
|
||||
* %bh = page
|
||||
* Returns %ch = starting scan line
|
||||
* %cl = ending scan line
|
||||
* %dh = row (0 is top)
|
||||
* %dl = column (0 is left)
|
||||
*/
|
||||
|
||||
|
||||
static grub_uint16_t
|
||||
grub_console_getxy (struct grub_term_output *term __attribute__ ((unused)))
|
||||
{
|
||||
struct grub_bios_int_registers regs;
|
||||
|
||||
regs.eax = 0x0300;
|
||||
regs.ebx = 0;
|
||||
regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT;
|
||||
grub_bios_interrupt (0x10, ®s);
|
||||
|
||||
return ((regs.edx & 0xff) << 8) | ((regs.edx & 0xff00) >> 8);
|
||||
}
|
||||
|
||||
/*
|
||||
* BIOS call "INT 10H Function 02h" to set cursor position
|
||||
* Call with %ah = 0x02
|
||||
* %bh = page
|
||||
* %dh = row (0 is top)
|
||||
* %dl = column (0 is left)
|
||||
*/
|
||||
static void
|
||||
grub_console_gotoxy (struct grub_term_output *term __attribute__ ((unused)),
|
||||
grub_uint8_t x, grub_uint8_t y)
|
||||
{
|
||||
struct grub_bios_int_registers regs;
|
||||
|
||||
/* set page to 0 */
|
||||
regs.ebx = 0;
|
||||
regs.eax = 0x0200;
|
||||
regs.edx = (y << 8) | x;
|
||||
regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT;
|
||||
grub_bios_interrupt (0x10, ®s);
|
||||
}
|
||||
|
||||
/*
|
||||
*
|
||||
* Put the character C on the console. Because GRUB wants to write a
|
||||
* character with an attribute, this implementation is a bit tricky.
|
||||
* If C is a control character (CR, LF, BEL, BS), use INT 10, AH = 0Eh
|
||||
* (TELETYPE OUTPUT). Otherwise, save the original position, put a space,
|
||||
* save the current position, restore the original position, write the
|
||||
* character and the attribute, and restore the current position.
|
||||
*
|
||||
* The reason why this is so complicated is that there is no easy way to
|
||||
* get the height of the screen, and the TELETYPE OUTPUT BIOS call doesn't
|
||||
* support setting a background attribute.
|
||||
*/
|
||||
static void
|
||||
grub_console_putchar_real (grub_uint8_t c)
|
||||
{
|
||||
struct grub_bios_int_registers regs;
|
||||
grub_uint16_t pos;
|
||||
|
||||
if (c == 7 || c == 8 || c == 0xa || c == 0xd)
|
||||
{
|
||||
regs.eax = c | 0x0e00;
|
||||
regs.ebx = 0x0001;
|
||||
regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT;
|
||||
grub_bios_interrupt (0x10, ®s);
|
||||
return;
|
||||
}
|
||||
|
||||
/* get the current position */
|
||||
pos = grub_console_getxy (NULL);
|
||||
|
||||
/* check the column with the width */
|
||||
if ((pos & 0xff00) >= (79 << 8))
|
||||
{
|
||||
grub_console_putchar_real (0x0d);
|
||||
grub_console_putchar_real (0x0a);
|
||||
/* get the current position */
|
||||
pos = grub_console_getxy (NULL);
|
||||
}
|
||||
|
||||
/* write the character with the attribute */
|
||||
int10_9 (c, 1);
|
||||
|
||||
grub_console_gotoxy (NULL, ((pos & 0xff00) >> 8) + 1, (pos & 0xff));
|
||||
}
|
||||
|
||||
static void
|
||||
grub_console_putchar (struct grub_term_output *term __attribute__ ((unused)),
|
||||
const struct grub_unicode_glyph *c)
|
||||
{
|
||||
grub_console_putchar_real (c->base);
|
||||
}
|
||||
|
||||
/*
|
||||
* BIOS call "INT 10H Function 09h" to write character and attribute
|
||||
* Call with %ah = 0x09
|
||||
* %al = (character)
|
||||
* %bh = (page number)
|
||||
* %bl = (attribute)
|
||||
* %cx = (number of times)
|
||||
*/
|
||||
static void
|
||||
grub_console_cls (struct grub_term_output *term)
|
||||
{
|
||||
/* move the cursor to the beginning */
|
||||
grub_console_gotoxy (term, 0, 0);
|
||||
|
||||
/* write spaces to the entire screen */
|
||||
int10_9 (' ', 80 * 25);
|
||||
|
||||
/* move back the cursor */
|
||||
grub_console_gotoxy (term, 0, 0);
|
||||
}
|
||||
|
||||
/*
|
||||
* void grub_console_setcursor (int on)
|
||||
* BIOS call "INT 10H Function 01h" to set cursor type
|
||||
* Call with %ah = 0x01
|
||||
* %ch = cursor starting scanline
|
||||
* %cl = cursor ending scanline
|
||||
*/
|
||||
static void
|
||||
grub_console_setcursor (struct grub_term_output *term __attribute__ ((unused)),
|
||||
int on)
|
||||
{
|
||||
static grub_uint16_t console_cursor_shape = 0;
|
||||
struct grub_bios_int_registers regs;
|
||||
|
||||
/* check if the standard cursor shape has already been saved */
|
||||
if (!console_cursor_shape)
|
||||
{
|
||||
regs.eax = 0x0300;
|
||||
regs.ebx = 0;
|
||||
regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT;
|
||||
grub_bios_interrupt (0x10, ®s);
|
||||
console_cursor_shape = regs.ecx;
|
||||
if ((console_cursor_shape >> 8) >= (console_cursor_shape & 0xff))
|
||||
console_cursor_shape = 0x0d0e;
|
||||
}
|
||||
/* set %cx to the designated cursor shape */
|
||||
regs.ecx = on ? console_cursor_shape : 0x2000;
|
||||
regs.eax = 0x0100;
|
||||
regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT;
|
||||
grub_bios_interrupt (0x10, ®s);
|
||||
}
|
||||
|
||||
/*
|
||||
* if there is a character pending, return it; otherwise return -1
|
||||
* BIOS call "INT 16H Function 01H" to check whether a character is pending
|
||||
* Call with %ah = 0x1
|
||||
* Return:
|
||||
* If key waiting to be input:
|
||||
* %ah = keyboard scan code
|
||||
* %al = ASCII character
|
||||
* Zero flag = clear
|
||||
* else
|
||||
* Zero flag = set
|
||||
* BIOS call "INT 16H Function 00H" to read character from keyboard
|
||||
* Call with %ah = 0x0
|
||||
* Return: %ah = keyboard scan code
|
||||
* %al = ASCII character
|
||||
*/
|
||||
|
||||
static int
|
||||
grub_console_getkey (struct grub_term_input *term __attribute__ ((unused)))
|
||||
{
|
||||
const grub_uint16_t bypass_table[] = {
|
||||
0x0100 | '\e', 0x0f00 | '\t', 0x0e00 | '\b', 0x1c00 | '\r', 0x1c00 | '\n'
|
||||
};
|
||||
struct grub_bios_int_registers regs;
|
||||
unsigned i;
|
||||
|
||||
/*
|
||||
* Due to a bug in apple's bootcamp implementation, INT 16/AH = 0 would
|
||||
* cause the machine to hang at the second keystroke. However, we can
|
||||
* work around this problem by ensuring the presence of keystroke with
|
||||
* INT 16/AH = 1 before calling INT 16/AH = 0.
|
||||
*/
|
||||
|
||||
regs.eax = 0x0100;
|
||||
regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT;
|
||||
grub_bios_interrupt (0x16, ®s);
|
||||
if (regs.flags & GRUB_CPU_INT_FLAGS_ZERO)
|
||||
return GRUB_TERM_NO_KEY;
|
||||
|
||||
regs.eax = 0x0000;
|
||||
regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT;
|
||||
grub_bios_interrupt (0x16, ®s);
|
||||
if (!(regs.eax & 0xff))
|
||||
return ((regs.eax >> 8) & 0xff) | GRUB_TERM_EXTENDED;
|
||||
|
||||
if ((regs.eax & 0xff) >= ' ')
|
||||
return regs.eax & 0xff;
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE (bypass_table); i++)
|
||||
if (bypass_table[i] == (regs.eax & 0xffff))
|
||||
return regs.eax & 0xff;
|
||||
|
||||
return (regs.eax & 0xff) + (('a' - 1) | GRUB_TERM_CTRL);
|
||||
}
|
||||
|
||||
static const struct grub_machine_bios_data_area *bios_data_area =
|
||||
(struct grub_machine_bios_data_area *) GRUB_MEMORY_MACHINE_BIOS_DATA_AREA_ADDR;
|
||||
|
||||
#define KEYBOARD_LEFT_SHIFT (1 << 0)
|
||||
#define KEYBOARD_RIGHT_SHIFT (1 << 1)
|
||||
#define KEYBOARD_CTRL (1 << 2)
|
||||
#define KEYBOARD_ALT (1 << 3)
|
||||
|
||||
static int
|
||||
grub_console_getkeystatus (struct grub_term_input *term __attribute__ ((unused)))
|
||||
{
|
||||
grub_uint8_t status = bios_data_area->keyboard_flag_lower;
|
||||
int mods = 0;
|
||||
|
||||
if (status & (KEYBOARD_LEFT_SHIFT | KEYBOARD_RIGHT_SHIFT))
|
||||
mods |= GRUB_TERM_STATUS_SHIFT;
|
||||
if (status & KEYBOARD_CTRL)
|
||||
mods |= GRUB_TERM_STATUS_CTRL;
|
||||
if (status & KEYBOARD_ALT)
|
||||
mods |= GRUB_TERM_STATUS_ALT;
|
||||
|
||||
return mods;
|
||||
/* conveniently GRUB keystatus is modelled after BIOS one. */
|
||||
return bios_data_area->keyboard_flag_lower & ~0x80;
|
||||
}
|
||||
|
||||
static struct grub_term_input grub_console_term_input =
|
||||
{
|
||||
.name = "console",
|
||||
.checkkey = grub_console_checkkey,
|
||||
.getkey = grub_console_getkey,
|
||||
.getkeystatus = grub_console_getkeystatus,
|
||||
.getkeystatus = grub_console_getkeystatus
|
||||
};
|
||||
|
||||
static struct grub_term_output grub_console_term_output =
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
* GRUB -- GRand Unified Bootloader
|
||||
* Copyright (C) 2007, 2008 Free Software Foundation, Inc.
|
||||
* Copyright (C) 2007, 2008, 2010 Free Software Foundation, Inc.
|
||||
*
|
||||
* GRUB is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
@@ -18,27 +18,33 @@
|
||||
|
||||
#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>
|
||||
|
||||
GRUB_MOD_LICENSE ("GPLv3+");
|
||||
|
||||
#define COLS 80
|
||||
#define ROWS 25
|
||||
|
||||
static int grub_curr_x, grub_curr_y;
|
||||
|
||||
#define VGA_TEXT_SCREEN 0xb8000
|
||||
#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)
|
||||
{
|
||||
((short *) VGA_TEXT_SCREEN)[y * COLS + x] = c;
|
||||
VGA_TEXT_SCREEN[y * COLS + x] = c;
|
||||
}
|
||||
|
||||
static short
|
||||
screen_read_char (int x, int y)
|
||||
{
|
||||
return ((short *) VGA_TEXT_SCREEN)[y * COLS + x];
|
||||
return VGA_TEXT_SCREEN[y * COLS + x];
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -120,7 +126,7 @@ grub_vga_text_cls (struct grub_term_output *term)
|
||||
{
|
||||
int i;
|
||||
for (i = 0; i < ROWS * COLS; i++)
|
||||
((short *) VGA_TEXT_SCREEN)[i] = ' ' | (grub_console_cur_color << 8);
|
||||
VGA_TEXT_SCREEN[i] = ' ' | (grub_console_cur_color << 8);
|
||||
grub_vga_text_gotoxy (term, 0, 0);
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user