OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/core/sysbus.c
View File

@ -190,9 +190,9 @@ MemoryRegion *sysbus_mmio_get_region(SysBusDevice *dev, int n)
return dev->mmio[n].memory; return dev->mmio[n].memory;
} }
void sysbus_init_ioports(SysBusDevice *dev, pio_addr_t ioport, pio_addr_t size) void sysbus_init_ioports(SysBusDevice *dev, uint32_t ioport, uint32_t size)
{ {
pio_addr_t i; uint32_t i;
for (i = 0; i < size; i++) { for (i = 0; i < size; i++) {
assert(dev->num_pio < QDEV_MAX_PIO); assert(dev->num_pio < QDEV_MAX_PIO);

15
include/exec/ioport.h
View File

@ -28,9 +28,6 @@
#include "qom/object.h" #include "qom/object.h"
#include "exec/memory.h" #include "exec/memory.h"
typedef uint32_t pio_addr_t;
#define FMT_pioaddr PRIx32
#define MAX_IOPORTS (64 * 1024) #define MAX_IOPORTS (64 * 1024)
#define IOPORTS_MASK (MAX_IOPORTS - 1) #define IOPORTS_MASK (MAX_IOPORTS - 1)
@ -49,12 +46,12 @@ typedef struct MemoryRegionPortio {
extern const MemoryRegionOps unassigned_io_ops; extern const MemoryRegionOps unassigned_io_ops;
#endif #endif
void cpu_outb(pio_addr_t addr, uint8_t val); void cpu_outb(uint32_t addr, uint8_t val);
void cpu_outw(pio_addr_t addr, uint16_t val); void cpu_outw(uint32_t addr, uint16_t val);
void cpu_outl(pio_addr_t addr, uint32_t val); void cpu_outl(uint32_t addr, uint32_t val);
uint8_t cpu_inb(pio_addr_t addr); uint8_t cpu_inb(uint32_t addr);
uint16_t cpu_inw(pio_addr_t addr); uint16_t cpu_inw(uint32_t addr);
uint32_t cpu_inl(pio_addr_t addr); uint32_t cpu_inl(uint32_t addr);
typedef struct PortioList { typedef struct PortioList {
const struct MemoryRegionPortio *ports; const struct MemoryRegionPortio *ports;

4
include/hw/sysbus.h
View File

@ -72,7 +72,7 @@ struct SysBusDevice {
MemoryRegion *memory; MemoryRegion *memory;
} mmio[QDEV_MAX_MMIO]; } mmio[QDEV_MAX_MMIO];
int num_pio; int num_pio;
pio_addr_t pio[QDEV_MAX_PIO]; uint32_t pio[QDEV_MAX_PIO];
}; };
typedef int FindSysbusDeviceFunc(SysBusDevice *sbdev, void *opaque); typedef int FindSysbusDeviceFunc(SysBusDevice *sbdev, void *opaque);
@ -81,7 +81,7 @@ void sysbus_init_mmio(SysBusDevice *dev, MemoryRegion *memory);
MemoryRegion *sysbus_mmio_get_region(SysBusDevice *dev, int n); MemoryRegion *sysbus_mmio_get_region(SysBusDevice *dev, int n);
void sysbus_init_irq(SysBusDevice *dev, qemu_irq *p); void sysbus_init_irq(SysBusDevice *dev, qemu_irq *p);
void sysbus_pass_irq(SysBusDevice *dev, SysBusDevice *target); void sysbus_pass_irq(SysBusDevice *dev, SysBusDevice *target);
void sysbus_init_ioports(SysBusDevice *dev, pio_addr_t ioport, pio_addr_t size); void sysbus_init_ioports(SysBusDevice *dev, uint32_t ioport, uint32_t size);
bool sysbus_has_irq(SysBusDevice *dev, int n); bool sysbus_has_irq(SysBusDevice *dev, int n);

12
ioport.c
View File

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

8
xen-hvm.c
View File

@ -726,7 +726,7 @@ static ioreq_t *cpu_get_ioreq(XenIOState *state)
return NULL; return NULL;
} }
static uint32_t do_inp(pio_addr_t addr, unsigned long size) static uint32_t do_inp(uint32_t addr, unsigned long size)
{ {
switch (size) { switch (size) {
case 1: case 1:
@ -736,11 +736,11 @@ static uint32_t do_inp(pio_addr_t addr, unsigned long size)
case 4: case 4:
return cpu_inl(addr); return cpu_inl(addr);
default: default:
hw_error("inp: bad size: %04"FMT_pioaddr" %lx", addr, size); hw_error("inp: bad size: %04x %lx", addr, size);
} }
} }
static void do_outp(pio_addr_t addr, static void do_outp(uint32_t addr,
unsigned long size, uint32_t val) unsigned long size, uint32_t val)
{ {
switch (size) { switch (size) {
@ -751,7 +751,7 @@ static void do_outp(pio_addr_t addr,
case 4: case 4:
return cpu_outl(addr, val); return cpu_outl(addr, val);
default: default:
hw_error("outp: bad size: %04"FMT_pioaddr" %lx", addr, size); hw_error("outp: bad size: %04x %lx", addr, size);
} }
} }