mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- added PCI ROM support to the Bochs BIOS (works with both pcivga and cirrus)

Browse Source 
- scan for VGABIOS ROM after rombios32 init
  - copy PCI ROM to shadow RAM at 0xc0000 and enable it
  - NOTE: this feature does not work with BIOS-bochs-legacy, so we should recommend to use the
    default BIOS for PCI display adapters
  - TODO: load VGABIOS ROM from the vga code instead of main.cc if PCI is disabled
This commit is contained in:
Volker Ruppert 2011-07-03 08:10:16 +00:00
parent f57b14d338
commit 4ce12047a9
2 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bochs/bios/rombios.c
View File

@ -10700,12 +10700,6 @@ normal_post:
;; PIC
call post_init_pic
mov cx, #0xc000 ;; init vga bios
mov ax, #0xc780
call rom_scan
call _print_bios_banner
#if BX_ROMBIOS32
call rombios32_init
#else
@ -10715,6 +10709,12 @@ normal_post:
#endif //BX_PCIBIOS
#endif
mov cx, #0xc000 ;; init vga bios
mov ax, #0xc780
call rom_scan
call _print_bios_banner
;;
;; Floppy setup
;;

24
bochs/bios/rombios32.c
View File

@ -646,6 +646,7 @@ static void pci_set_io_region_addr(PCIDevice *d, int region_num, uint32_t addr)
if ( region_num == PCI_ROM_SLOT ) {
ofs = 0x30;
addr |= 0x01;
}else{
ofs = 0x10 + region_num * 4;
}
@ -653,7 +654,7 @@ static void pci_set_io_region_addr(PCIDevice *d, int region_num, uint32_t addr)
old_addr = pci_config_readl(d, ofs);
pci_config_writel(d, ofs, addr);
BX_INFO("region %d: 0x%08x\n", region_num, addr);
BX_INFO("region %d: 0x%08x\n", region_num, addr & ~0x01);
/* enable memory mappings */
cmd = pci_config_readw(d, PCI_COMMAND);
@ -818,10 +819,13 @@ static void piix4_pm_enable(PCIDevice *d)
static void pci_bios_init_device(PCIDevice *d)
{
int class;
PCIDevice d1, *i440fx = &d1;
int class, v;
uint32_t *paddr;
int i, pin, pic_irq, vendor_id, device_id;
i440fx->bus = 0;
i440fx->devfn = 0;
class = pci_config_readw(d, PCI_CLASS_DEVICE);
vendor_id = pci_config_readw(d, PCI_VENDOR_ID);
device_id = pci_config_readw(d, PCI_DEVICE_ID);
@ -883,6 +887,22 @@ static void pci_bios_init_device(PCIDevice *d)
paddr = &pci_bios_mem_addr;
*paddr = (*paddr + size - 1) & ~(size - 1);
pci_set_io_region_addr(d, i, *paddr);
if ((i == PCI_ROM_SLOT) && (class == 0x0300)) {
v = pci_config_readb(i440fx, 0x5a);
v = (v & 0xcc) | 0x22;
pci_config_writeb(i440fx, 0x5a, v);
memcpy((void *)0xc0000, (void *)*paddr, 0x8000);
v = (v & 0xcc) | 0x11;
pci_config_writeb(i440fx, 0x5a, v);
if (size > 0x8000) {
v = pci_config_readb(i440fx, 0x5b);
v = (v & 0xcc) | 0x22;
pci_config_writeb(i440fx, 0x5b, v);
memcpy((void *)0xc8000, (void *)(*paddr + 0x8000), size - 0x8000);
v = (v & 0xcc) | 0x11;
pci_config_writeb(i440fx, 0x5b, v);
}
}
*paddr += size;
}
}