@@ -4,6 +4,7 @@
/* ISA bus */
#include "ioport.h"
+#include "memory.h"
#include "qdev.h"
typedef struct ISABus ISABus;
@@ -37,6 +38,7 @@ ISADevice *isa_create_simple(const char *name);
extern target_phys_addr_t isa_mem_base;
+void isa_mmio_setup(MemoryRegion *mr, target_phys_addr_t size);
void isa_mmio_init(target_phys_addr_t base, target_phys_addr_t size);
/* dma.c */
@@ -25,58 +25,45 @@
#include "hw.h"
#include "isa.h"
-static void isa_mmio_writeb (void *opaque, target_phys_addr_t addr,
- uint32_t val)
+static void isa_mmio_write(void *opaque, target_phys_addr_t addr,
+ uint64_t val, unsigned size)
{
- cpu_outb(addr & IOPORTS_MASK, val);
+ switch (size) {
+ case 1: return cpu_outb(addr & IOPORTS_MASK, val);
+ case 2: return cpu_outw(addr & IOPORTS_MASK, val);
+ case 4: return cpu_outl(addr & IOPORTS_MASK, val);
+ default: abort();
+ }
}
-static void isa_mmio_writew(void *opaque, target_phys_addr_t addr,
- uint32_t val)
+static uint64_t isa_mmio_read(void *opaque, target_phys_addr_t addr,
+ unsigned size)
{
- cpu_outw(addr & IOPORTS_MASK, val);
+ switch (size) {
+ case 1: cpu_inb(addr & IOPORTS_MASK);
+ case 2: cpu_inw(addr & IOPORTS_MASK);
+ case 4: cpu_inl(addr & IOPORTS_MASK);
+ default: abort();
+ }
}
-static void isa_mmio_writel(void *opaque, target_phys_addr_t addr,
- uint32_t val)
-{
- cpu_outl(addr & IOPORTS_MASK, val);
-}
-
-static uint32_t isa_mmio_readb (void *opaque, target_phys_addr_t addr)
-{
- return cpu_inb(addr & IOPORTS_MASK);
-}
-
-static uint32_t isa_mmio_readw(void *opaque, target_phys_addr_t addr)
-{
- return cpu_inw(addr & IOPORTS_MASK);
-}
+static MemoryRegionOps isa_mmio_ops = {
+ .read = isa_mmio_read,
+ .write = isa_mmio_write,
+ .endianness = DEVICE_LITTLE_ENDIAN,
+};
-static uint32_t isa_mmio_readl(void *opaque, target_phys_addr_t addr)
+void isa_mmio_setup(MemoryRegion *mr, target_phys_addr_t size)
{
- return cpu_inl(addr & IOPORTS_MASK);
+ memory_region_init_io(mr, &isa_mmio_ops, NULL, "isa-mmio", size);
}
-static CPUWriteMemoryFunc * const isa_mmio_write[] = {
- &isa_mmio_writeb,
- &isa_mmio_writew,
- &isa_mmio_writel,
-};
-
-static CPUReadMemoryFunc * const isa_mmio_read[] = {
- &isa_mmio_readb,
- &isa_mmio_readw,
- &isa_mmio_readl,
-};
+#include "exec-memory.h"
void isa_mmio_init(target_phys_addr_t base, target_phys_addr_t size)
{
- int isa_mmio_iomemtype;
+ MemoryRegion *mr = qemu_malloc(sizeof(*mr));
- isa_mmio_iomemtype = cpu_register_io_memory(isa_mmio_read,
- isa_mmio_write,
- NULL,
- DEVICE_LITTLE_ENDIAN);
- cpu_register_physical_memory(base, size, isa_mmio_iomemtype);
+ isa_mmio_setup(mr, size);
+ memory_region_add_subregion(get_system_memory(), base, mr);
}
Signed-off-by: Avi Kivity <avi@redhat.com> --- hw/isa.h | 2 + hw/isa_mmio.c | 67 +++++++++++++++++++++++---------------------------------- 2 files changed, 29 insertions(+), 40 deletions(-)