diff options
| author | bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> | 2004-05-23 19:12:03 +0000 |
|---|---|---|
| committer | bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> | 2004-05-23 19:12:03 +0000 |
| commit | 63ce9e0a42503fbdb40eb8fb4b0933a058213925 (patch) | |
| tree | 2974b34e4d656ecf8057637e9093581410b57704 /hw/pci.c | |
| parent | e1c485be842d0cd633bb795d1efd61bbb4a5789b (diff) | |
| download | focaccia-qemu-63ce9e0a42503fbdb40eb8fb4b0933a058213925.tar.gz focaccia-qemu-63ce9e0a42503fbdb40eb8fb4b0933a058213925.zip | |
pci empty device read fix - piix3 ide init
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@854 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/pci.c')
| -rw-r--r-- | hw/pci.c | 35 |
1 files changed, 27 insertions, 8 deletions
diff --git a/hw/pci.c b/hw/pci.c index 2d8fcbcc5b..651c01d5dd 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -316,7 +316,18 @@ static uint32_t pci_data_read(void *opaque, uint32_t addr, pci_dev = bus[(s->config_reg >> 8) & 0xff]; if (!pci_dev) { fail: - val = 0; + switch(len) { + case 1: + val = 0xff; + break; + case 2: + val = 0xffff; + break; + default: + case 4: + val = 0xffffffff; + break; + } goto the_end; } config_addr = (s->config_reg & 0xfc) | (addr & 3); @@ -682,16 +693,24 @@ static void pci_bios_init_device(PCIDevice *d) int class; PCIIORegion *r; uint32_t *paddr; - int i, pin, pic_irq; + int i, pin, pic_irq, vendor_id, device_id; - class = d->config[0x0a] | (d->config[0x0b] << 8); + class = pci_config_readw(d, PCI_CLASS_DEVICE); switch(class) { case 0x0101: - /* IDE: we map it as in ISA mode */ - pci_set_io_region_addr(d, 0, 0x1f0); - pci_set_io_region_addr(d, 1, 0x3f4); - pci_set_io_region_addr(d, 2, 0x170); - pci_set_io_region_addr(d, 3, 0x374); + vendor_id = pci_config_readw(d, PCI_VENDOR_ID); + device_id = pci_config_readw(d, PCI_DEVICE_ID); + if (vendor_id == 0x8086 && device_id == 0x7010) { + /* PIIX3 IDE */ + pci_config_writew(d, PCI_COMMAND, PCI_COMMAND_IO); + pci_config_writew(d, 0x40, 0x8000); // enable IDE0 + } else { + /* IDE: we map it as in ISA mode */ + pci_set_io_region_addr(d, 0, 0x1f0); + pci_set_io_region_addr(d, 1, 0x3f4); + pci_set_io_region_addr(d, 2, 0x170); + pci_set_io_region_addr(d, 3, 0x374); + } break; case 0x0300: /* VGA: map frame buffer to default Bochs VBE address */ |