audio: pa volume fix, some qomifying.
-----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAABAgAGBQJXVR/BAAoJEEy22O7T6HE4QqkQAMZ4lAbBvJGVQg473Q1nGc1i DpRD5uy0tWcDzYw5FnJ1zw78scpp2w4UzMl5w/SBi/G6B3aJnOKLELpEqaTXI9lv FnXrfgThol4un+/GmXsUTYhvG5aPK43y2iWNJzNJttg17NNjROAxSd9pP8K0u/lp 8jGzjc+XPUnAZcy5q9ticV++LmgGyKIhNowgA2BlcoVHSyK6BkgJrXjThPrTbBLk hK38BhW0RMxAmuiR2dbfwZKDY9taoAftaNp2UeamDDc15M36CDCFoMHL5Ztqmitb SKz+7hMKQUFILhpSQdoZJbJNLe9L+4ThLAHN9dbvOkPW1Fdk5WUKJRnpDXnoyVQX pPHFTQiAobWzAYxUrK8qIGcafqaqcmAKN0VHdqE7VUkGIZW4bRrAG/RQ6o1PHsL3 xtMTn9ChSSMXq86PNkRT5Z2Mr0A0WcBUhKLf5zdvCgESs2GYS+J+GF8vUMr8SnNI Qr6wuXow7U+su3fSBbBdimRDkAcM5BxaZjopbjOfI1Ydso+YglTxPxT7JbULuEn2 etCZaffiTTtc+5u7Gac0OxlcV2lhVHuWaenvdpODJLjjHSBE1XFkLIbJlvwGr6LK eV25w3q/YHLkcvlrN5Hy13hmX6gVjZtOabSsnxB78dM+xUPSn62RoepxWSbj2Z9j I4J/D3H+SBpeJ/iV+2y/ =FQbx -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/kraxel/tags/pull-audio-20160606-1' into staging audio: pa volume fix, some qomifying. # gpg: Signature made Mon 06 Jun 2016 08:01:21 BST # gpg: using RSA key 0x4CB6D8EED3E87138 # gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" # gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" # gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" * remotes/kraxel/tags/pull-audio-20160606-1: hw/audio: QOM'ify milkymist-ac97.c hw/audio: QOM'ify intel-hda hw/audio: QOM cleanup for intel-hda hw/audio: QOM'ify cs4231.c audio: pa: Set volume of recording stream instead of recording device Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
8625c3ffc8
|
@ -781,23 +781,22 @@ static int qpa_ctl_in (HWVoiceIn *hw, int cmd, ...)
|
||||||
|
|
||||||
pa_threaded_mainloop_lock (g->mainloop);
|
pa_threaded_mainloop_lock (g->mainloop);
|
||||||
|
|
||||||
/* FIXME: use the upcoming "set_source_output_{volume,mute}" */
|
op = pa_context_set_source_output_volume (g->context,
|
||||||
op = pa_context_set_source_volume_by_index (g->context,
|
pa_stream_get_index (pa->stream),
|
||||||
pa_stream_get_device_index (pa->stream),
|
|
||||||
&v, NULL, NULL);
|
&v, NULL, NULL);
|
||||||
if (!op) {
|
if (!op) {
|
||||||
qpa_logerr (pa_context_errno (g->context),
|
qpa_logerr (pa_context_errno (g->context),
|
||||||
"set_source_volume() failed\n");
|
"set_source_output_volume() failed\n");
|
||||||
} else {
|
} else {
|
||||||
pa_operation_unref(op);
|
pa_operation_unref(op);
|
||||||
}
|
}
|
||||||
|
|
||||||
op = pa_context_set_source_mute_by_index (g->context,
|
op = pa_context_set_source_output_mute (g->context,
|
||||||
pa_stream_get_index (pa->stream),
|
pa_stream_get_index (pa->stream),
|
||||||
sw->vol.mute, NULL, NULL);
|
sw->vol.mute, NULL, NULL);
|
||||||
if (!op) {
|
if (!op) {
|
||||||
qpa_logerr (pa_context_errno (g->context),
|
qpa_logerr (pa_context_errno (g->context),
|
||||||
"set_source_mute() failed\n");
|
"set_source_output_mute() failed\n");
|
||||||
} else {
|
} else {
|
||||||
pa_operation_unref (op);
|
pa_operation_unref (op);
|
||||||
}
|
}
|
||||||
|
|
|
@ -2813,8 +2813,8 @@ for drv in $audio_drv_list; do
|
||||||
;;
|
;;
|
||||||
|
|
||||||
pa)
|
pa)
|
||||||
audio_drv_probe $drv pulse/mainloop.h "-lpulse" \
|
audio_drv_probe $drv pulse/pulseaudio.h "-lpulse" \
|
||||||
"pa_mainloop *m = 0; pa_mainloop_free (m); return 0;"
|
"pa_context_set_source_output_volume(NULL, 0, NULL, NULL, NULL); return 0;"
|
||||||
libs_softmmu="-lpulse $libs_softmmu"
|
libs_softmmu="-lpulse $libs_softmmu"
|
||||||
audio_pt_int="yes"
|
audio_pt_int="yes"
|
||||||
;;
|
;;
|
||||||
|
|
|
@ -145,16 +145,15 @@ static const VMStateDescription vmstate_cs4231 = {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
static int cs4231_init1(SysBusDevice *dev)
|
static void cs4231_init(Object *obj)
|
||||||
{
|
{
|
||||||
CSState *s = CS4231(dev);
|
CSState *s = CS4231(obj);
|
||||||
|
SysBusDevice *dev = SYS_BUS_DEVICE(obj);
|
||||||
|
|
||||||
memory_region_init_io(&s->iomem, OBJECT(s), &cs_mem_ops, s, "cs4321",
|
memory_region_init_io(&s->iomem, obj, &cs_mem_ops, s, "cs4321",
|
||||||
CS_SIZE);
|
CS_SIZE);
|
||||||
sysbus_init_mmio(dev, &s->iomem);
|
sysbus_init_mmio(dev, &s->iomem);
|
||||||
sysbus_init_irq(dev, &s->irq);
|
sysbus_init_irq(dev, &s->irq);
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static Property cs4231_properties[] = {
|
static Property cs4231_properties[] = {
|
||||||
|
@ -164,9 +163,7 @@ static Property cs4231_properties[] = {
|
||||||
static void cs4231_class_init(ObjectClass *klass, void *data)
|
static void cs4231_class_init(ObjectClass *klass, void *data)
|
||||||
{
|
{
|
||||||
DeviceClass *dc = DEVICE_CLASS(klass);
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
||||||
SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
|
|
||||||
|
|
||||||
k->init = cs4231_init1;
|
|
||||||
dc->reset = cs_reset;
|
dc->reset = cs_reset;
|
||||||
dc->vmsd = &vmstate_cs4231;
|
dc->vmsd = &vmstate_cs4231;
|
||||||
dc->props = cs4231_properties;
|
dc->props = cs4231_properties;
|
||||||
|
@ -176,6 +173,7 @@ static const TypeInfo cs4231_info = {
|
||||||
.name = TYPE_CS4231,
|
.name = TYPE_CS4231,
|
||||||
.parent = TYPE_SYS_BUS_DEVICE,
|
.parent = TYPE_SYS_BUS_DEVICE,
|
||||||
.instance_size = sizeof(CSState),
|
.instance_size = sizeof(CSState),
|
||||||
|
.instance_init = cs4231_init,
|
||||||
.class_init = cs4231_class_init,
|
.class_init = cs4231_class_init,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -26,6 +26,7 @@
|
||||||
#include "intel-hda.h"
|
#include "intel-hda.h"
|
||||||
#include "intel-hda-defs.h"
|
#include "intel-hda-defs.h"
|
||||||
#include "sysemu/dma.h"
|
#include "sysemu/dma.h"
|
||||||
|
#include "qapi/error.h"
|
||||||
|
|
||||||
/* --------------------------------------------------------------------- */
|
/* --------------------------------------------------------------------- */
|
||||||
/* hda bus */
|
/* hda bus */
|
||||||
|
@ -50,25 +51,28 @@ void hda_codec_bus_init(DeviceState *dev, HDACodecBus *bus, size_t bus_size,
|
||||||
bus->xfer = xfer;
|
bus->xfer = xfer;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int hda_codec_dev_init(DeviceState *qdev)
|
static void hda_codec_dev_realize(DeviceState *qdev, Error **errp)
|
||||||
{
|
{
|
||||||
HDACodecBus *bus = DO_UPCAST(HDACodecBus, qbus, qdev->parent_bus);
|
HDACodecBus *bus = HDA_BUS(qdev->parent_bus);
|
||||||
HDACodecDevice *dev = DO_UPCAST(HDACodecDevice, qdev, qdev);
|
HDACodecDevice *dev = HDA_CODEC_DEVICE(qdev);
|
||||||
HDACodecDeviceClass *cdc = HDA_CODEC_DEVICE_GET_CLASS(dev);
|
HDACodecDeviceClass *cdc = HDA_CODEC_DEVICE_GET_CLASS(dev);
|
||||||
|
|
||||||
if (dev->cad == -1) {
|
if (dev->cad == -1) {
|
||||||
dev->cad = bus->next_cad;
|
dev->cad = bus->next_cad;
|
||||||
}
|
}
|
||||||
if (dev->cad >= 15) {
|
if (dev->cad >= 15) {
|
||||||
return -1;
|
error_setg(errp, "HDA audio codec address is full");
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
bus->next_cad = dev->cad + 1;
|
bus->next_cad = dev->cad + 1;
|
||||||
return cdc->init(dev);
|
if (cdc->init(dev) != 0) {
|
||||||
|
error_setg(errp, "HDA audio init failed");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static int hda_codec_dev_exit(DeviceState *qdev)
|
static int hda_codec_dev_exit(DeviceState *qdev)
|
||||||
{
|
{
|
||||||
HDACodecDevice *dev = DO_UPCAST(HDACodecDevice, qdev, qdev);
|
HDACodecDevice *dev = HDA_CODEC_DEVICE(qdev);
|
||||||
HDACodecDeviceClass *cdc = HDA_CODEC_DEVICE_GET_CLASS(dev);
|
HDACodecDeviceClass *cdc = HDA_CODEC_DEVICE_GET_CLASS(dev);
|
||||||
|
|
||||||
if (cdc->exit) {
|
if (cdc->exit) {
|
||||||
|
@ -84,7 +88,7 @@ HDACodecDevice *hda_codec_find(HDACodecBus *bus, uint32_t cad)
|
||||||
|
|
||||||
QTAILQ_FOREACH(kid, &bus->qbus.children, sibling) {
|
QTAILQ_FOREACH(kid, &bus->qbus.children, sibling) {
|
||||||
DeviceState *qdev = kid->child;
|
DeviceState *qdev = kid->child;
|
||||||
cdev = DO_UPCAST(HDACodecDevice, qdev, qdev);
|
cdev = HDA_CODEC_DEVICE(qdev);
|
||||||
if (cdev->cad == cad) {
|
if (cdev->cad == cad) {
|
||||||
return cdev;
|
return cdev;
|
||||||
}
|
}
|
||||||
|
@ -94,14 +98,14 @@ HDACodecDevice *hda_codec_find(HDACodecBus *bus, uint32_t cad)
|
||||||
|
|
||||||
void hda_codec_response(HDACodecDevice *dev, bool solicited, uint32_t response)
|
void hda_codec_response(HDACodecDevice *dev, bool solicited, uint32_t response)
|
||||||
{
|
{
|
||||||
HDACodecBus *bus = DO_UPCAST(HDACodecBus, qbus, dev->qdev.parent_bus);
|
HDACodecBus *bus = HDA_BUS(dev->qdev.parent_bus);
|
||||||
bus->response(dev, solicited, response);
|
bus->response(dev, solicited, response);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool hda_codec_xfer(HDACodecDevice *dev, uint32_t stnr, bool output,
|
bool hda_codec_xfer(HDACodecDevice *dev, uint32_t stnr, bool output,
|
||||||
uint8_t *buf, uint32_t len)
|
uint8_t *buf, uint32_t len)
|
||||||
{
|
{
|
||||||
HDACodecBus *bus = DO_UPCAST(HDACodecBus, qbus, dev->qdev.parent_bus);
|
HDACodecBus *bus = HDA_BUS(dev->qdev.parent_bus);
|
||||||
return bus->xfer(dev, stnr, output, buf, len);
|
return bus->xfer(dev, stnr, output, buf, len);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -337,7 +341,7 @@ static void intel_hda_corb_run(IntelHDAState *d)
|
||||||
|
|
||||||
static void intel_hda_response(HDACodecDevice *dev, bool solicited, uint32_t response)
|
static void intel_hda_response(HDACodecDevice *dev, bool solicited, uint32_t response)
|
||||||
{
|
{
|
||||||
HDACodecBus *bus = DO_UPCAST(HDACodecBus, qbus, dev->qdev.parent_bus);
|
HDACodecBus *bus = HDA_BUS(dev->qdev.parent_bus);
|
||||||
IntelHDAState *d = container_of(bus, IntelHDAState, codecs);
|
IntelHDAState *d = container_of(bus, IntelHDAState, codecs);
|
||||||
hwaddr addr;
|
hwaddr addr;
|
||||||
uint32_t wp, ex;
|
uint32_t wp, ex;
|
||||||
|
@ -386,7 +390,7 @@ static void intel_hda_response(HDACodecDevice *dev, bool solicited, uint32_t res
|
||||||
static bool intel_hda_xfer(HDACodecDevice *dev, uint32_t stnr, bool output,
|
static bool intel_hda_xfer(HDACodecDevice *dev, uint32_t stnr, bool output,
|
||||||
uint8_t *buf, uint32_t len)
|
uint8_t *buf, uint32_t len)
|
||||||
{
|
{
|
||||||
HDACodecBus *bus = DO_UPCAST(HDACodecBus, qbus, dev->qdev.parent_bus);
|
HDACodecBus *bus = HDA_BUS(dev->qdev.parent_bus);
|
||||||
IntelHDAState *d = container_of(bus, IntelHDAState, codecs);
|
IntelHDAState *d = container_of(bus, IntelHDAState, codecs);
|
||||||
hwaddr addr;
|
hwaddr addr;
|
||||||
uint32_t s, copy, left;
|
uint32_t s, copy, left;
|
||||||
|
@ -493,7 +497,7 @@ static void intel_hda_notify_codecs(IntelHDAState *d, uint32_t stream, bool runn
|
||||||
DeviceState *qdev = kid->child;
|
DeviceState *qdev = kid->child;
|
||||||
HDACodecDeviceClass *cdc;
|
HDACodecDeviceClass *cdc;
|
||||||
|
|
||||||
cdev = DO_UPCAST(HDACodecDevice, qdev, qdev);
|
cdev = HDA_CODEC_DEVICE(qdev);
|
||||||
cdc = HDA_CODEC_DEVICE_GET_CLASS(cdev);
|
cdc = HDA_CODEC_DEVICE_GET_CLASS(cdev);
|
||||||
if (cdc->stream) {
|
if (cdc->stream) {
|
||||||
cdc->stream(cdev, stream, running, output);
|
cdc->stream(cdev, stream, running, output);
|
||||||
|
@ -1120,7 +1124,7 @@ static void intel_hda_reset(DeviceState *dev)
|
||||||
/* reset codecs */
|
/* reset codecs */
|
||||||
QTAILQ_FOREACH(kid, &d->codecs.qbus.children, sibling) {
|
QTAILQ_FOREACH(kid, &d->codecs.qbus.children, sibling) {
|
||||||
DeviceState *qdev = kid->child;
|
DeviceState *qdev = kid->child;
|
||||||
cdev = DO_UPCAST(HDACodecDevice, qdev, qdev);
|
cdev = HDA_CODEC_DEVICE(qdev);
|
||||||
device_reset(DEVICE(cdev));
|
device_reset(DEVICE(cdev));
|
||||||
d->state_sts |= (1 << cdev->cad);
|
d->state_sts |= (1 << cdev->cad);
|
||||||
}
|
}
|
||||||
|
@ -1298,7 +1302,7 @@ static const TypeInfo intel_hda_info_ich9 = {
|
||||||
static void hda_codec_device_class_init(ObjectClass *klass, void *data)
|
static void hda_codec_device_class_init(ObjectClass *klass, void *data)
|
||||||
{
|
{
|
||||||
DeviceClass *k = DEVICE_CLASS(klass);
|
DeviceClass *k = DEVICE_CLASS(klass);
|
||||||
k->init = hda_codec_dev_init;
|
k->realize = hda_codec_dev_realize;
|
||||||
k->exit = hda_codec_dev_exit;
|
k->exit = hda_codec_dev_exit;
|
||||||
set_bit(DEVICE_CATEGORY_SOUND, k->categories);
|
set_bit(DEVICE_CATEGORY_SOUND, k->categories);
|
||||||
k->bus_type = TYPE_HDA_BUS;
|
k->bus_type = TYPE_HDA_BUS;
|
||||||
|
|
|
@ -284,16 +284,26 @@ static int ac97_post_load(void *opaque, int version_id)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int milkymist_ac97_init(SysBusDevice *dev)
|
static void milkymist_ac97_init(Object *obj)
|
||||||
{
|
{
|
||||||
MilkymistAC97State *s = MILKYMIST_AC97(dev);
|
MilkymistAC97State *s = MILKYMIST_AC97(obj);
|
||||||
|
SysBusDevice *dev = SYS_BUS_DEVICE(obj);
|
||||||
|
|
||||||
struct audsettings as;
|
|
||||||
sysbus_init_irq(dev, &s->crrequest_irq);
|
sysbus_init_irq(dev, &s->crrequest_irq);
|
||||||
sysbus_init_irq(dev, &s->crreply_irq);
|
sysbus_init_irq(dev, &s->crreply_irq);
|
||||||
sysbus_init_irq(dev, &s->dmar_irq);
|
sysbus_init_irq(dev, &s->dmar_irq);
|
||||||
sysbus_init_irq(dev, &s->dmaw_irq);
|
sysbus_init_irq(dev, &s->dmaw_irq);
|
||||||
|
|
||||||
|
memory_region_init_io(&s->regs_region, obj, &ac97_mmio_ops, s,
|
||||||
|
"milkymist-ac97", R_MAX * 4);
|
||||||
|
sysbus_init_mmio(dev, &s->regs_region);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void milkymist_ac97_realize(DeviceState *dev, Error **errp)
|
||||||
|
{
|
||||||
|
MilkymistAC97State *s = MILKYMIST_AC97(dev);
|
||||||
|
struct audsettings as;
|
||||||
|
|
||||||
AUD_register_card("Milkymist AC'97", &s->card);
|
AUD_register_card("Milkymist AC'97", &s->card);
|
||||||
|
|
||||||
as.freq = 48000;
|
as.freq = 48000;
|
||||||
|
@ -305,12 +315,6 @@ static int milkymist_ac97_init(SysBusDevice *dev)
|
||||||
"mm_ac97.in", s, ac97_in_cb, &as);
|
"mm_ac97.in", s, ac97_in_cb, &as);
|
||||||
s->voice_out = AUD_open_out(&s->card, s->voice_out,
|
s->voice_out = AUD_open_out(&s->card, s->voice_out,
|
||||||
"mm_ac97.out", s, ac97_out_cb, &as);
|
"mm_ac97.out", s, ac97_out_cb, &as);
|
||||||
|
|
||||||
memory_region_init_io(&s->regs_region, OBJECT(s), &ac97_mmio_ops, s,
|
|
||||||
"milkymist-ac97", R_MAX * 4);
|
|
||||||
sysbus_init_mmio(dev, &s->regs_region);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static const VMStateDescription vmstate_milkymist_ac97 = {
|
static const VMStateDescription vmstate_milkymist_ac97 = {
|
||||||
|
@ -327,9 +331,8 @@ static const VMStateDescription vmstate_milkymist_ac97 = {
|
||||||
static void milkymist_ac97_class_init(ObjectClass *klass, void *data)
|
static void milkymist_ac97_class_init(ObjectClass *klass, void *data)
|
||||||
{
|
{
|
||||||
DeviceClass *dc = DEVICE_CLASS(klass);
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
||||||
SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
|
|
||||||
|
|
||||||
k->init = milkymist_ac97_init;
|
dc->realize = milkymist_ac97_realize;
|
||||||
dc->reset = milkymist_ac97_reset;
|
dc->reset = milkymist_ac97_reset;
|
||||||
dc->vmsd = &vmstate_milkymist_ac97;
|
dc->vmsd = &vmstate_milkymist_ac97;
|
||||||
}
|
}
|
||||||
|
@ -338,6 +341,7 @@ static const TypeInfo milkymist_ac97_info = {
|
||||||
.name = TYPE_MILKYMIST_AC97,
|
.name = TYPE_MILKYMIST_AC97,
|
||||||
.parent = TYPE_SYS_BUS_DEVICE,
|
.parent = TYPE_SYS_BUS_DEVICE,
|
||||||
.instance_size = sizeof(MilkymistAC97State),
|
.instance_size = sizeof(MilkymistAC97State),
|
||||||
|
.instance_init = milkymist_ac97_init,
|
||||||
.class_init = milkymist_ac97_class_init,
|
.class_init = milkymist_ac97_class_init,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue