[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC v5 22/86] usb-ohci: convert to MemoryRegion
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [RFC v5 22/86] usb-ohci: convert to MemoryRegion |
Date: |
Wed, 20 Jul 2011 19:49:32 +0300 |
Signed-off-by: Avi Kivity <address@hidden>
---
hw/usb-ohci.c | 42 +++++++++++++++++-------------------------
1 files changed, 17 insertions(+), 25 deletions(-)
diff --git a/hw/usb-ohci.c b/hw/usb-ohci.c
index 8491d59..337b250 100644
--- a/hw/usb-ohci.c
+++ b/hw/usb-ohci.c
@@ -62,7 +62,7 @@ typedef struct OHCIPort {
typedef struct {
USBBus bus;
qemu_irq irq;
- int mem;
+ MemoryRegion mem;
int num_ports;
const char *name;
@@ -1440,13 +1440,13 @@ static void ohci_port_set_status(OHCIState *ohci, int
portnum, uint32_t val)
return;
}
-static uint32_t ohci_mem_read(void *ptr, target_phys_addr_t addr)
+static uint64_t ohci_mem_read(void *opaque,
+ target_phys_addr_t addr,
+ unsigned size)
{
- OHCIState *ohci = ptr;
+ OHCIState *ohci = opaque;
uint32_t retval;
- addr &= 0xff;
-
/* Only aligned reads are allowed on OHCI */
if (addr & 3) {
fprintf(stderr, "usb-ohci: Mis-aligned read\n");
@@ -1563,11 +1563,12 @@ static uint32_t ohci_mem_read(void *ptr,
target_phys_addr_t addr)
return retval;
}
-static void ohci_mem_write(void *ptr, target_phys_addr_t addr, uint32_t val)
+static void ohci_mem_write(void *opaque,
+ target_phys_addr_t addr,
+ uint64_t val,
+ unsigned size)
{
- OHCIState *ohci = ptr;
-
- addr &= 0xff;
+ OHCIState *ohci = opaque;
/* Only aligned reads are allowed on OHCI */
if (addr & 3) {
@@ -1697,18 +1698,10 @@ static void ohci_async_cancel_device(OHCIState *ohci,
USBDevice *dev)
}
}
-/* Only dword reads are defined on OHCI register space */
-static CPUReadMemoryFunc * const ohci_readfn[3]={
- ohci_mem_read,
- ohci_mem_read,
- ohci_mem_read
-};
-
-/* Only dword writes are defined on OHCI register space */
-static CPUWriteMemoryFunc * const ohci_writefn[3]={
- ohci_mem_write,
- ohci_mem_write,
- ohci_mem_write
+static const MemoryRegionOps ohci_mem_ops = {
+ .read = ohci_mem_read,
+ .write = ohci_mem_write,
+ .endianness = DEVICE_LITTLE_ENDIAN,
};
static USBPortOps ohci_port_ops = {
@@ -1764,8 +1757,7 @@ static int usb_ohci_init(OHCIState *ohci, DeviceState
*dev,
}
}
- ohci->mem = cpu_register_io_memory(ohci_readfn, ohci_writefn, ohci,
- DEVICE_LITTLE_ENDIAN);
+ memory_region_init_io(&ohci->mem, &ohci_mem_ops, ohci, "ohci", 256);
ohci->localmem_base = localmem_base;
ohci->name = dev->info->name;
@@ -1799,7 +1791,7 @@ static int usb_ohci_initfn_pci(struct PCIDevice *dev)
ohci->state.irq = ohci->pci_dev.irq[0];
/* TODO: avoid cast below by using dev */
- pci_register_bar_simple(&ohci->pci_dev, 0, 256, 0, ohci->state.mem);
+ pci_register_bar_region(&ohci->pci_dev, 0, 0, &ohci->state.mem);
return 0;
}
@@ -1822,7 +1814,7 @@ static int ohci_init_pxa(SysBusDevice *dev)
/* Cannot fail as we pass NULL for masterbus */
usb_ohci_init(&s->ohci, &dev->qdev, s->num_ports, s->dma_offset, NULL, 0);
sysbus_init_irq(dev, &s->ohci.irq);
- sysbus_init_mmio(dev, 0x1000, s->ohci.mem);
+ sysbus_init_mmio_region(dev, &s->ohci.mem);
return 0;
}
--
1.7.5.3
- [Qemu-devel] [RFC v5 83/86] isa: add isa_address_space(), (continued)
- [Qemu-devel] [RFC v5 83/86] isa: add isa_address_space(), Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 26/86] cirrus: simplify mmio BAR access functions, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 25/86] vga: convert vga and its derivatives to the memory API, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 12/86] memory: add ioeventfd support, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 19/86] pci: pass address space to pci bus when created, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 52/86] ehci: convert to memory API, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 68/86] armv7m: convert to memory API, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 54/86] xen-platform: convert to memory API, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 22/86] usb-ohci: convert to MemoryRegion,
Avi Kivity <=
- [Qemu-devel] [RFC v5 35/86] rtl8139: convert to memory API, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 57/86] pci: convert pci rom to memory API, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 64/86] apic: convert to memory API, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 65/86] arm_gic: convert to memory API, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 61/86] pci: remove support for pre memory API BARs, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 45/86] lsi53c895a: convert to memory API, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 63/86] apb_pci: convert to memory API, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 86/86] 440fx: fix PAM, PCI holes, Avi Kivity, 2011/07/20