[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/24] isa: Tidy support code for isabus_get_fw_dev_
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH 09/24] isa: Tidy support code for isabus_get_fw_dev_path |
Date: |
Mon, 10 Oct 2011 16:59:38 +0200 |
From: Richard Henderson <address@hidden>
The only user of ISADevice.ioports is isabus_get_fw_dev_path, and it
only looks at the first entry of the array. Which suggests that this
entire array+sort operation can be replaced by a simple minimum.
Signed-off-by: Richard Henderson <address@hidden>
Signed-off-by: Avi Kivity <address@hidden>
---
hw/isa-bus.c | 25 +++++--------------------
hw/isa.h | 5 +----
2 files changed, 6 insertions(+), 24 deletions(-)
diff --git a/hw/isa-bus.c b/hw/isa-bus.c
index 6c15a31..e9c1712 100644
--- a/hw/isa-bus.c
+++ b/hw/isa-bus.c
@@ -83,24 +83,11 @@ void isa_init_irq(ISADevice *dev, qemu_irq *p, int isairq)
dev->nirqs++;
}
-static void isa_init_ioport_one(ISADevice *dev, uint16_t ioport)
-{
- assert(dev->nioports < ARRAY_SIZE(dev->ioports));
- dev->ioports[dev->nioports++] = ioport;
-}
-
-static int isa_cmp_ports(const void *p1, const void *p2)
-{
- return *(uint16_t*)p1 - *(uint16_t*)p2;
-}
-
void isa_init_ioport_range(ISADevice *dev, uint16_t start, uint16_t length)
{
- int i;
- for (i = start; i < start + length; i++) {
- isa_init_ioport_one(dev, i);
+ if (dev->ioport_id == 0 || start < dev->ioport_id) {
+ dev->ioport_id = start;
}
- qsort(dev->ioports, dev->nioports, sizeof(dev->ioports[0]), isa_cmp_ports);
}
void isa_init_ioport(ISADevice *dev, uint16_t ioport)
@@ -112,9 +99,7 @@ void isa_register_ioport(ISADevice *dev, MemoryRegion *io,
uint16_t start)
{
memory_region_add_subregion(isabus->address_space_io, start, io);
if (dev != NULL) {
- assert(dev->nio < ARRAY_SIZE(dev->io));
- dev->io[dev->nio++] = io;
- isa_init_ioport_range(dev, start, memory_region_size(io));
+ isa_init_ioport(dev, start);
}
}
@@ -208,8 +193,8 @@ static void isabus_register_devices(void)
int off;
off = snprintf(path, sizeof(path), "%s", qdev_fw_name(dev));
- if (d->nioports) {
- snprintf(path + off, sizeof(path) - off, "@%04x", d->ioports[0]);
+ if (d->ioport_id) {
+ snprintf(path + off, sizeof(path) - off, "@%04x", d->ioport_id);
}
return strdup(path);
diff --git a/hw/isa.h b/hw/isa.h
index 432d17a..c5c2618 100644
--- a/hw/isa.h
+++ b/hw/isa.h
@@ -13,12 +13,9 @@ typedef struct ISADeviceInfo ISADeviceInfo;
struct ISADevice {
DeviceState qdev;
- MemoryRegion *io[32];
uint32_t isairq[2];
- uint16_t ioports[32];
int nirqs;
- int nioports;
- int nio;
+ int ioport_id;
};
typedef int (*isa_qdev_initfn)(ISADevice *dev);
--
1.7.6.3
- [Qemu-devel] [PULL 00/24] Memory API, batch 11, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 02/24] palm: convert to memory API, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 08/24] ppc_newworld: convert to memory API, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 22/24] vmport: Convert to isa_register_ioport, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 05/24] ppc405_boards: convert to memory API, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 13/24] fdc: Convert to isa_register_portio_list, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 16/24] rtc: Convert to isa_register_ioport, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 10/24] Introduce PortioList, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 12/24] isa: Add isa_register_portio_list(), Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 09/24] isa: Tidy support code for isabus_get_fw_dev_path,
Avi Kivity <=
- [Qemu-devel] [PATCH 17/24] ne2000: Convert to isa_register_ioport, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 11/24] memory: Fix old portio word accesses, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 04/24] petalogix_s2adsp1800: convert to memory API, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 03/24] petalogix_ml605: convert to memory API, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 19/24] sb16: Convert to isa_register_portio_list, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 14/24] gus: Convert to isa_register_portio_list, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 06/24] hw/arm11mpcore: Clean up to avoid using sysbus_mmio_init_cb2, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 24/24] isa: Remove isa_init_ioport_range and isa_init_ioport, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 18/24] parallel: Convert to isa_register_portio_list, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 15/24] m48t59: Convert to isa_register_ioport, Avi Kivity, 2011/10/10