diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2010-01-06 07:16:59 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-01-06 07:16:59 -0600 |
| commit | ea3fdd5d8ca8d5055942e42151480ab5611396c7 (patch) | |
| tree | a01fb01d46612436a8b00d1c159273bad7597858 /hw/lsi53c895a.c | |
| parent | dffbe21746fc7a8b66fbbdf15f74eefccd8edafd (diff) | |
| parent | 1cd9656f27bd3b6dc85ad16adeeca88daa1aa14b (diff) | |
Merge remote branch 'mst/for_anthony' into staging
Diffstat (limited to 'hw/lsi53c895a.c')
| -rw-r--r-- | hw/lsi53c895a.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/hw/lsi53c895a.c b/hw/lsi53c895a.c index e4033b1393..f6660a314a 100644 --- a/hw/lsi53c895a.c +++ b/hw/lsi53c895a.c @@ -2120,18 +2120,20 @@ static int lsi_scsi_init(PCIDevice *dev) /* PCI base class code */ pci_config_set_class(pci_conf, PCI_CLASS_STORAGE_SCSI); /* PCI subsystem ID */ - pci_conf[0x2e] = 0x00; - pci_conf[0x2f] = 0x10; + pci_conf[PCI_SUBSYSTEM_ID] = 0x00; + pci_conf[PCI_SUBSYSTEM_ID + 1] = 0x10; /* PCI latency timer = 255 */ - pci_conf[0x0d] = 0xff; + pci_conf[PCI_LATENCY_TIMER] = 0xff; + /* TODO: RST# value should be 0 */ /* Interrupt pin 1 */ - pci_conf[0x3d] = 0x01; + pci_conf[PCI_INTERRUPT_PIN] = 0x01; s->mmio_io_addr = cpu_register_io_memory(lsi_mmio_readfn, lsi_mmio_writefn, s); s->ram_io_addr = cpu_register_io_memory(lsi_ram_readfn, lsi_ram_writefn, s); + /* TODO: use dev and get rid of cast below */ pci_register_bar((struct PCIDevice *)s, 0, 256, PCI_BASE_ADDRESS_SPACE_IO, lsi_io_mapfunc); pci_register_bar((struct PCIDevice *)s, 1, 0x400, |