[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 07/11] hw/isa: Reorder to separate ISABus* vs ISADevice* function
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 07/11] hw/isa: Reorder to separate ISABus* vs ISADevice* functions |
Date: |
Fri, 10 Feb 2023 17:37:40 +0100 |
Separate functions taking an ISABus* argument versus
functions taking a ISADevice* one.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
include/hw/isa/isa.h | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h
index 25acd5c34c..e81cd33e3c 100644
--- a/include/hw/isa/isa.h
+++ b/include/hw/isa/isa.h
@@ -74,12 +74,8 @@ struct ISADevice {
ISABus *isa_bus_new(DeviceState *dev, MemoryRegion *address_space,
MemoryRegion *address_space_io, Error **errp);
void isa_bus_irqs(ISABus *bus, qemu_irq *irqs);
-qemu_irq isa_get_irq(ISADevice *dev, unsigned isairq);
-void isa_connect_gpio_out(ISADevice *isadev, int gpioirq, unsigned isairq);
void isa_bus_dma(ISABus *bus, IsaDma *dma8, IsaDma *dma16);
IsaDma *isa_get_dma(ISABus *bus, int nchan);
-MemoryRegion *isa_address_space(ISADevice *dev);
-MemoryRegion *isa_address_space_io(ISADevice *dev);
ISADevice *isa_new(const char *name);
ISADevice *isa_try_new(const char *name);
bool isa_realize_and_unref(ISADevice *dev, ISABus *bus, Error **errp);
@@ -87,6 +83,11 @@ ISADevice *isa_create_simple(ISABus *bus, const char *name);
ISADevice *isa_vga_init(ISABus *bus);
+qemu_irq isa_get_irq(ISADevice *dev, unsigned isairq);
+void isa_connect_gpio_out(ISADevice *isadev, int gpioirq, unsigned isairq);
+MemoryRegion *isa_address_space(ISADevice *dev);
+MemoryRegion *isa_address_space_io(ISADevice *dev);
+
/**
* isa_register_ioport: Install an I/O port region on the ISA bus.
*
--
2.38.1
- Re: [PATCH 01/11] hw/intc/i8259: Document i8259_init(), (continued)
- [PATCH 02/11] hw/isa/i82378: Rename output IRQ as 'cpu_intr', Philippe Mathieu-Daudé, 2023/02/10
- [PATCH 03/11] hw/isa/i82378: Remove intermediate IRQ forwarder, Philippe Mathieu-Daudé, 2023/02/10
- [PATCH 04/11] hw/isa/vt82c686: Remove intermediate IRQ forwarder, Philippe Mathieu-Daudé, 2023/02/10
- [PATCH 05/11] hw/mips/jazz: Rename ISA input IRQs as 'isa_irqs_in', Philippe Mathieu-Daudé, 2023/02/10
- [PATCH 06/11] hw/sparc64/sun4u: Keep reference to ISA input IRQs in EbusState, Philippe Mathieu-Daudé, 2023/02/10
- [PATCH 07/11] hw/isa: Reorder to separate ISABus* vs ISADevice* functions,
Philippe Mathieu-Daudé <=
- [PATCH 08/11] hw/isa: Un-inline isa_bus_from_device(), Philippe Mathieu-Daudé, 2023/02/10
- [PATCH 09/11] hw/isa: Rename isa_bus_irqs() -> isa_bus_register_input_irqs(), Philippe Mathieu-Daudé, 2023/02/10
- [PATCH 10/11] hw/isa: Use isa_address_space_io() to reduce access on global 'isabus', Philippe Mathieu-Daudé, 2023/02/10
- [PATCH 11/11] hw/isa: Factor isa_bus_get_irq() out of isa_get_irq(), Philippe Mathieu-Daudé, 2023/02/10