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

coreboot: Changed cbmemc to support updated console format from coreboot.

Browse source
This commit is contained in:
Julius Werner 2017-05-09 09:03:02 +02:00 committed by Vincent Batts
parent 4ff15188e3
commit 4ffbbeca95
1 changed files with 35 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
grub-core/term/i386/coreboot/cbmemc.c
View file

@ -29,11 +29,14 @@
GRUB_MOD_LICENSE ("GPLv3+"); GRUB_MOD_LICENSE ("GPLv3+");
#define CURSOR_MASK ((1 << 28) - 1)
#define OVERFLOW (1 << 31)
struct grub_linuxbios_cbmemc struct grub_linuxbios_cbmemc
{ {
grub_uint32_t size; grub_uint32_t size;
grub_uint32_t pointer; grub_uint32_t cursor;
char data[0]; char body[0];
}; };
static struct grub_linuxbios_cbmemc *cbmemc; static struct grub_linuxbios_cbmemc *cbmemc;
@ -41,11 +44,20 @@ static struct grub_linuxbios_cbmemc *cbmemc;
static void static void
put (struct grub_term_output *term __attribute__ ((unused)), const int c) put (struct grub_term_output *term __attribute__ ((unused)), const int c)
{ {
grub_uint32_t flags, cursor;
if (!cbmemc) if (!cbmemc)
return; return;
if (cbmemc->pointer < cbmemc->size) flags = cbmemc->cursor & ~CURSOR_MASK;
cbmemc->data[cbmemc->pointer] = c; cursor = cbmemc->cursor & CURSOR_MASK;
cbmemc->pointer++; if (cursor >= cbmemc->size)
return;
cbmemc->body[cursor++] = c;
if (cursor >= cbmemc->size)
{
cursor = 0;
flags |= OVERFLOW;
}
cbmemc->cursor = flags | cursor;
} }
struct grub_terminfo_output_state grub_cbmemc_terminfo_output = struct grub_terminfo_output_state grub_cbmemc_terminfo_output =
@ -87,21 +99,29 @@ grub_cmd_cbmemc (struct grub_command *cmd __attribute__ ((unused)),
int argc __attribute__ ((unused)), int argc __attribute__ ((unused)),
char *argv[] __attribute__ ((unused))) char *argv[] __attribute__ ((unused)))
{ {
grub_size_t len; grub_size_t size, cursor;
char *str; struct grub_linuxbios_cbmemc *real_cbmemc;
struct grub_linuxbios_cbmemc *cbmemc_saved;
if (!cbmemc) if (!cbmemc)
return grub_error (GRUB_ERR_IO, "no CBMEM console found"); return grub_error (GRUB_ERR_IO, "no CBMEM console found");
len = cbmemc->pointer; real_cbmemc = cbmemc;
if (len > cbmemc->size)
len = cbmemc->size;
str = cbmemc->data;
cbmemc_saved = cbmemc;
cbmemc = 0; cbmemc = 0;
grub_xnputs (str, len); cursor = real_cbmemc->cursor & CURSOR_MASK;
cbmemc = cbmemc_saved; if (!(real_cbmemc->cursor & OVERFLOW) && cursor < real_cbmemc->size)
size = cursor;
else
size = real_cbmemc->size;
if (real_cbmemc->cursor & OVERFLOW)
{
if (cursor > size)
cursor = 0;
grub_xnputs(real_cbmemc->body + cursor, size - cursor);
grub_xnputs(real_cbmemc->body, cursor);
}
else
grub_xnputs(real_cbmemc->body, size);
cbmemc = real_cbmemc;
return 0; return 0;
} }