[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 15/17] vt82c686: Move common code to via_isa_realize
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 15/17] vt82c686: Move common code to via_isa_realize |
Date: |
Mon, 18 Oct 2021 00:52:43 +0200 |
From: BALATON Zoltan <balaton@eik.bme.hu>
The vt82c686b_realize and vt8231_realize methods are almost identical,
factor out the common parts to a via_isa_realize function to avoid
code duplication.
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id:
<7cb7a16ff4daf8f48d576246255bea1fd355207c.1634259980.git.balaton@eik.bme.hu>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/isa/vt82c686.c | 67 ++++++++++++++++++++---------------------------
1 file changed, 29 insertions(+), 38 deletions(-)
diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c
index f57f3e70679..5b41539f2cd 100644
--- a/hw/isa/vt82c686.c
+++ b/hw/isa/vt82c686.c
@@ -542,6 +542,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(ViaISAState, VIA_ISA)
struct ViaISAState {
PCIDevice dev;
qemu_irq cpu_intr;
+ ISABus *isa_bus;
ViaSuperIOState *via_sio;
};
@@ -572,6 +573,29 @@ static void via_isa_request_i8259_irq(void *opaque, int
irq, int level)
qemu_set_irq(s->cpu_intr, level);
}
+static void via_isa_realize(PCIDevice *d, Error **errp)
+{
+ ViaISAState *s = VIA_ISA(d);
+ DeviceState *dev = DEVICE(d);
+ qemu_irq *isa_irq;
+ int i;
+
+ qdev_init_gpio_out(dev, &s->cpu_intr, 1);
+ isa_irq = qemu_allocate_irqs(via_isa_request_i8259_irq, s, 1);
+ s->isa_bus = isa_bus_new(dev, get_system_memory(), pci_address_space_io(d),
+ &error_fatal);
+ isa_bus_irqs(s->isa_bus, i8259_init(s->isa_bus, *isa_irq));
+ i8254_pit_init(s->isa_bus, 0x40, 0, NULL);
+ i8257_dma_init(s->isa_bus, 0);
+ mc146818_rtc_init(s->isa_bus, 2000, NULL);
+
+ for (i = 0; i < PCI_CONFIG_HEADER_SIZE; i++) {
+ if (i < PCI_COMMAND || i >= PCI_REVISION_ID) {
+ d->wmask[i] = 0;
+ }
+ }
+}
+
/* TYPE_VT82C686B_ISA */
static void vt82c686b_write_config(PCIDevice *d, uint32_t addr,
@@ -610,27 +634,10 @@ static void vt82c686b_isa_reset(DeviceState *dev)
static void vt82c686b_realize(PCIDevice *d, Error **errp)
{
ViaISAState *s = VIA_ISA(d);
- DeviceState *dev = DEVICE(d);
- ISABus *isa_bus;
- qemu_irq *isa_irq;
- int i;
- qdev_init_gpio_out(dev, &s->cpu_intr, 1);
- isa_irq = qemu_allocate_irqs(via_isa_request_i8259_irq, s, 1);
- isa_bus = isa_bus_new(dev, get_system_memory(), pci_address_space_io(d),
- &error_fatal);
- isa_bus_irqs(isa_bus, i8259_init(isa_bus, *isa_irq));
- i8254_pit_init(isa_bus, 0x40, 0, NULL);
- i8257_dma_init(isa_bus, 0);
- s->via_sio = VIA_SUPERIO(isa_create_simple(isa_bus,
+ via_isa_realize(d, errp);
+ s->via_sio = VIA_SUPERIO(isa_create_simple(s->isa_bus,
TYPE_VT82C686B_SUPERIO));
- mc146818_rtc_init(isa_bus, 2000, NULL);
-
- for (i = 0; i < PCI_CONFIG_HEADER_SIZE; i++) {
- if (i < PCI_COMMAND || i >= PCI_REVISION_ID) {
- d->wmask[i] = 0;
- }
- }
}
static void vt82c686b_class_init(ObjectClass *klass, void *data)
@@ -691,26 +698,10 @@ static void vt8231_isa_reset(DeviceState *dev)
static void vt8231_realize(PCIDevice *d, Error **errp)
{
ViaISAState *s = VIA_ISA(d);
- DeviceState *dev = DEVICE(d);
- ISABus *isa_bus;
- qemu_irq *isa_irq;
- int i;
- qdev_init_gpio_out(dev, &s->cpu_intr, 1);
- isa_irq = qemu_allocate_irqs(via_isa_request_i8259_irq, s, 1);
- isa_bus = isa_bus_new(dev, get_system_memory(), pci_address_space_io(d),
- &error_fatal);
- isa_bus_irqs(isa_bus, i8259_init(isa_bus, *isa_irq));
- i8254_pit_init(isa_bus, 0x40, 0, NULL);
- i8257_dma_init(isa_bus, 0);
- s->via_sio = VIA_SUPERIO(isa_create_simple(isa_bus, TYPE_VT8231_SUPERIO));
- mc146818_rtc_init(isa_bus, 2000, NULL);
-
- for (i = 0; i < PCI_CONFIG_HEADER_SIZE; i++) {
- if (i < PCI_COMMAND || i >= PCI_REVISION_ID) {
- d->wmask[i] = 0;
- }
- }
+ via_isa_realize(d, errp);
+ s->via_sio = VIA_SUPERIO(isa_create_simple(s->isa_bus,
+ TYPE_VT8231_SUPERIO));
}
static void vt8231_class_init(ObjectClass *klass, void *data)
--
2.31.1
- [PULL 05/17] target/mips: Remove unused register from MSA 2R/2RF instruction format, (continued)
- [PULL 05/17] target/mips: Remove unused register from MSA 2R/2RF instruction format, Philippe Mathieu-Daudé, 2021/10/17
- [PULL 06/17] target/mips: Use tcg_constant_i32() in gen_msa_elm_df(), Philippe Mathieu-Daudé, 2021/10/17
- [PULL 07/17] target/mips: Use tcg_constant_i32() in gen_msa_2rf(), Philippe Mathieu-Daudé, 2021/10/17
- [PULL 09/17] target/mips: Use tcg_constant_i32() in gen_msa_3rf(), Philippe Mathieu-Daudé, 2021/10/17
- [PULL 10/17] target/mips: Use explicit extract32() calls in gen_msa_i5(), Philippe Mathieu-Daudé, 2021/10/17
- [PULL 08/17] target/mips: Use tcg_constant_i32() in gen_msa_2r(), Philippe Mathieu-Daudé, 2021/10/17
- [PULL 11/17] target/mips: Use tcg_constant_tl() in gen_compute_compact_branch(), Philippe Mathieu-Daudé, 2021/10/17
- [PULL 12/17] target/mips: Fix DEXTRV_S.H DSP opcode, Philippe Mathieu-Daudé, 2021/10/17
- [PULL 13/17] target/mips: Remove unused TCG temporary in gen_mipsdsp_accinsn(), Philippe Mathieu-Daudé, 2021/10/17
- [PULL 14/17] via-ide: Set user_creatable to false, Philippe Mathieu-Daudé, 2021/10/17
- [PULL 15/17] vt82c686: Move common code to via_isa_realize,
Philippe Mathieu-Daudé <=
- [PULL 16/17] vt82c686: Add a method to VIA_ISA to raise ISA interrupts, Philippe Mathieu-Daudé, 2021/10/17
- [PULL 17/17] via-ide: Avoid using isa_get_irq(), Philippe Mathieu-Daudé, 2021/10/17
- Re: [PULL 00/17] MIPS patches for 2021-10-18, Richard Henderson, 2021/10/18