[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC v4 50/58] ehci: convert to memory API
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [RFC v4 50/58] ehci: convert to memory API |
Date: |
Sun, 17 Jul 2011 14:14:17 +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 91fb7de..076c0b2 100644
--- a/hw/usb-ehci.c
+++ b/hw/usb-ehci.c
@@ -371,8 +371,7 @@ struct EHCIState {
PCIDevice dev;
USBBus bus;
qemu_irq irq;
- target_phys_addr_t mem_base;
- int mem;
+ MemoryRegion mem;
int num_ports;
/* properties */
@@ -2094,29 +2093,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 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 void ehci_device_destroy(USBBus *bus, USBDevice *dev)
{
EHCIState *s = container_of(bus, EHCIState, bus);
@@ -2215,11 +2200,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 v4 43/58] lsi53c895a: convert to memory API, (continued)
- [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, 2011/07/17
- [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 <=
- [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
- [Qemu-devel] [RFC v4 16/58] pc: move global memory map out of pc_init1() and into its callers, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 09/58] memory: add backward compatibility for old portio registration, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 48/58] isa-mmio: concert to memory API, Avi Kivity, 2011/07/17