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

bugfixes. Merge MIPS and MIPSel

Browse source
This commit is contained in:
phcoder 2009-10-10 14:19:50 +02:00
parent 7dc7e76a56
commit 33dc6f74d2
17 changed files with 77 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

0
kern/mipsel/cache.S → kern/mips/cache.S
View file

6
kern/mipsel/dl.c → kern/mips/dl.c
View file

@ -92,6 +92,7 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
switch (ELF_R_TYPE (rel->r_info))
{
#if 0
case R_386_32:
*addr += sym->st_value;
break;
@ -100,6 +101,11 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
*addr += (sym->st_value - (Elf_Word) seg->addr
- rel->r_offset);
break;
#endif
default:
grub_printf ("Unknown relocation type %d\n",
ELF_R_TYPE (rel->r_info));
break
}
}
}

0
kern/mipsel/qemu-r4k/init.c → kern/mips/qemu-r4k/init.c
View file

0
kern/mipsel/qemu-r4k/startup.S → kern/mips/qemu-r4k/startup.S
View file

11
kern/term.c
View file

@ -135,21 +135,24 @@ grub_getcharwidth (grub_uint32_t code)
int
grub_getkey (void)
{
return (grub_cur_term_input->getkey) ();
while (!(*((grub_uint8_t *)0x140003f8+5) & 0x01));
return *((grub_uint8_t *)0x140003f8);
// return (grub_cur_term_input->getkey) ();
}
int
grub_checkkey (void)
{
return (grub_cur_term_input->checkkey) ();
return !!(*((grub_uint8_t *)0x140003f8+5) & 0x01);
//return (grub_cur_term_input->checkkey) ();
}
int
grub_getkeystatus (void)
{
if (grub_cur_term_input->getkeystatus)
/* if (grub_cur_term_input->getkeystatus)
return (grub_cur_term_input->getkeystatus) ();
else
else*/
return 0;
}