Avoid duplicating code, re-use the generic generic pci_host_data_le_ops MemoryRegionOps.
Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- hw/alpha/alpha_sys.h | 1 - hw/alpha/pci.c | 26 -------------------------- hw/alpha/typhoon.c | 4 ++-- 3 files changed, 2 insertions(+), 29 deletions(-) diff --git a/hw/alpha/alpha_sys.h b/hw/alpha/alpha_sys.h index a303c584383..c193f0a9b56 100644 --- a/hw/alpha/alpha_sys.h +++ b/hw/alpha/alpha_sys.h @@ -14,7 +14,6 @@ PCIBus *typhoon_init(MemoryRegion *, qemu_irq *, qemu_irq *, AlphaCPU *[4], /* alpha_pci.c. */ extern const MemoryRegionOps alpha_pci_ignore_ops; -extern const MemoryRegionOps alpha_pci_conf1_ops; extern const MemoryRegionOps alpha_pci_iack_ops; #endif diff --git a/hw/alpha/pci.c b/hw/alpha/pci.c index 7c18297177b..d44cee570bf 100644 --- a/hw/alpha/pci.c +++ b/hw/alpha/pci.c @@ -38,32 +38,6 @@ const MemoryRegionOps alpha_pci_ignore_ops = { }, }; - -/* PCI config space reads/writes, to byte-word addressable memory. */ -static uint64_t bw_conf1_read(void *opaque, hwaddr addr, - unsigned size) -{ - PCIBus *b = opaque; - return pci_data_read(b, addr, size); -} - -static void bw_conf1_write(void *opaque, hwaddr addr, - uint64_t val, unsigned size) -{ - PCIBus *b = opaque; - pci_data_write(b, addr, val, size); -} - -const MemoryRegionOps alpha_pci_conf1_ops = { - .read = bw_conf1_read, - .write = bw_conf1_write, - .endianness = DEVICE_LITTLE_ENDIAN, - .impl = { - .min_access_size = 1, - .max_access_size = 4, - }, -}; - /* PCI/EISA Interrupt Acknowledge Cycle. */ static uint64_t iack_read(void *opaque, hwaddr addr, unsigned size) diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c index 4c56f981d71..f5a9d6e6ed4 100644 --- a/hw/alpha/typhoon.c +++ b/hw/alpha/typhoon.c @@ -911,8 +911,8 @@ PCIBus *typhoon_init(MemoryRegion *ram, qemu_irq *p_isa_irq, &s->pchip.reg_iack); /* Pchip0 PCI configuration, 0x801.FE00.0000, 16MB. */ - memory_region_init_io(&s->pchip.reg_conf, OBJECT(s), &alpha_pci_conf1_ops, - b, "pci0-conf", 16 * MiB); + memory_region_init_io(&s->pchip.reg_conf, OBJECT(s), &pci_host_data_le_ops, + phb, "pci0-data-idx", 16 * MiB); memory_region_add_subregion(addr_space, 0x801fe000000ULL, &s->pchip.reg_conf); -- 2.51.0
