| Message ID | 1258005528-25383-7-git-send-email-yamahata@valinux.co.jp |
|---|---|
| State | New |
| Headers | show |
On Thu, Nov 12, 2009 at 02:58:34PM +0900, Isaku Yamahata wrote: > pci_host_data_register_io_memory and its variants are too long a bit. > So shorten them. Now they are > pci_host_{conf, data}_register_{mmio, mmio_noswap, ioport}() > > Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Acked-by: Michael S. Tsirkin <mst@redhat.com> > --- > hw/apb_pci.c | 4 ++-- > hw/grackle_pci.c | 8 ++++---- > hw/pci_host.c | 8 ++++---- > hw/pci_host.h | 8 ++++---- > hw/piix_pci.c | 2 +- > hw/ppc4xx_pci.c | 2 +- > hw/ppce500_pci.c | 4 ++-- > hw/prep_pci.c | 2 +- > hw/unin_pci.c | 16 ++++++++-------- > 9 files changed, 27 insertions(+), 27 deletions(-) > > diff --git a/hw/apb_pci.c b/hw/apb_pci.c > index 3999879..1a16a22 100644 > --- a/hw/apb_pci.c > +++ b/hw/apb_pci.c > @@ -235,10 +235,10 @@ static int pci_pbm_init_device(SysBusDevice *dev) > pci_apb_iowrite, s); > sysbus_init_mmio(dev, 0x10000ULL, pci_ioport); > /* mem_config */ > - pci_mem_config = pci_host_config_register_io_memory(&s->host_state); > + pci_mem_config = pci_host_conf_register_mmio(&s->host_state); > sysbus_init_mmio(dev, 0x10ULL, pci_mem_config); > /* mem_data */ > - pci_mem_data = pci_host_data_register_io_memory(&s->host_state); > + pci_mem_data = pci_host_data_register_mmio(&s->host_state); > sysbus_init_mmio(dev, 0x10000000ULL, pci_mem_data); > return 0; > } > diff --git a/hw/grackle_pci.c b/hw/grackle_pci.c > index f3a8a7d..089d1fb 100644 > --- a/hw/grackle_pci.c > +++ b/hw/grackle_pci.c > @@ -108,8 +108,8 @@ static int pci_grackle_init_device(SysBusDevice *dev) > > s = FROM_SYSBUS(GrackleState, dev); > > - pci_mem_config = pci_host_config_register_io_memory(&s->host_state); > - pci_mem_data = pci_host_data_register_io_memory(&s->host_state); > + pci_mem_config = pci_host_conf_register_mmio(&s->host_state); > + pci_mem_data = pci_host_data_register_mmio(&s->host_state); > sysbus_init_mmio(dev, 0x1000, pci_mem_config); > sysbus_init_mmio(dev, 0x1000, pci_mem_data); > > @@ -126,8 +126,8 @@ static int pci_dec_21154_init_device(SysBusDevice *dev) > > s = FROM_SYSBUS(GrackleState, dev); > > - pci_mem_config = pci_host_config_register_io_memory(&s->host_state); > - pci_mem_data = pci_host_data_register_io_memory(&s->host_state); > + pci_mem_config = pci_host_conf_register_mmio(&s->host_state); > + pci_mem_data = pci_host_data_register_mmio(&s->host_state); > sysbus_init_mmio(dev, 0x1000, pci_mem_config); > sysbus_init_mmio(dev, 0x1000, pci_mem_data); > return 0; > diff --git a/hw/pci_host.c b/hw/pci_host.c > index adecd7e..cd2ceb7 100644 > --- a/hw/pci_host.c > +++ b/hw/pci_host.c > @@ -118,7 +118,7 @@ static CPUReadMemoryFunc * const pci_host_config_read[] = { > &pci_host_config_readl, > }; > > -int pci_host_config_register_io_memory(PCIHostState *s) > +int pci_host_conf_register_mmio(PCIHostState *s) > { > return cpu_register_io_memory(pci_host_config_read, > pci_host_config_write, s); > @@ -158,7 +158,7 @@ static CPUReadMemoryFunc * const pci_host_config_read_noswap[] = { > &pci_host_config_readl_noswap, > }; > > -int pci_host_config_register_io_memory_noswap(PCIHostState *s) > +int pci_host_conf_register_mmio_noswap(PCIHostState *s) > { > return cpu_register_io_memory(pci_host_config_read_noswap, > pci_host_config_write_noswap, s); > @@ -182,7 +182,7 @@ static uint32_t pci_host_config_readl_ioport(void *opaque, uint32_t addr) > return val; > } > > -void pci_host_config_register_ioport(pio_addr_t ioport, PCIHostState *s) > +void pci_host_conf_register_ioport(pio_addr_t ioport, PCIHostState *s) > { > register_ioport_write(ioport, 4, 4, pci_host_config_writel_ioport, s); > register_ioport_read(ioport, 4, 4, pci_host_config_readl_ioport, s); > @@ -205,7 +205,7 @@ static CPUReadMemoryFunc * const pci_host_data_read_mmio[] = { > pci_host_data_readl_mmio, > }; > > -int pci_host_data_register_io_memory(PCIHostState *s) > +int pci_host_data_register_mmio(PCIHostState *s) > { > return cpu_register_io_memory(pci_host_data_read_mmio, > pci_host_data_write_mmio, > diff --git a/hw/pci_host.h b/hw/pci_host.h > index 7cfa693..cf3a339 100644 > --- a/hw/pci_host.h > +++ b/hw/pci_host.h > @@ -40,12 +40,12 @@ void pci_data_write(PCIBus *s, uint32_t addr, uint32_t val, int len); > uint32_t pci_data_read(PCIBus *s, uint32_t addr, int len); > > /* for mmio */ > -int pci_host_config_register_io_memory(PCIHostState *s); > -int pci_host_config_register_io_memory_noswap(PCIHostState *s); > -int pci_host_data_register_io_memory(PCIHostState *s); > +int pci_host_conf_register_mmio(PCIHostState *s); > +int pci_host_conf_register_mmio_noswap(PCIHostState *s); > +int pci_host_data_register_mmio(PCIHostState *s); > > /* for ioio */ > -void pci_host_config_register_ioport(pio_addr_t ioport, PCIHostState *s); > +void pci_host_conf_register_ioport(pio_addr_t ioport, PCIHostState *s); > void pci_host_data_register_ioport(pio_addr_t ioport, PCIHostState *s); > > #endif /* PCI_HOST_H */ > diff --git a/hw/piix_pci.c b/hw/piix_pci.c > index 5fb7d7b..a44f941 100644 > --- a/hw/piix_pci.c > +++ b/hw/piix_pci.c > @@ -180,7 +180,7 @@ static int i440fx_pcihost_initfn(SysBusDevice *dev) > { > I440FXState *s = FROM_SYSBUS(I440FXState, dev); > > - pci_host_config_register_ioport(0xcf8, s); > + pci_host_conf_register_ioport(0xcf8, s); > > pci_host_data_register_ioport(0xcfc, s); > return 0; > diff --git a/hw/ppc4xx_pci.c b/hw/ppc4xx_pci.c > index 3aa7489..2d00b61 100644 > --- a/hw/ppc4xx_pci.c > +++ b/hw/ppc4xx_pci.c > @@ -378,7 +378,7 @@ PCIBus *ppc4xx_pci_init(CPUState *env, qemu_irq pci_irqs[4], > cpu_register_physical_memory(config_space + PCIC0_CFGADDR, 4, index); > > /* CFGDATA */ > - index = pci_host_data_register_io_memory(&controller->pci_state); > + index = pci_host_data_register_mmio(&controller->pci_state); > if (index < 0) > goto free; > cpu_register_physical_memory(config_space + PCIC0_CFGDATA, 4, index); > diff --git a/hw/ppce500_pci.c b/hw/ppce500_pci.c > index 223de3a..a72fb86 100644 > --- a/hw/ppce500_pci.c > +++ b/hw/ppce500_pci.c > @@ -293,13 +293,13 @@ PCIBus *ppce500_pci_init(qemu_irq pci_irqs[4], target_phys_addr_t registers) > controller->pci_dev = d; > > /* CFGADDR */ > - index = pci_host_config_register_io_memory_noswap(&controller->pci_state); > + index = pci_host_conf_register_mmio_noswap(&controller->pci_state); > if (index < 0) > goto free; > cpu_register_physical_memory(registers + PCIE500_CFGADDR, 4, index); > > /* CFGDATA */ > - index = pci_host_data_register_io_memory(&controller->pci_state); > + index = pci_host_data_register_mmio(&controller->pci_state); > if (index < 0) > goto free; > cpu_register_physical_memory(registers + PCIE500_CFGDATA, 4, index); > diff --git a/hw/prep_pci.c b/hw/prep_pci.c > index a338f81..aceb645 100644 > --- a/hw/prep_pci.c > +++ b/hw/prep_pci.c > @@ -127,7 +127,7 @@ PCIBus *pci_prep_init(qemu_irq *pic) > s->bus = pci_register_bus(NULL, "pci", > prep_set_irq, prep_map_irq, pic, 0, 4); > > - pci_host_config_register_ioport(0xcf8, s); > + pci_host_conf_register_ioport(0xcf8, s); > > pci_host_data_register_ioport(0xcfc, s); > > diff --git a/hw/unin_pci.c b/hw/unin_pci.c > index f089cbd..50d2897 100644 > --- a/hw/unin_pci.c > +++ b/hw/unin_pci.c > @@ -84,8 +84,8 @@ static int pci_unin_main_init_device(SysBusDevice *dev) > /* Uninorth main bus */ > s = FROM_SYSBUS(UNINState, dev); > > - pci_mem_config = pci_host_config_register_io_memory(&s->host_state); > - pci_mem_data = pci_host_data_register_io_memory(&s->host_state); > + pci_mem_config = pci_host_conf_register_mmio(&s->host_state); > + pci_mem_data = pci_host_data_register_mmio(&s->host_state); > sysbus_init_mmio(dev, 0x1000, pci_mem_config); > sysbus_init_mmio(dev, 0x1000, pci_mem_data); > > @@ -103,8 +103,8 @@ static int pci_dec_21154_init_device(SysBusDevice *dev) > s = FROM_SYSBUS(UNINState, dev); > > // XXX: s = &pci_bridge[2]; > - pci_mem_config = pci_host_config_register_io_memory_noswap(&s->host_state); > - pci_mem_data = pci_host_data_register_io_memory(&s->host_state); > + pci_mem_config = pci_host_conf_register_mmio_noswap(&s->host_state); > + pci_mem_data = pci_host_data_register_mmio(&s->host_state); > sysbus_init_mmio(dev, 0x1000, pci_mem_config); > sysbus_init_mmio(dev, 0x1000, pci_mem_data); > return 0; > @@ -118,8 +118,8 @@ static int pci_unin_agp_init_device(SysBusDevice *dev) > /* Uninorth AGP bus */ > s = FROM_SYSBUS(UNINState, dev); > > - pci_mem_config = pci_host_config_register_io_memory_noswap(&s->host_state); > - pci_mem_data = pci_host_data_register_io_memory(&s->host_state); > + pci_mem_config = pci_host_conf_register_mmio_noswap(&s->host_state); > + pci_mem_data = pci_host_data_register_mmio(&s->host_state); > sysbus_init_mmio(dev, 0x1000, pci_mem_config); > sysbus_init_mmio(dev, 0x1000, pci_mem_data); > return 0; > @@ -133,8 +133,8 @@ static int pci_unin_internal_init_device(SysBusDevice *dev) > /* Uninorth internal bus */ > s = FROM_SYSBUS(UNINState, dev); > > - pci_mem_config = pci_host_config_register_io_memory_noswap(&s->host_state); > - pci_mem_data = pci_host_data_register_io_memory(&s->host_state); > + pci_mem_config = pci_host_conf_register_mmio_noswap(&s->host_state); > + pci_mem_data = pci_host_data_register_mmio(&s->host_state); > sysbus_init_mmio(dev, 0x1000, pci_mem_config); > sysbus_init_mmio(dev, 0x1000, pci_mem_data); > return 0; > -- > 1.6.0.2
diff --git a/hw/apb_pci.c b/hw/apb_pci.c index 3999879..1a16a22 100644 --- a/hw/apb_pci.c +++ b/hw/apb_pci.c @@ -235,10 +235,10 @@ static int pci_pbm_init_device(SysBusDevice *dev) pci_apb_iowrite, s); sysbus_init_mmio(dev, 0x10000ULL, pci_ioport); /* mem_config */ - pci_mem_config = pci_host_config_register_io_memory(&s->host_state); + pci_mem_config = pci_host_conf_register_mmio(&s->host_state); sysbus_init_mmio(dev, 0x10ULL, pci_mem_config); /* mem_data */ - pci_mem_data = pci_host_data_register_io_memory(&s->host_state); + pci_mem_data = pci_host_data_register_mmio(&s->host_state); sysbus_init_mmio(dev, 0x10000000ULL, pci_mem_data); return 0; } diff --git a/hw/grackle_pci.c b/hw/grackle_pci.c index f3a8a7d..089d1fb 100644 --- a/hw/grackle_pci.c +++ b/hw/grackle_pci.c @@ -108,8 +108,8 @@ static int pci_grackle_init_device(SysBusDevice *dev) s = FROM_SYSBUS(GrackleState, dev); - pci_mem_config = pci_host_config_register_io_memory(&s->host_state); - pci_mem_data = pci_host_data_register_io_memory(&s->host_state); + pci_mem_config = pci_host_conf_register_mmio(&s->host_state); + pci_mem_data = pci_host_data_register_mmio(&s->host_state); sysbus_init_mmio(dev, 0x1000, pci_mem_config); sysbus_init_mmio(dev, 0x1000, pci_mem_data); @@ -126,8 +126,8 @@ static int pci_dec_21154_init_device(SysBusDevice *dev) s = FROM_SYSBUS(GrackleState, dev); - pci_mem_config = pci_host_config_register_io_memory(&s->host_state); - pci_mem_data = pci_host_data_register_io_memory(&s->host_state); + pci_mem_config = pci_host_conf_register_mmio(&s->host_state); + pci_mem_data = pci_host_data_register_mmio(&s->host_state); sysbus_init_mmio(dev, 0x1000, pci_mem_config); sysbus_init_mmio(dev, 0x1000, pci_mem_data); return 0; diff --git a/hw/pci_host.c b/hw/pci_host.c index adecd7e..cd2ceb7 100644 --- a/hw/pci_host.c +++ b/hw/pci_host.c @@ -118,7 +118,7 @@ static CPUReadMemoryFunc * const pci_host_config_read[] = { &pci_host_config_readl, }; -int pci_host_config_register_io_memory(PCIHostState *s) +int pci_host_conf_register_mmio(PCIHostState *s) { return cpu_register_io_memory(pci_host_config_read, pci_host_config_write, s); @@ -158,7 +158,7 @@ static CPUReadMemoryFunc * const pci_host_config_read_noswap[] = { &pci_host_config_readl_noswap, }; -int pci_host_config_register_io_memory_noswap(PCIHostState *s) +int pci_host_conf_register_mmio_noswap(PCIHostState *s) { return cpu_register_io_memory(pci_host_config_read_noswap, pci_host_config_write_noswap, s); @@ -182,7 +182,7 @@ static uint32_t pci_host_config_readl_ioport(void *opaque, uint32_t addr) return val; } -void pci_host_config_register_ioport(pio_addr_t ioport, PCIHostState *s) +void pci_host_conf_register_ioport(pio_addr_t ioport, PCIHostState *s) { register_ioport_write(ioport, 4, 4, pci_host_config_writel_ioport, s); register_ioport_read(ioport, 4, 4, pci_host_config_readl_ioport, s); @@ -205,7 +205,7 @@ static CPUReadMemoryFunc * const pci_host_data_read_mmio[] = { pci_host_data_readl_mmio, }; -int pci_host_data_register_io_memory(PCIHostState *s) +int pci_host_data_register_mmio(PCIHostState *s) { return cpu_register_io_memory(pci_host_data_read_mmio, pci_host_data_write_mmio, diff --git a/hw/pci_host.h b/hw/pci_host.h index 7cfa693..cf3a339 100644 --- a/hw/pci_host.h +++ b/hw/pci_host.h @@ -40,12 +40,12 @@ void pci_data_write(PCIBus *s, uint32_t addr, uint32_t val, int len); uint32_t pci_data_read(PCIBus *s, uint32_t addr, int len); /* for mmio */ -int pci_host_config_register_io_memory(PCIHostState *s); -int pci_host_config_register_io_memory_noswap(PCIHostState *s); -int pci_host_data_register_io_memory(PCIHostState *s); +int pci_host_conf_register_mmio(PCIHostState *s); +int pci_host_conf_register_mmio_noswap(PCIHostState *s); +int pci_host_data_register_mmio(PCIHostState *s); /* for ioio */ -void pci_host_config_register_ioport(pio_addr_t ioport, PCIHostState *s); +void pci_host_conf_register_ioport(pio_addr_t ioport, PCIHostState *s); void pci_host_data_register_ioport(pio_addr_t ioport, PCIHostState *s); #endif /* PCI_HOST_H */ diff --git a/hw/piix_pci.c b/hw/piix_pci.c index 5fb7d7b..a44f941 100644 --- a/hw/piix_pci.c +++ b/hw/piix_pci.c @@ -180,7 +180,7 @@ static int i440fx_pcihost_initfn(SysBusDevice *dev) { I440FXState *s = FROM_SYSBUS(I440FXState, dev); - pci_host_config_register_ioport(0xcf8, s); + pci_host_conf_register_ioport(0xcf8, s); pci_host_data_register_ioport(0xcfc, s); return 0; diff --git a/hw/ppc4xx_pci.c b/hw/ppc4xx_pci.c index 3aa7489..2d00b61 100644 --- a/hw/ppc4xx_pci.c +++ b/hw/ppc4xx_pci.c @@ -378,7 +378,7 @@ PCIBus *ppc4xx_pci_init(CPUState *env, qemu_irq pci_irqs[4], cpu_register_physical_memory(config_space + PCIC0_CFGADDR, 4, index); /* CFGDATA */ - index = pci_host_data_register_io_memory(&controller->pci_state); + index = pci_host_data_register_mmio(&controller->pci_state); if (index < 0) goto free; cpu_register_physical_memory(config_space + PCIC0_CFGDATA, 4, index); diff --git a/hw/ppce500_pci.c b/hw/ppce500_pci.c index 223de3a..a72fb86 100644 --- a/hw/ppce500_pci.c +++ b/hw/ppce500_pci.c @@ -293,13 +293,13 @@ PCIBus *ppce500_pci_init(qemu_irq pci_irqs[4], target_phys_addr_t registers) controller->pci_dev = d; /* CFGADDR */ - index = pci_host_config_register_io_memory_noswap(&controller->pci_state); + index = pci_host_conf_register_mmio_noswap(&controller->pci_state); if (index < 0) goto free; cpu_register_physical_memory(registers + PCIE500_CFGADDR, 4, index); /* CFGDATA */ - index = pci_host_data_register_io_memory(&controller->pci_state); + index = pci_host_data_register_mmio(&controller->pci_state); if (index < 0) goto free; cpu_register_physical_memory(registers + PCIE500_CFGDATA, 4, index); diff --git a/hw/prep_pci.c b/hw/prep_pci.c index a338f81..aceb645 100644 --- a/hw/prep_pci.c +++ b/hw/prep_pci.c @@ -127,7 +127,7 @@ PCIBus *pci_prep_init(qemu_irq *pic) s->bus = pci_register_bus(NULL, "pci", prep_set_irq, prep_map_irq, pic, 0, 4); - pci_host_config_register_ioport(0xcf8, s); + pci_host_conf_register_ioport(0xcf8, s); pci_host_data_register_ioport(0xcfc, s); diff --git a/hw/unin_pci.c b/hw/unin_pci.c index f089cbd..50d2897 100644 --- a/hw/unin_pci.c +++ b/hw/unin_pci.c @@ -84,8 +84,8 @@ static int pci_unin_main_init_device(SysBusDevice *dev) /* Uninorth main bus */ s = FROM_SYSBUS(UNINState, dev); - pci_mem_config = pci_host_config_register_io_memory(&s->host_state); - pci_mem_data = pci_host_data_register_io_memory(&s->host_state); + pci_mem_config = pci_host_conf_register_mmio(&s->host_state); + pci_mem_data = pci_host_data_register_mmio(&s->host_state); sysbus_init_mmio(dev, 0x1000, pci_mem_config); sysbus_init_mmio(dev, 0x1000, pci_mem_data); @@ -103,8 +103,8 @@ static int pci_dec_21154_init_device(SysBusDevice *dev) s = FROM_SYSBUS(UNINState, dev); // XXX: s = &pci_bridge[2]; - pci_mem_config = pci_host_config_register_io_memory_noswap(&s->host_state); - pci_mem_data = pci_host_data_register_io_memory(&s->host_state); + pci_mem_config = pci_host_conf_register_mmio_noswap(&s->host_state); + pci_mem_data = pci_host_data_register_mmio(&s->host_state); sysbus_init_mmio(dev, 0x1000, pci_mem_config); sysbus_init_mmio(dev, 0x1000, pci_mem_data); return 0; @@ -118,8 +118,8 @@ static int pci_unin_agp_init_device(SysBusDevice *dev) /* Uninorth AGP bus */ s = FROM_SYSBUS(UNINState, dev); - pci_mem_config = pci_host_config_register_io_memory_noswap(&s->host_state); - pci_mem_data = pci_host_data_register_io_memory(&s->host_state); + pci_mem_config = pci_host_conf_register_mmio_noswap(&s->host_state); + pci_mem_data = pci_host_data_register_mmio(&s->host_state); sysbus_init_mmio(dev, 0x1000, pci_mem_config); sysbus_init_mmio(dev, 0x1000, pci_mem_data); return 0; @@ -133,8 +133,8 @@ static int pci_unin_internal_init_device(SysBusDevice *dev) /* Uninorth internal bus */ s = FROM_SYSBUS(UNINState, dev); - pci_mem_config = pci_host_config_register_io_memory_noswap(&s->host_state); - pci_mem_data = pci_host_data_register_io_memory(&s->host_state); + pci_mem_config = pci_host_conf_register_mmio_noswap(&s->host_state); + pci_mem_data = pci_host_data_register_mmio(&s->host_state); sysbus_init_mmio(dev, 0x1000, pci_mem_config); sysbus_init_mmio(dev, 0x1000, pci_mem_data); return 0;
pci_host_data_register_io_memory and its variants are too long a bit. So shorten them. Now they are pci_host_{conf, data}_register_{mmio, mmio_noswap, ioport}() Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> --- hw/apb_pci.c | 4 ++-- hw/grackle_pci.c | 8 ++++---- hw/pci_host.c | 8 ++++---- hw/pci_host.h | 8 ++++---- hw/piix_pci.c | 2 +- hw/ppc4xx_pci.c | 2 +- hw/ppce500_pci.c | 4 ++-- hw/prep_pci.c | 2 +- hw/unin_pci.c | 16 ++++++++-------- 9 files changed, 27 insertions(+), 27 deletions(-)