[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC v4 20/58] usb-ohci: convert to MemoryRegion
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [RFC v4 20/58] usb-ohci: convert to MemoryRegion |
Date: |
Sun, 17 Jul 2011 14:13:47 +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 1c29b9f..36885cb 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;
@@ -1426,13 +1426,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");
@@ -1549,11 +1549,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) {
@@ -1685,18 +1686,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 = {
@@ -1731,8 +1724,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, "ohci", 256);
ohci->localmem_base = localmem_base;
ohci->name = dev->info->name;
@@ -1767,7 +1759,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;
}
@@ -1789,7 +1781,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 v4 55/58] pci: convert pci rom to memory API, (continued)
- [Qemu-devel] [RFC v4 55/58] pci: convert pci rom to memory API, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 40/58] virtio-pci: convert to memory API, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 22/58] vmsvga: don't remember pci BAR address in callback any more, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 43/58] lsi53c895a: convert to memory API, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 36/58] eepro100: convert to memory API, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 06/58] memory: rename MemoryRegion::has_ram_addr to ::terminates, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 01/58] Hierarchical memory region API, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 42/58] intel-hda: convert to memory API, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 47/58] i6300esb: convert to memory API, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 28/58] cirrus: simplify linear framebuffer access functions, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 20/58] usb-ohci: convert to MemoryRegion,
Avi Kivity <=
- [Qemu-devel] [RFC v4 08/58] memory: I/O address space support, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 54/58] pci: remove pci_register_bar_simple(), Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 50/58] ehci: convert to memory API, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 29/58] Integrate I/O memory regions into qemu, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 19/58] sysbus: add MemoryRegion based memory management API, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 14/58] pc: grab system_memory, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 53/58] msix: convert to memory API, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 27/58] vga: simplify vga window mmio access functions, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 26/58] cirrus: simplify vga window mmio access functions, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 34/58] ac97: convert to memory API, Avi Kivity, 2011/07/17