>From ae3c2b55f84f9b12551369b21fd7b89d84ddfff6 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Mon, 16 Nov 2009 23:12:53 +0100 Subject: [PATCH] megasas: adapt to pci changes. --- hw/megasas.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/megasas.c b/hw/megasas.c index 723c586..3d15cc6 100644 --- a/hw/megasas.c +++ b/hw/megasas.c @@ -1034,7 +1034,7 @@ static void megasas_soft_reset(MPTState *s) } static void megasas_mmio_mapfunc(PCIDevice *pci_dev, int region_num, - uint32_t addr, uint32_t size, int type) + pcibus_t addr, pcibus_t size, int type) { MPTState *s = DO_UPCAST(MPTState, dev, pci_dev); @@ -1043,7 +1043,7 @@ static void megasas_mmio_mapfunc(PCIDevice *pci_dev, int region_num, } static void megasas_io_mapfunc(PCIDevice *pci_dev, int region_num, - uint32_t addr, uint32_t size, int type) + pcibus_t addr, pcibus_t size, int type) { MPTState *s = DO_UPCAST(MPTState, dev, pci_dev); @@ -1058,7 +1058,7 @@ static void megasas_io_mapfunc(PCIDevice *pci_dev, int region_num, } static void megasas_queue_mapfunc(PCIDevice *pci_dev, int region_num, - uint32_t addr, uint32_t size, int type) + pcibus_t addr, pcibus_t size, int type) { MPTState *s = DO_UPCAST(MPTState, dev, pci_dev); @@ -1140,11 +1140,11 @@ static int megasas_scsi_init(PCIDevice *dev) s->queue_addr = cpu_register_io_memory(megasas_queue_readfn, megasas_queue_writefn, s); pci_register_bar((struct PCIDevice *)s, 0, 0x40000, - PCI_ADDRESS_SPACE_MEM, megasas_mmio_mapfunc); + PCI_BASE_ADDRESS_SPACE_MEMORY, megasas_mmio_mapfunc); pci_register_bar((struct PCIDevice *)s, 2, 256, - PCI_ADDRESS_SPACE_IO, megasas_io_mapfunc); + PCI_BASE_ADDRESS_SPACE_IO, megasas_io_mapfunc); pci_register_bar((struct PCIDevice *)s, 3, 0x40000, - PCI_ADDRESS_SPACE_MEM, megasas_queue_mapfunc); + PCI_BASE_ADDRESS_SPACE_MEMORY, megasas_queue_mapfunc); s->fw_sge = MEGASAS_MAX_SGE; s->fw_cmds = MEGASAS_MAX_FRAMES; s->fw_luns = (MEGASAS_MAX_LUNS > MAX_SCSI_DEVS) ? -- 1.6.2.5