hw: remove pio_addr_t

pio_addr_t is almost unused, because these days I/O ports are simply
accessed through the address space.  cpu_{in,out}[bwl] themselves are
almost unused; monitor.c and xen-hvm.c could use address_space_read/write
directly, since they have an integer size at hand.  This leaves qtest as
the only user of those functions.

On the other hand even portio_* functions use this type; the only
interesting use of pio_addr_t thus is include/hw/sysbus.h.  I guess I
could move it there, but I don't see much benefit in that either.  Using
uint32_t is enough and avoids the need to include ioport.h everywhere.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2016-03-16 10:20:34 +01:00
parent 63c915526d
commit 89a80e7400
5 changed files with 20 additions and 23 deletions

View file

@ -55,14 +55,14 @@ const MemoryRegionOps unassigned_io_ops = {
.endianness = DEVICE_NATIVE_ENDIAN,
};
void cpu_outb(pio_addr_t addr, uint8_t val)
void cpu_outb(uint32_t addr, uint8_t val)
{
trace_cpu_out(addr, 'b', val);
address_space_write(&address_space_io, addr, MEMTXATTRS_UNSPECIFIED,
&val, 1);
}
void cpu_outw(pio_addr_t addr, uint16_t val)
void cpu_outw(uint32_t addr, uint16_t val)
{
uint8_t buf[2];
@ -72,7 +72,7 @@ void cpu_outw(pio_addr_t addr, uint16_t val)
buf, 2);
}
void cpu_outl(pio_addr_t addr, uint32_t val)
void cpu_outl(uint32_t addr, uint32_t val)
{
uint8_t buf[4];
@ -82,7 +82,7 @@ void cpu_outl(pio_addr_t addr, uint32_t val)
buf, 4);
}
uint8_t cpu_inb(pio_addr_t addr)
uint8_t cpu_inb(uint32_t addr)
{
uint8_t val;
@ -92,7 +92,7 @@ uint8_t cpu_inb(pio_addr_t addr)
return val;
}
uint16_t cpu_inw(pio_addr_t addr)
uint16_t cpu_inw(uint32_t addr)
{
uint8_t buf[2];
uint16_t val;
@ -103,7 +103,7 @@ uint16_t cpu_inw(pio_addr_t addr)
return val;
}
uint32_t cpu_inl(pio_addr_t addr)
uint32_t cpu_inl(uint32_t addr)
{
uint8_t buf[4];
uint32_t val;