[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 22/39] intel-hda: convert to memory API
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH v4 22/39] intel-hda: convert to memory API |
Date: |
Mon, 8 Aug 2011 16:09:15 +0300 |
Reviewed-by: Richard Henderson <address@hidden>
Reviewed-by: Anthony Liguori <address@hidden>
Signed-off-by: Avi Kivity <address@hidden>
---
hw/intel-hda.c | 35 +++++++++++++++++++----------------
1 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/hw/intel-hda.c b/hw/intel-hda.c
index 5a2bc3a..1e4c71e 100644
--- a/hw/intel-hda.c
+++ b/hw/intel-hda.c
@@ -177,7 +177,7 @@ struct IntelHDAState {
IntelHDAStream st[8];
/* state */
- int mmio_addr;
+ MemoryRegion mmio;
uint32_t rirb_count;
int64_t wall_base_ns;
@@ -1084,16 +1084,20 @@ static uint32_t intel_hda_mmio_readl(void *opaque,
target_phys_addr_t addr)
return intel_hda_reg_read(d, reg, 0xffffffff);
}
-static CPUReadMemoryFunc * const intel_hda_mmio_read[3] = {
- intel_hda_mmio_readb,
- intel_hda_mmio_readw,
- intel_hda_mmio_readl,
-};
-
-static CPUWriteMemoryFunc * const intel_hda_mmio_write[3] = {
- intel_hda_mmio_writeb,
- intel_hda_mmio_writew,
- intel_hda_mmio_writel,
+static const MemoryRegionOps intel_hda_mmio_ops = {
+ .old_mmio = {
+ .read = {
+ intel_hda_mmio_readb,
+ intel_hda_mmio_readw,
+ intel_hda_mmio_readl,
+ },
+ .write = {
+ intel_hda_mmio_writeb,
+ intel_hda_mmio_writew,
+ intel_hda_mmio_writel,
+ },
+ },
+ .endianness = DEVICE_NATIVE_ENDIAN,
};
/* --------------------------------------------------------------------- */
@@ -1130,10 +1134,9 @@ static int intel_hda_init(PCIDevice *pci)
/* HDCTL off 0x40 bit 0 selects signaling mode (1-HDA, 0 - Ac97) 18.1.19 */
conf[0x40] = 0x01;
- d->mmio_addr = cpu_register_io_memory(intel_hda_mmio_read,
- intel_hda_mmio_write, d,
- DEVICE_NATIVE_ENDIAN);
- pci_register_bar_simple(&d->pci, 0, 0x4000, 0, d->mmio_addr);
+ memory_region_init_io(&d->mmio, &intel_hda_mmio_ops, d,
+ "intel-hda", 0x4000);
+ pci_register_bar_region(&d->pci, 0, 0, &d->mmio);
if (d->msi) {
msi_init(&d->pci, 0x50, 1, true, false);
}
@@ -1149,7 +1152,7 @@ static int intel_hda_exit(PCIDevice *pci)
IntelHDAState *d = DO_UPCAST(IntelHDAState, pci, pci);
msi_uninit(&d->pci);
- cpu_unregister_io_memory(d->mmio_addr);
+ memory_region_destroy(&d->mmio);
return 0;
}
--
1.7.5.3
- [Qemu-devel] [PATCH v4 00/39] Memory API, batch 2: PCI devices, Avi Kivity, 2011/08/08
- [Qemu-devel] [PATCH v4 01/39] memory: rename PORTIO_END to PORTIO_END_OF_LIST, Avi Kivity, 2011/08/08
- [Qemu-devel] [PATCH v4 03/39] vmsvga: don't remember pci BAR address in callback any more, Avi Kivity, 2011/08/08
- [Qemu-devel] [PATCH v4 17/39] es1370: convert to memory API, Avi Kivity, 2011/08/08
- [Qemu-devel] [PATCH v4 11/39] pci: pass I/O address space to new PCI bus, Avi Kivity, 2011/08/08
- [Qemu-devel] [PATCH v4 22/39] intel-hda: convert to memory API,
Avi Kivity <=
- [Qemu-devel] [PATCH v4 16/39] eepro100: convert to memory API, Avi Kivity, 2011/08/08
- [Qemu-devel] [PATCH v4 26/39] pcnet: convert to memory API, Avi Kivity, 2011/08/08
- Re: [Qemu-devel] [PATCH v4 26/39] pcnet: convert to memory API, Bob Breuer, 2011/08/09
- Re: [Qemu-devel] [PATCH v4 26/39] pcnet: convert to memory API, Avi Kivity, 2011/08/09
- Re: [Qemu-devel] [PATCH v4 26/39] pcnet: convert to memory API, Michael S. Tsirkin, 2011/08/09
- Re: [Qemu-devel] [PATCH v4 26/39] pcnet: convert to memory API, Avi Kivity, 2011/08/09
- Re: [Qemu-devel] [PATCH v4 26/39] pcnet: convert to memory API, Michael S. Tsirkin, 2011/08/09
- Re: [Qemu-devel] [PATCH v4 26/39] pcnet: convert to memory API, Avi Kivity, 2011/08/09
[Qemu-devel] [PATCH v4 05/39] cirrus: simplify mmio BAR access functions, Avi Kivity, 2011/08/08
[Qemu-devel] [PATCH v4 12/39] pci: allow I/O BARs to be registered with pci_register_bar_region(), Avi Kivity, 2011/08/08