SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

isa: Remove isa_init_ioport_range and isa_init_ioport

Browse Source 
All users have been converted to either isa_register_ioport
or isa_register_old_portio_list.

Signed-off-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Richard Henderson 2011-08-16 09:02:36 -07:00 committed by Avi Kivity
parent 4a91d3b337
commit 0d95952453
2 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hw/isa-bus.c
View File

@ -83,24 +83,17 @@ void isa_init_irq(ISADevice *dev, qemu_irq *p, int isairq)
dev->nirqs++; 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) { if (dev && (dev->ioport_id == 0 || ioport < dev->ioport_id)) {
dev->ioport_id = start; 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) void isa_register_ioport(ISADevice *dev, MemoryRegion *io, uint16_t start)
{ {
memory_region_add_subregion(isabus->address_space_io, start, io); 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_portio_list(ISADevice *dev, uint16_t start, void isa_register_portio_list(ISADevice *dev, uint16_t start,
@ -112,9 +105,7 @@ void isa_register_portio_list(ISADevice *dev, uint16_t start,
/* START is how we should treat DEV, regardless of the actual /* START is how we should treat DEV, regardless of the actual
contents of the portio array. This is how the old code contents of the portio array. This is how the old code
actually handled e.g. the FDC device. */ actually handled e.g. the FDC device. */
if (dev) { isa_init_ioport(dev, start);
isa_init_ioport(dev, start);
}
portio_list_init(piolist, pio_start, opaque, name); portio_list_init(piolist, pio_start, opaque, name);
portio_list_add(piolist, isabus->address_space_io, start); portio_list_add(piolist, isabus->address_space_io, start);

2
hw/isa.h
View File

@ -28,8 +28,6 @@ ISABus *isa_bus_new(DeviceState *dev, MemoryRegion *address_space_io);
void isa_bus_irqs(qemu_irq *irqs); void isa_bus_irqs(qemu_irq *irqs);
qemu_irq isa_get_irq(int isairq); qemu_irq isa_get_irq(int isairq);
void isa_init_irq(ISADevice *dev, qemu_irq *p, 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); void isa_qdev_register(ISADeviceInfo *info);
MemoryRegion *isa_address_space(ISADevice *dev); MemoryRegion *isa_address_space(ISADevice *dev);
ISADevice *isa_create(const char *name); ISADevice *isa_create(const char *name);