From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:49070) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QumyS-0006P5-JO for qemu-devel@nongnu.org; Sat, 20 Aug 2011 10:56:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QumyP-0007W1-6m for qemu-devel@nongnu.org; Sat, 20 Aug 2011 10:56:36 -0400 Received: from smtp5-g21.free.fr ([212.27.42.5]:49128) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QumyO-0007Vq-Ki for qemu-devel@nongnu.org; Sat, 20 Aug 2011 10:56:33 -0400 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Sat, 20 Aug 2011 16:56:30 +0200 Message-Id: <1313852195-23081-2-git-send-email-hpoussin@reactos.org> In-Reply-To: <1313852195-23081-1-git-send-email-hpoussin@reactos.org> References: <1313852195-23081-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [RFC 1/6] isa: rename isa_bus_new to isa_bus_bridge_init List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Signed-off-by: Herv=C3=A9 Poussineau --- hw/isa-bus.c | 2 +- hw/isa.h | 2 +- hw/mips_jazz.c | 2 +- hw/mips_r4k.c | 2 +- hw/pc_piix.c | 2 +- hw/piix4.c | 2 +- hw/piix_pci.c | 2 +- hw/ppc_prep.c | 2 +- hw/sun4u.c | 2 +- hw/vt82c686.c | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/hw/isa-bus.c b/hw/isa-bus.c index 2765543..21b4b51 100644 --- a/hw/isa-bus.c +++ b/hw/isa-bus.c @@ -38,7 +38,7 @@ static struct BusInfo isa_bus_info =3D { .get_fw_dev_path =3D isabus_get_fw_dev_path, }; =20 -ISABus *isa_bus_new(DeviceState *dev) +ISABus *isa_bus_bridge_init(DeviceState *dev) { if (isabus) { fprintf(stderr, "Can't create a second ISA bus\n"); diff --git a/hw/isa.h b/hw/isa.h index f1f2181..d6938f1 100644 --- a/hw/isa.h +++ b/hw/isa.h @@ -25,7 +25,7 @@ struct ISADeviceInfo { isa_qdev_initfn init; }; =20 -ISABus *isa_bus_new(DeviceState *dev); +ISABus *isa_bus_bridge_init(DeviceState *dev); void isa_bus_irqs(qemu_irq *irqs); qemu_irq isa_get_irq(int isairq); void isa_init_irq(ISADevice *dev, qemu_irq *p, int isairq); diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c index f6ab6dc..7da78ca 100644 --- a/hw/mips_jazz.c +++ b/hw/mips_jazz.c @@ -180,7 +180,7 @@ void mips_jazz_init (ram_addr_t ram_size, =20 /* ISA devices */ i8259 =3D i8259_init(env->irq[4]); - isa_bus_new(NULL); + isa_bus_bridge_init(NULL); isa_bus_irqs(i8259); cpu_exit_irq =3D qemu_allocate_irqs(cpu_request_exit, NULL, 1); DMA_init(0, cpu_exit_irq); diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c index 2834a46..f0db92b 100644 --- a/hw/mips_r4k.c +++ b/hw/mips_r4k.c @@ -265,7 +265,7 @@ void mips_r4k_init (ram_addr_t ram_size, =20 /* The PIC is attached to the MIPS CPU INT0 pin */ i8259 =3D i8259_init(env->irq[2]); - isa_bus_new(NULL); + isa_bus_bridge_init(NULL); isa_bus_irqs(i8259); =20 rtc_init(2000, NULL); diff --git a/hw/pc_piix.c b/hw/pc_piix.c index 7dd5008..d8f285c 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -134,7 +134,7 @@ static void pc_init1(MemoryRegion *system_memory, } else { pci_bus =3D NULL; i440fx_state =3D NULL; - isa_bus_new(NULL); + isa_bus_bridge_init(NULL); } isa_bus_irqs(isa_irq); =20 diff --git a/hw/piix4.c b/hw/piix4.c index 9590e7b..984de8b 100644 --- a/hw/piix4.c +++ b/hw/piix4.c @@ -87,7 +87,7 @@ static int piix4_initfn(PCIDevice *dev) { PIIX4State *d =3D DO_UPCAST(PIIX4State, dev, dev); =20 - isa_bus_new(&d->dev.qdev); + isa_bus_bridge_init(&d->dev.qdev); piix4_dev =3D &d->dev; qemu_register_reset(piix4_reset, d); return 0; diff --git a/hw/piix_pci.c b/hw/piix_pci.c index 28a3ee2..0b56553 100644 --- a/hw/piix_pci.c +++ b/hw/piix_pci.c @@ -447,7 +447,7 @@ static int piix3_initfn(PCIDevice *dev) { PIIX3State *d =3D DO_UPCAST(PIIX3State, dev, dev); =20 - isa_bus_new(&d->dev.qdev); + isa_bus_bridge_init(&d->dev.qdev); qemu_register_reset(piix3_reset, d); return 0; } diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c index 38d8573..620b69f 100644 --- a/hw/ppc_prep.c +++ b/hw/ppc_prep.c @@ -651,7 +651,7 @@ static void ppc_prep_init (ram_addr_t ram_size, i8259 =3D i8259_init(first_cpu->irq_inputs[PPC6xx_INPUT_INT]); pci_bus =3D pci_prep_init(i8259, get_system_memory(), get_system_io(= )); /* Hmm, prep has no pci-isa bridge ??? */ - isa_bus_new(NULL); + isa_bus_bridge_init(NULL); isa_bus_irqs(i8259); // pci_bus =3D i440fx_init(); /* Register 8 MB of ISA IO space (needed for non-contiguous map) */ diff --git a/hw/sun4u.c b/hw/sun4u.c index 7b2d0b1..7e5a7e1 100644 --- a/hw/sun4u.c +++ b/hw/sun4u.c @@ -544,7 +544,7 @@ pci_ebus_init1(PCIDevice *pci_dev) { EbusState *s =3D DO_UPCAST(EbusState, pci_dev, pci_dev); =20 - isa_bus_new(&pci_dev->qdev); + isa_bus_bridge_init(&pci_dev->qdev); =20 pci_dev->config[0x04] =3D 0x06; // command =3D bus master, pci mem pci_dev->config[0x05] =3D 0x00; diff --git a/hw/vt82c686.c b/hw/vt82c686.c index 5c973ed..25430d7 100644 --- a/hw/vt82c686.c +++ b/hw/vt82c686.c @@ -490,7 +490,7 @@ static int vt82c686b_initfn(PCIDevice *d) uint8_t *wmask; int i; =20 - isa_bus_new(&d->qdev); + isa_bus_bridge_init(&d->qdev); =20 pci_conf =3D d->config; pci_config_set_prog_interface(pci_conf, 0x0); --=20 1.7.5.4