diff options
| author | Anthony Liguori | 2011-05-05 20:05:32 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2011-05-05 20:05:32 +0200 |
| commit | 3964f535c35c08470ac69bd553282af500bc8bb0 (patch) | |
| tree | ba83992b5bcfda451371174ce3e8be1496c70c73 /hw/lsi53c895a.c | |
| parent | Merge remote-tracking branch 'kraxel/usb.7.pull' into staging (diff) | |
| parent | Merge remote branch 'origin/master' into pci (diff) | |
| download | qemu-3964f535c35c08470ac69bd553282af500bc8bb0.tar.gz qemu-3964f535c35c08470ac69bd553282af500bc8bb0.tar.xz qemu-3964f535c35c08470ac69bd553282af500bc8bb0.zip | |
Merge remote-tracking branch 'mst/for_anthony' into staging
Diffstat (limited to 'hw/lsi53c895a.c')
| -rw-r--r-- | hw/lsi53c895a.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/hw/lsi53c895a.c b/hw/lsi53c895a.c index e4b51a8eaf..be4df589d8 100644 --- a/hw/lsi53c895a.c +++ b/hw/lsi53c895a.c @@ -2094,15 +2094,6 @@ static void lsi_ram_mapfunc(PCIDevice *pci_dev, int region_num, cpu_register_physical_memory(addr + 0, 0x2000, s->ram_io_addr); } -static void lsi_mmio_mapfunc(PCIDevice *pci_dev, int region_num, - pcibus_t addr, pcibus_t size, int type) -{ - LSIState *s = DO_UPCAST(LSIState, dev, pci_dev); - - DPRINTF("Mapping registers at %08"FMT_PCIBUS"\n", addr); - cpu_register_physical_memory(addr + 0, 0x400, s->mmio_io_addr); -} - static void lsi_scsi_reset(DeviceState *dev) { LSIState *s = DO_UPCAST(LSIState, dev.qdev, dev); @@ -2245,8 +2236,7 @@ static int lsi_scsi_init(PCIDevice *dev) pci_register_bar(&s->dev, 0, 256, PCI_BASE_ADDRESS_SPACE_IO, lsi_io_mapfunc); - pci_register_bar(&s->dev, 1, 0x400, - PCI_BASE_ADDRESS_SPACE_MEMORY, lsi_mmio_mapfunc); + pci_register_bar_simple(&s->dev, 1, 0x400, 0, s->mmio_io_addr); pci_register_bar(&s->dev, 2, 0x2000, PCI_BASE_ADDRESS_SPACE_MEMORY, lsi_ram_mapfunc); QTAILQ_INIT(&s->queue); |