[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 08/11] hw/isa/piix3: Move pci_map_irq_fn near pci_set_irq_fn
From: |
Bernhard Beschow |
Subject: |
[PATCH v4 08/11] hw/isa/piix3: Move pci_map_irq_fn near pci_set_irq_fn |
Date: |
Fri, 3 Jun 2022 20:50:42 +0200 |
The pci_map_irq_fn was implemented below type_init() which made it
inaccessible to QOM functions. So move it up.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/isa/piix3.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/hw/isa/piix3.c b/hw/isa/piix3.c
index d96ce2b788..c7a9014c3f 100644
--- a/hw/isa/piix3.c
+++ b/hw/isa/piix3.c
@@ -78,6 +78,17 @@ static void piix3_set_irq(void *opaque, int pirq, int level)
piix3_set_irq_level(piix3, pirq, level);
}
+/*
+ * Return the global irq number corresponding to a given device irq
+ * pin. We could also use the bus number to have a more precise mapping.
+ */
+static int pci_slot_get_pirq(PCIDevice *pci_dev, int pci_intx)
+{
+ int slot_addend;
+ slot_addend = PCI_SLOT(pci_dev->devfn) - 1;
+ return (pci_intx + slot_addend) & 3;
+}
+
static PCIINTxRoute piix3_route_intx_pin_to_irq(void *opaque, int pin)
{
PIIX3State *piix3 = opaque;
@@ -350,17 +361,6 @@ static void piix3_register_types(void)
type_init(piix3_register_types)
-/*
- * Return the global irq number corresponding to a given device irq
- * pin. We could also use the bus number to have a more precise mapping.
- */
-static int pci_slot_get_pirq(PCIDevice *pci_dev, int pci_intx)
-{
- int slot_addend;
- slot_addend = PCI_SLOT(pci_dev->devfn) - 1;
- return (pci_intx + slot_addend) & 3;
-}
-
PIIX3State *piix3_create(PCIBus *pci_bus, ISABus **isa_bus)
{
PIIX3State *piix3;
--
2.36.1
- [PATCH v4 00/11] QOM'ify PIIX southbridge creation, Bernhard Beschow, 2022/06/03
- [PATCH v4 02/11] hw/isa/piix4: Use object_initialize_child() for embedded struct, Bernhard Beschow, 2022/06/03
- [PATCH v4 01/11] hw/southbridge/piix: Aggregate all PIIX southbridge type names, Bernhard Beschow, 2022/06/03
- [PATCH v4 04/11] hw/isa/piix4: QOM'ify PCI device creation and wiring, Bernhard Beschow, 2022/06/03
- [PATCH v4 05/11] hw/isa/piix4: Factor out ISABus retrieval from piix4_create(), Bernhard Beschow, 2022/06/03
- [PATCH v4 03/11] hw/isa/piix4: Move pci_map_irq_fn' near pci_set_irq_fn, Bernhard Beschow, 2022/06/03
- [PATCH v4 06/11] hw/isa/piix4: QOM'ify PIIX4 PM creation, Bernhard Beschow, 2022/06/03
- [PATCH v4 08/11] hw/isa/piix3: Move pci_map_irq_fn near pci_set_irq_fn,
Bernhard Beschow <=
- [PATCH v4 09/11] hw/isa/piix3: QOM'ify PCI device creation and wiring, Bernhard Beschow, 2022/06/03
- [PATCH v4 07/11] hw/isa/piix4: Inline and remove piix4_create(), Bernhard Beschow, 2022/06/03
- [PATCH v4 10/11] hw/isa/piix3: Factor out ISABus retrieval from piix3_create(), Bernhard Beschow, 2022/06/03
- [PATCH v4 11/11] hw/isa/piix3: Inline and remove piix3_create(), Bernhard Beschow, 2022/06/03
- Re: [PATCH v4 00/11] QOM'ify PIIX southbridge creation, Mark Cave-Ayland, 2022/06/06
- Re: [PATCH v4 00/11] QOM'ify PIIX southbridge creation, Philippe Mathieu-Daudé, 2022/06/11