[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 14/14] isa: Remove isa_init_ioport_range and isa_ini
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH 14/14] isa: Remove isa_init_ioport_range and isa_init_ioport. |
Date: |
Tue, 16 Aug 2011 09:45:45 -0700 |
All users have been converted to either isa_register_ioport
or isa_register_old_portio_list.
Signed-off-by: Richard Henderson <address@hidden>
---
hw/isa-bus.c | 19 +++++--------------
hw/isa.h | 2 --
2 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/hw/isa-bus.c b/hw/isa-bus.c
index d8e1880..f6ab1eb 100644
--- a/hw/isa-bus.c
+++ b/hw/isa-bus.c
@@ -84,24 +84,17 @@ void isa_init_irq(ISADevice *dev, qemu_irq *p, int isairq)
dev->nirqs++;
}
-void isa_init_ioport_range(ISADevice *dev, uint16_t start, uint16_t length)
+static inline void isa_init_ioport(ISADevice *dev, uint16_t ioport)
{
- if (dev->ioport_id == 0 || start < dev->ioport_id) {
- dev->ioport_id = start;
+ if (dev && (dev->ioport_id == 0 || ioport < dev->ioport_id)) {
+ dev->ioport_id = ioport;
}
}
-void isa_init_ioport(ISADevice *dev, uint16_t ioport)
-{
- isa_init_ioport_range(dev, ioport, 1);
-}
-
void isa_register_ioport(ISADevice *dev, MemoryRegion *io, uint16_t start)
{
memory_region_add_subregion(isabus->address_space_io, start, io);
- if (dev != NULL) {
- isa_init_ioport(dev, start);
- }
+ isa_init_ioport(dev, start);
}
void isa_register_old_portio_list(ISADevice *dev, uint16_t start,
@@ -114,9 +107,7 @@ void isa_register_old_portio_list(ISADevice *dev, uint16_t
start,
/* START is how we should treat DEV, regardless of the actual
contents of the portio array. This is how the old code
actually handled e.g. the FDC device. */
- if (dev) {
- isa_init_ioport(dev, start);
- }
+ isa_init_ioport(dev, start);
for (; pio_start->size != 0; pio_start = pio_iter + 1) {
unsigned int off_low = UINT_MAX, off_high = 0;
diff --git a/hw/isa.h b/hw/isa.h
index 117d8b0..49ec181 100644
--- a/hw/isa.h
+++ b/hw/isa.h
@@ -28,8 +28,6 @@ ISABus *isa_bus_new(DeviceState *dev, MemoryRegion
*address_space_io);
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);
-void isa_init_ioport(ISADevice *dev, uint16_t ioport);
-void isa_init_ioport_range(ISADevice *dev, uint16_t start, uint16_t length);
void isa_qdev_register(ISADeviceInfo *info);
MemoryRegion *isa_address_space(ISADevice *dev);
ISADevice *isa_create(const char *name);
--
1.7.6
- Re: [Qemu-devel] [PATCH 02/14] isa: Add isa_register_old_portio_list()., (continued)
- [Qemu-devel] [PATCH 04/14] gus: Convert to isa_register_old_portio_list., Richard Henderson, 2011/08/16
- [Qemu-devel] [PATCH 07/14] ne2000: Convert to isa_register_ioport., Richard Henderson, 2011/08/16
- [Qemu-devel] [PATCH 06/14] rtc: Convert to isa_register_ioport., Richard Henderson, 2011/08/16
- [Qemu-devel] [PATCH 10/14] vga: Convert to isa_register_old_portio_list., Richard Henderson, 2011/08/16
- [Qemu-devel] [PATCH 05/14] m48t59: Convert to isa_register_ioport., Richard Henderson, 2011/08/16
- [Qemu-devel] [PATCH 11/14] pc: Convert port92 to isa_register_ioport., Richard Henderson, 2011/08/16
- [Qemu-devel] [PATCH 12/14] vmport: Convert to isa_register_ioport., Richard Henderson, 2011/08/16
- [Qemu-devel] [PATCH 14/14] isa: Remove isa_init_ioport_range and isa_init_ioport.,
Richard Henderson <=
- [Qemu-devel] [PATCH 08/14] parallel: Convert to isa_register_old_portio_list., Richard Henderson, 2011/08/16
- [Qemu-devel] [PATCH 09/14] sb16: Convert to isa_register_old_portio_list., Richard Henderson, 2011/08/16
- [Qemu-devel] [PATCH 13/14] ide: Convert to isa_register_old_portio_list., Richard Henderson, 2011/08/16
- [Qemu-devel] [PATCH 03/14] fdc: Convert to isa_register_old_portio_list., Richard Henderson, 2011/08/16