[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC v2 12/20] usb-ohci: convert to MemoryRegion
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [RFC v2 12/20] usb-ohci: convert to MemoryRegion |
Date: |
Mon, 27 Jun 2011 16:21:59 +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 5d2ae01..e6a901f 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;
@@ -1415,13 +1415,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(MemoryRegion *mem,
+ target_phys_addr_t addr,
+ unsigned size)
{
- OHCIState *ohci = ptr;
+ OHCIState *ohci = container_of(mem, OHCIState, mem);
uint32_t retval;
- addr &= 0xff;
-
/* Only aligned reads are allowed on OHCI */
if (addr & 3) {
fprintf(stderr, "usb-ohci: Mis-aligned read\n");
@@ -1538,11 +1538,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(MemoryRegion *mem,
+ target_phys_addr_t addr,
+ uint64_t val,
+ unsigned size)
{
- OHCIState *ohci = ptr;
-
- addr &= 0xff;
+ OHCIState *ohci = container_of(mem, OHCIState, mem);
/* Only aligned reads are allowed on OHCI */
if (addr & 3) {
@@ -1674,18 +1675,10 @@ static void ohci_device_destroy(USBBus *bus, 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 = {
@@ -1720,8 +1713,7 @@ static void usb_ohci_init(OHCIState *ohci, DeviceState
*dev,
usb_frame_time, usb_bit_time);
}
- ohci->mem = cpu_register_io_memory(ohci_readfn, ohci_writefn, ohci,
- DEVICE_LITTLE_ENDIAN);
+ memory_region_init_io(&ohci->mem, &ohci_mem_ops, "ohci", 256);
ohci->localmem_base = localmem_base;
ohci->name = dev->info->name;
@@ -1756,7 +1748,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;
}
@@ -1778,7 +1770,7 @@ static int ohci_init_pxa(SysBusDevice *dev)
usb_ohci_init(&s->ohci, &dev->qdev, s->num_ports, s->dma_offset);
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 v2 00/20] Memory API, Avi Kivity, 2011/06/27
- [Qemu-devel] [RFC v2 08/20] pc: move global memory map out of pc_init1() and into its callers, Avi Kivity, 2011/06/27
- [Qemu-devel] [RFC v2 18/20] cirrus: simplify vga window mmio access functions, Avi Kivity, 2011/06/27
- [Qemu-devel] [RFC v2 14/20] vmsvga: don't remember pci BAR address in callback any more, Avi Kivity, 2011/06/27
- [Qemu-devel] [RFC v2 06/20] pc: grab system_memory, Avi Kivity, 2011/06/27
- [Qemu-devel] [RFC v2 05/20] exec.c: initialize memory map, Avi Kivity, 2011/06/27
- [Qemu-devel] [RFC v2 20/20] cirrus: simplify linear framebuffer access functions, Avi Kivity, 2011/06/27
- [Qemu-devel] [RFC v2 02/20] memory: implement dirty tracking, Avi Kivity, 2011/06/27
- [Qemu-devel] [RFC v2 17/20] cirrus: simplify bitblt BAR access functions, Avi Kivity, 2011/06/27
- [Qemu-devel] [RFC v2 07/20] pc: convert pc_memory_init() to memory API, Avi Kivity, 2011/06/27
- [Qemu-devel] [RFC v2 12/20] usb-ohci: convert to MemoryRegion,
Avi Kivity <=
- [Qemu-devel] [RFC v2 09/20] pci: pass address space to pci bus when created, Avi Kivity, 2011/06/27
- [Qemu-devel] [RFC v2 16/20] cirrus: simplify mmio BAR access functions, Avi Kivity, 2011/06/27
- [Qemu-devel] [RFC v2 19/20] vga: simplify vga window mmio access functions, Avi Kivity, 2011/06/27
- [Qemu-devel] [RFC v2 15/20] vga: convert vga and its derivatives to the memory API, Avi Kivity, 2011/06/27
- [Qemu-devel] [RFC v2 03/20] memory: merge adjacent segments of a single memory region, Avi Kivity, 2011/06/27
- [Qemu-devel] [RFC v2 04/20] Internal interfaces for memory API, Avi Kivity, 2011/06/27
- [Qemu-devel] [RFC v2 01/20] Hierarchical memory region API, Avi Kivity, 2011/06/27