[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC v5 52/86] ehci: convert to memory API
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [RFC v5 52/86] ehci: convert to memory API |
Date: |
Wed, 20 Jul 2011 19:50:02 +0300 |
Signed-off-by: Avi Kivity <address@hidden>
---
hw/usb-ehci.c | 36 +++++++++---------------------------
1 files changed, 9 insertions(+), 27 deletions(-)
diff --git a/hw/usb-ehci.c b/hw/usb-ehci.c
index a4758f9..95d12e0 100644
--- a/hw/usb-ehci.c
+++ b/hw/usb-ehci.c
@@ -368,8 +368,7 @@ struct EHCIState {
PCIDevice dev;
USBBus bus;
qemu_irq irq;
- target_phys_addr_t mem_base;
- int mem;
+ MemoryRegion mem;
int companion_count;
/* properties */
@@ -2207,29 +2206,15 @@ static void ehci_frame_timer(void *opaque)
qemu_mod_timer(ehci->frame_timer, expire_time);
}
-static CPUReadMemoryFunc *ehci_readfn[3]={
- ehci_mem_readb,
- ehci_mem_readw,
- ehci_mem_readl
-};
-static CPUWriteMemoryFunc *ehci_writefn[3]={
- ehci_mem_writeb,
- ehci_mem_writew,
- ehci_mem_writel
+static const MemoryRegionOps ehci_mem_ops = {
+ .old_mmio = {
+ .read = { ehci_mem_readb, ehci_mem_readw, ehci_mem_readl },
+ .write = { ehci_mem_writeb, ehci_mem_writew, ehci_mem_writel },
+ },
+ .endianness = DEVICE_LITTLE_ENDIAN,
};
-static void ehci_map(PCIDevice *pci_dev, int region_num,
- pcibus_t addr, pcibus_t size, int type)
-{
- EHCIState *s =(EHCIState *)pci_dev;
-
- DPRINTF("ehci_map: region %d, addr %08" PRIx64 ", size %" PRId64 ", s->mem
%08X\n",
- region_num, addr, size, s->mem);
- s->mem_base = addr;
- cpu_register_physical_memory(addr, size, s->mem);
-}
-
static int usb_ehci_initfn(PCIDevice *dev);
static USBPortOps ehci_port_ops = {
@@ -2337,11 +2322,8 @@ static int usb_ehci_initfn(PCIDevice *dev)
qemu_register_reset(ehci_reset, s);
- s->mem = cpu_register_io_memory(ehci_readfn, ehci_writefn, s,
- DEVICE_LITTLE_ENDIAN);
-
- pci_register_bar(&s->dev, 0, MMIO_SIZE, PCI_BASE_ADDRESS_SPACE_MEMORY,
- ehci_map);
+ memory_region_init_io(&s->mem, &ehci_mem_ops, s, "ehci", MMIO_SIZE);
+ pci_register_bar_region(&s->dev, 0, PCI_BASE_ADDRESS_SPACE_MEMORY,
&s->mem);
fprintf(stderr, "*** EHCI support is under development ***\n");
--
1.7.5.3
- [Qemu-devel] [RFC v5 69/86] gt64xxx.c: convert to memory API, (continued)
- [Qemu-devel] [RFC v5 69/86] gt64xxx.c: convert to memory API, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 34/86] pci: allow I/O BARs to be registered with pci_register_bar_region(), Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 18/86] pc: move global memory map out of pc_init1() and into its callers, Avi Kivity, 2011/07/20
- [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 <=
- [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, 2011/07/20
- [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