callrom(struct rom_header *rom, u16 offset, u16 bdf)
{
u16 seg = FLATPTR_TO_SEG(rom);
- dprintf(1, "Running option rom at %x:%x\n", seg, offset);
+ dprintf(1, "Running option rom at %04x:%04x\n", seg, offset);
struct bregs br;
memset(&br, 0, sizeof(br));
}
dprintf(4, "Copying option rom (size %d) from %p to %x\n"
, romsize, rom, next_rom);
- memcpy4((void*)next_rom, rom, romsize);
+ memcpy((void*)next_rom, rom, romsize);
return (struct rom_header *)next_rom;
}
static struct rom_header *
map_optionrom(u16 bdf, u32 vendev)
{
- dprintf(6, "Attempting to map option rom on dev %x\n", bdf);
+ dprintf(6, "Attempting to map option rom on dev %02x:%02x.%x\n"
+ , pci_bdf_to_bus(bdf), pci_bdf_to_dev(bdf), pci_bdf_to_fn(bdf));
u8 htype = pci_config_readb(bdf, PCI_HEADER_TYPE);
if ((htype & 0x7f) != PCI_HEADER_TYPE_NORMAL) {
init_optionrom(u16 bdf)
{
u32 vendev = pci_config_readl(bdf, PCI_VENDOR_ID);
- dprintf(4, "Attempting to init PCI bdf %x (dev/ven %x)\n", bdf, vendev);
+ dprintf(4, "Attempting to init PCI bdf %02x:%02x.%x (dev/ven %x)\n"
+ , pci_bdf_to_bus(bdf), pci_bdf_to_dev(bdf), pci_bdf_to_fn(bdf)
+ , vendev);
struct rom_header *rom = lookup_hardcode(vendev);
if (! rom)
rom = map_optionrom(bdf, vendev);