mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

audio: intel-hda: do not use old_mmio accesses

Browse Source 
intel-hda is currently using the old_mmio accessors for io.
This updates the device to use .read and .write accessors instead.

Signed-off-by: Matt Parker <mtparkr@gmail.com>
Message-id: 20170827192038.28930-1-mtparkr@gmail.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Matt Parker 2017-08-27 20:20:38 +01:00 committed by Gerd Hoffmann
parent 4bb3893908
commit a6b0bdc8fb
1 changed files with 11 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
hw/audio/intel-hda.c
View File

@ -22,6 +22,7 @@
#include "hw/pci/pci.h" #include "hw/pci/pci.h"
#include "hw/pci/msi.h" #include "hw/pci/msi.h"
#include "qemu/timer.h" #include "qemu/timer.h"
#include "qemu/bitops.h"
#include "hw/audio/soundhw.h" #include "hw/audio/soundhw.h"
#include "intel-hda.h" #include "intel-hda.h"
#include "intel-hda-defs.h" #include "intel-hda-defs.h"
@ -1043,66 +1044,29 @@ static void intel_hda_regs_reset(IntelHDAState *d)
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
static void intel_hda_mmio_writeb(void *opaque, hwaddr addr, uint32_t val) static void intel_hda_mmio_write(void *opaque, hwaddr addr, uint64_t val,
unsigned size)
{ {
IntelHDAState *d = opaque; IntelHDAState *d = opaque;
const IntelHDAReg *reg = intel_hda_reg_find(d, addr); const IntelHDAReg *reg = intel_hda_reg_find(d, addr);
intel_hda_reg_write(d, reg, val, 0xff); intel_hda_reg_write(d, reg, val, MAKE_64BIT_MASK(0, size * 8));
} }
static void intel_hda_mmio_writew(void *opaque, hwaddr addr, uint32_t val) static uint64_t intel_hda_mmio_read(void *opaque, hwaddr addr, unsigned size)
{ {
IntelHDAState *d = opaque; IntelHDAState *d = opaque;
const IntelHDAReg *reg = intel_hda_reg_find(d, addr); const IntelHDAReg *reg = intel_hda_reg_find(d, addr);
intel_hda_reg_write(d, reg, val, 0xffff); return intel_hda_reg_read(d, reg, MAKE_64BIT_MASK(0, size * 8));
}
static void intel_hda_mmio_writel(void *opaque, hwaddr addr, uint32_t val)
{
IntelHDAState *d = opaque;
const IntelHDAReg *reg = intel_hda_reg_find(d, addr);
intel_hda_reg_write(d, reg, val, 0xffffffff);
}
static uint32_t intel_hda_mmio_readb(void *opaque, hwaddr addr)
{
IntelHDAState *d = opaque;
const IntelHDAReg *reg = intel_hda_reg_find(d, addr);
return intel_hda_reg_read(d, reg, 0xff);
}
static uint32_t intel_hda_mmio_readw(void *opaque, hwaddr addr)
{
IntelHDAState *d = opaque;
const IntelHDAReg *reg = intel_hda_reg_find(d, addr);
return intel_hda_reg_read(d, reg, 0xffff);
}
static uint32_t intel_hda_mmio_readl(void *opaque, hwaddr addr)
{
IntelHDAState *d = opaque;
const IntelHDAReg *reg = intel_hda_reg_find(d, addr);
return intel_hda_reg_read(d, reg, 0xffffffff);
} }
static const MemoryRegionOps intel_hda_mmio_ops = { static const MemoryRegionOps intel_hda_mmio_ops = {
.old_mmio = { .read = intel_hda_mmio_read,
.read = { .write = intel_hda_mmio_write,
intel_hda_mmio_readb, .impl = {
intel_hda_mmio_readw, .min_access_size = 1,
intel_hda_mmio_readl, .max_access_size = 4,
},
.write = {
intel_hda_mmio_writeb,
intel_hda_mmio_writew,
intel_hda_mmio_writel,
},
}, },
.endianness = DEVICE_NATIVE_ENDIAN, .endianness = DEVICE_NATIVE_ENDIAN,
}; };