[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 30/39] ehci: convert to memory API
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH v3 30/39] ehci: convert to memory API |
Date: |
Thu, 4 Aug 2011 16:06:26 +0300 |
Reviewed-by: Richard Henderson <address@hidden>
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 8b0dcc3..025ed1f 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 = {
@@ -2344,11 +2329,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] [PATCH v3 26/39] pcnet: convert to memory API, (continued)
- [Qemu-devel] [PATCH v3 26/39] pcnet: convert to memory API, Avi Kivity, 2011/08/04
- [Qemu-devel] [PATCH v3 34/39] pci: remove pci_register_bar_simple(), Avi Kivity, 2011/08/04
- [Qemu-devel] [PATCH v3 05/39] cirrus: simplify mmio BAR access functions, Avi Kivity, 2011/08/04
- [Qemu-devel] [PATCH v3 10/39] Integrate I/O memory regions into qemu, Avi Kivity, 2011/08/04
- [Qemu-devel] [PATCH v3 33/39] msix: convert to memory API, Avi Kivity, 2011/08/04
- [Qemu-devel] [PATCH v3 30/39] ehci: convert to memory API,
Avi Kivity <=
- [Qemu-devel] [PATCH v3 04/39] vga: convert vga and its derivatives to the memory API, Avi Kivity, 2011/08/04
- [Qemu-devel] [PATCH v3 17/39] es1370: convert to memory API, Avi Kivity, 2011/08/04
- [Qemu-devel] [PATCH v3 36/39] pci: remove pci_register_bar(), Avi Kivity, 2011/08/04
- [Qemu-devel] [PATCH v3 38/39] pci: rename pci_register_bar_region() to pci_register_bar(), Avi Kivity, 2011/08/04
- [Qemu-devel] [PATCH v3 18/39] ide: convert to memory API, Avi Kivity, 2011/08/04
- [Qemu-devel] [PATCH v3 24/39] ppc: convert to memory API, Avi Kivity, 2011/08/04
- Re: [Qemu-devel] [PATCH v3 00/39] Memory API, batch 2: PCI devices, Anthony Liguori, 2011/08/05