@@ -291,8 +291,8 @@ static void adlib_realizefn (DeviceState *dev, Error **errp)
adlib_portio_list[0].offset = s->port;
adlib_portio_list[1].offset = s->port + 8;
- portio_list_init (&s->port_list, OBJECT(s), adlib_portio_list, s, "adlib");
- portio_list_add (&s->port_list, isa_address_space_io(&s->parent_obj), 0);
+ portio_list_register(&s->port_list, OBJECT(s), adlib_portio_list, s,
+ "adlib", isa_address_space_io(&s->parent_obj), 0);
}
static Property adlib_properties[] = {
@@ -2313,7 +2313,7 @@ void vga_init(VGACommonState *s, Object *obj, MemoryRegion *address_space,
s, "vga", address_space_io, 0x3b0);
}
if (vbe_ports) {
- portio_list_init(&s->vbe_port_list, obj, vbe_ports, s, "vbe");
- portio_list_add(&s->vbe_port_list, address_space_io, 0x1ce);
+ portio_list_register(&s->vbe_port_list, obj, vbe_ports, s,
+ "vbe", address_space_io, 0x1ce);
}
}
@@ -131,10 +131,9 @@ static void i82374_realize(DeviceState *dev, Error **errp)
}
i8257_dma_init(isa_bus, true);
- portio_list_init(&s->port_list, OBJECT(s), i82374_portio_list, s,
- "i82374");
- portio_list_add(&s->port_list, isa_address_space_io(&s->parent_obj),
- s->iobase);
+ portio_list_register(&s->port_list, OBJECT(s), i82374_portio_list, s,
+ "i82374", isa_address_space_io(&s->parent_obj),
+ s->iobase);
memset(s->commands, 0, sizeof(s->commands));
}
@@ -123,8 +123,6 @@ int isa_register_portio_list(ISADevice *dev,
const MemoryRegionPortio *pio_start,
void *opaque, const char *name)
{
- assert(piolist && !piolist->owner);
-
if (!isabus) {
return -ENODEV;
}
@@ -134,8 +132,8 @@ int isa_register_portio_list(ISADevice *dev,
actually handled e.g. the FDC device. */
isa_init_ioport(dev, start);
- portio_list_init(piolist, OBJECT(dev), pio_start, opaque, name);
- portio_list_add(piolist, isabus->address_space_io, start);
+ portio_list_register(piolist, OBJECT(dev), pio_start, opaque, name,
+ isabus->address_space_io, start);
return 0;
}
@@ -115,8 +115,8 @@ static void wdt_ib700_realize(DeviceState *dev, Error **errp)
s->timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, ib700_timer_expired, s);
- portio_list_init(&s->port_list, OBJECT(s), wdt_portio_list, s, "ib700");
- portio_list_add(&s->port_list, isa_address_space_io(&s->parent_obj), 0);
+ portio_list_register(&s->port_list, OBJECT(s), wdt_portio_list, s,
+ "ib700", isa_address_space_io(&s->parent_obj), 0);
}
static void wdt_ib700_reset(DeviceState *dev)
@@ -62,17 +62,15 @@ typedef struct PortioList {
bool flush_coalesced_mmio;
} PortioList;
-void portio_list_init(PortioList *piolist, Object *owner,
- const struct MemoryRegionPortio *callbacks,
- void *opaque, const char *name);
+void portio_list_register(PortioList *piolist, Object *owner,
+ const MemoryRegionPortio *callbacks,
+ void *opaque, const char *name,
+ MemoryRegion *mr, uint32_t offset);
void portio_list_register_flush_coalesced(PortioList *piolist, Object *owner,
const MemoryRegionPortio *callbacks,
void *opaque, const char *name,
MemoryRegion *mr, uint32_t offset);
void portio_list_destroy(PortioList *piolist);
-void portio_list_add(PortioList *piolist,
- struct MemoryRegion *address_space,
- uint32_t addr);
void portio_list_del(PortioList *piolist);
#endif /* IOPORT_H */
@@ -113,10 +113,9 @@ uint32_t cpu_inl(uint32_t addr)
return val;
}
-void portio_list_init(PortioList *piolist,
- Object *owner,
- const MemoryRegionPortio *callbacks,
- void *opaque, const char *name)
+static void portio_list_init(PortioList *piolist, Object *owner,
+ const MemoryRegionPortio *callbacks,
+ void *opaque, const char *name)
{
unsigned n = 0;
@@ -246,9 +245,8 @@ static void portio_list_add_1(PortioList *piolist,
++piolist->nr;
}
-void portio_list_add(PortioList *piolist,
- MemoryRegion *address_space,
- uint32_t start)
+static void portio_list_add(PortioList *piolist, MemoryRegion *address_space,
+ uint32_t start)
{
const MemoryRegionPortio *pio, *pio_start = piolist->ports;
unsigned int off_low, off_high, off_last, count;
@@ -314,3 +312,12 @@ void portio_list_register_flush_coalesced(PortioList *piolist, Object *owner,
do_portio_list_register(piolist, owner, callbacks,
opaque, name, mr, offset, true);
}
+
+void portio_list_register(PortioList *piolist, Object *owner,
+ const MemoryRegionPortio *callbacks,
+ void *opaque, const char *name,
+ MemoryRegion *mr, uint32_t offset)
+{
+ do_portio_list_register(piolist, owner, callbacks,
+ opaque, name, mr, offset, false);
+}
We always follow the same pattern when registering non-coalesced portio: - portio_list_init() - portio_list_add() Factor these 2 operations in a single helper named portio_list_register(). Since both calls become local to ioport.c, reduce their scope by declaring them static. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- hw/audio/adlib.c | 4 ++-- hw/display/vga.c | 4 ++-- hw/dma/i82374.c | 7 +++---- hw/isa/isa-bus.c | 6 ++---- hw/watchdog/wdt_ib700.c | 4 ++-- include/exec/ioport.h | 10 ++++------ softmmu/ioport.c | 21 ++++++++++++++------- 7 files changed, 29 insertions(+), 27 deletions(-)