Author: stepan Date: 2007-07-21 21:22:40 +0200 (Sat, 21 Jul 2007) New Revision: 462
Modified: LinuxBIOSv3/include/console.h LinuxBIOSv3/lib/elfboot.c LinuxBIOSv3/lib/lar.c LinuxBIOSv3/lib/vtxprintf.c LinuxBIOSv3/util/x86emu/vm86.c Log: fix somw printk calls and print warnings for those that still need to be fixed. (trivial)
Signed-off-by: Stefan Reinauer stepan@coresystems.de Acked-by: Stefan Reinauer stepan@coresystems.de
Modified: LinuxBIOSv3/include/console.h =================================================================== --- LinuxBIOSv3/include/console.h 2007-07-21 14:33:54 UTC (rev 461) +++ LinuxBIOSv3/include/console.h 2007-07-21 19:22:40 UTC (rev 462) @@ -46,6 +46,7 @@ };
// -int printk(int msg_level, const char *fmt, ...); +int printk(int msg_level, const char *fmt, ...) + __attribute__((format (printf, 2, 3)));
#endif /* CONSOLE_H */
Modified: LinuxBIOSv3/lib/elfboot.c =================================================================== --- LinuxBIOSv3/lib/elfboot.c 2007-07-21 14:33:54 UTC (rev 461) +++ LinuxBIOSv3/lib/elfboot.c 2007-07-21 19:22:40 UTC (rev 462) @@ -88,7 +88,7 @@ ehdr = (Elf_ehdr *)header; phdr = (Elf_phdr *)(&header[ehdr->e_phoff]);
- printk(BIOS_DEBUG, "%s: header %p #headers %d\n", header, headers); + printk(BIOS_DEBUG, "%s: header %p #headers %d\n", __FUNCTION__, header, headers); int i; int size; for(i = 0; i < headers; i++) {
Modified: LinuxBIOSv3/lib/lar.c =================================================================== --- LinuxBIOSv3/lib/lar.c 2007-07-21 14:33:54 UTC (rev 461) +++ LinuxBIOSv3/lib/lar.c 2007-07-21 19:22:40 UTC (rev 462) @@ -37,7 +37,7 @@ struct lar_header *header;
printk(BIOS_INFO, "LAR: Attempting to open '%s'.\n", filename); - printk(BIOS_SPEW, "LAR: Start 0x%x len 0x%x\n", archive->start, + printk(BIOS_SPEW, "LAR: Start %p len 0x%x\n", archive->start, archive->len);
for (walk = archive->start;
Modified: LinuxBIOSv3/lib/vtxprintf.c =================================================================== --- LinuxBIOSv3/lib/vtxprintf.c 2007-07-21 14:33:54 UTC (rev 461) +++ LinuxBIOSv3/lib/vtxprintf.c 2007-07-21 19:22:40 UTC (rev 462) @@ -211,6 +211,8 @@ field_width = 2*sizeof(void *); flags |= ZEROPAD; } + tx_byte('0', arg), count++; + tx_byte('x', arg), count++; count += number(tx_byte, arg, (unsigned long) va_arg(args, void *), 16, field_width, precision, flags);
Modified: LinuxBIOSv3/util/x86emu/vm86.c =================================================================== --- LinuxBIOSv3/util/x86emu/vm86.c 2007-07-21 14:33:54 UTC (rev 461) +++ LinuxBIOSv3/util/x86emu/vm86.c 2007-07-21 19:22:40 UTC (rev 462) @@ -310,8 +310,8 @@ void do_vgabios(void) { struct device *dev; - unsigned long busdevfn; - unsigned int rom = 0; + unsigned int busdevfn; + unsigned long rom = 0; unsigned char *buf; unsigned int size = 64*1024; int i; @@ -334,7 +334,7 @@ #warning fix rom address rom = 0xc0000; pci_write_config32(dev, PCI_ROM_ADDRESS, rom|1); - printk(BIOS_DEBUG, "rom base, size: %x\n", rom); + printk(BIOS_DEBUG, "rom base, size: %p\n", (void *)rom);
buf = (unsigned char *) rom; if ((buf[0] == 0x55) && (buf[1] == 0xaa)) {