OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

ehci: convert to memory API

Browse Source 
Reviewed-by: Richard Henderson <rth@twiddle.net>
Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Avi Kivity 2011-08-08 16:09:23 +03:00 committed by Anthony Liguori
parent c5e6fb7e4a
commit e57964f5b3
1 changed files with 10 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
hw/usb-ehci.c
View File

@ -370,8 +370,7 @@ struct EHCIState {
PCIDevice dev; PCIDevice dev;
USBBus bus; USBBus bus;
qemu_irq irq; qemu_irq irq;
target_phys_addr_t mem_base; MemoryRegion mem;
int mem;
int companion_count; int companion_count;
/* properties */ /* properties */
@ -2179,29 +2178,15 @@ static void ehci_frame_timer(void *opaque)
qemu_mod_timer(ehci->frame_timer, expire_time); qemu_mod_timer(ehci->frame_timer, expire_time);
} }
static CPUReadMemoryFunc *ehci_readfn[3]={
ehci_mem_readb, static const MemoryRegionOps ehci_mem_ops = {
ehci_mem_readw, .old_mmio = {
ehci_mem_readl .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 CPUWriteMemoryFunc *ehci_writefn[3]={
ehci_mem_writeb,
ehci_mem_writew,
ehci_mem_writel
};
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 int usb_ehci_initfn(PCIDevice *dev);
static USBPortOps ehci_port_ops = { static USBPortOps ehci_port_ops = {
@ -2316,11 +2301,8 @@ static int usb_ehci_initfn(PCIDevice *dev)
qemu_register_reset(ehci_reset, s); qemu_register_reset(ehci_reset, s);
s->mem = cpu_register_io_memory(ehci_readfn, ehci_writefn, s, memory_region_init_io(&s->mem, &ehci_mem_ops, s, "ehci", MMIO_SIZE);
DEVICE_LITTLE_ENDIAN); pci_register_bar_region(&s->dev, 0, PCI_BASE_ADDRESS_SPACE_MEMORY, &s->mem);
pci_register_bar(&s->dev, 0, MMIO_SIZE, PCI_BASE_ADDRESS_SPACE_MEMORY,
ehci_map);
fprintf(stderr, "*** EHCI support is under development ***\n"); fprintf(stderr, "*** EHCI support is under development ***\n");