April 2010 - Alsa-devel - mailman.alsa-project.org

[PATCH] Add register_poll for alsaseq
by Hector Martin 21 Apr '10

21 Apr '10

Signed-off-by: Hector Martin <hector(a)marcansoft.com> --- pyalsa/alsaseq.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/pyalsa/alsaseq.c b/pyalsa/alsaseq.c index de131a4..bbf6b2e 100644 --- a/pyalsa/alsaseq.c +++ b/pyalsa/alsaseq.c @@ -3236,6 +3236,53 @@ Sequencer_stop_queue(SequencerObject *self, Py_RETURN_NONE; } +PyDoc_STRVAR(Sequencer_registerpoll__doc__, +"register_poll(pollObj, input=False, output=False) -- Register poll file descriptors."); + +static PyObject * +Sequencer_registerpoll(SequencerObject *self, PyObject *args, PyObject *kwds) +{ + PyObject *pollObj, *reg, *t; + struct pollfd *pfd; + int i, count; + int input = 0; + int output = 0; + int mode = POLLIN|POLLOUT; + + static char * kwlist[] = { "pollObj", "input", "output", NULL }; + + if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|ii", kwlist, &pollObj, &input, &output)) + return NULL; + + if (input && !output) + mode = POLLIN; + else if (!input && output) + mode = POLLOUT; + + count = snd_seq_poll_descriptors_count(self->handle, mode); + if (count <= 0) + Py_RETURN_NONE; + pfd = alloca(sizeof(struct pollfd) * count); + count = snd_seq_poll_descriptors(self->handle, pfd, count, mode); + if (count <= 0) + Py_RETURN_NONE; + + reg = PyObject_GetAttr(pollObj, PyString_InternFromString("register")); + + for (i = 0; i < count; i++) { + t = PyTuple_New(2); + if (t) { + PyTuple_SET_ITEM(t, 0, PyInt_FromLong(pfd[i].fd)); + PyTuple_SET_ITEM(t, 1, PyInt_FromLong(pfd[i].events)); + Py_XDECREF(PyObject_CallObject(reg, t)); + Py_DECREF(t); + } + } + + Py_XDECREF(reg); + + Py_RETURN_NONE; +} @@ -3309,6 +3356,10 @@ static PyMethodDef Sequencer_methods[] = { (PyCFunction) Sequencer_stop_queue, METH_VARARGS | METH_KEYWORDS, Sequencer_stop_queue__doc__}, + {"register_poll", + (PyCFunction) Sequencer_registerpoll, + METH_VARARGS | METH_KEYWORDS, + Sequencer_registerpoll__doc__}, {NULL} }; -- 1.6.4.4 --------------010307040309030606040702--

1 0

[PATCH] Add register_poll for alsaseq
by Hector Martin 21 Apr '10

21 Apr '10

Signed-off-by: Hector Martin <hector(a)marcansoft.com> --- pyalsa/alsaseq.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/pyalsa/alsaseq.c b/pyalsa/alsaseq.c index de131a4..bbf6b2e 100644 --- a/pyalsa/alsaseq.c +++ b/pyalsa/alsaseq.c @@ -3236,6 +3236,53 @@ Sequencer_stop_queue(SequencerObject *self, Py_RETURN_NONE; } +PyDoc_STRVAR(Sequencer_registerpoll__doc__, +"register_poll(pollObj, input=False, output=False) -- Register poll file descriptors."); + +static PyObject * +Sequencer_registerpoll(SequencerObject *self, PyObject *args, PyObject *kwds) +{ + PyObject *pollObj, *reg, *t; + struct pollfd *pfd; + int i, count; + int input = 0; + int output = 0; + int mode = POLLIN|POLLOUT; + + static char * kwlist[] = { "pollObj", "input", "output", NULL }; + + if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|ii", kwlist, &pollObj, &input, &output)) + return NULL; + + if (input && !output) + mode = POLLIN; + else if (!input && output) + mode = POLLOUT; + + count = snd_seq_poll_descriptors_count(self->handle, mode); + if (count <= 0) + Py_RETURN_NONE; + pfd = alloca(sizeof(struct pollfd) * count); + count = snd_seq_poll_descriptors(self->handle, pfd, count, mode); + if (count <= 0) + Py_RETURN_NONE; + + reg = PyObject_GetAttr(pollObj, PyString_InternFromString("register")); + + for (i = 0; i < count; i++) { + t = PyTuple_New(2); + if (t) { + PyTuple_SET_ITEM(t, 0, PyInt_FromLong(pfd[i].fd)); + PyTuple_SET_ITEM(t, 1, PyInt_FromLong(pfd[i].events)); + Py_XDECREF(PyObject_CallObject(reg, t)); + Py_DECREF(t); + } + } + + Py_XDECREF(reg); + + Py_RETURN_NONE; +} @@ -3309,6 +3356,10 @@ static PyMethodDef Sequencer_methods[] = { (PyCFunction) Sequencer_stop_queue, METH_VARARGS | METH_KEYWORDS, Sequencer_stop_queue__doc__}, + {"register_poll", + (PyCFunction) Sequencer_registerpoll, + METH_VARARGS | METH_KEYWORDS, + Sequencer_registerpoll__doc__}, {NULL} }; -- 1.6.4.4 --------------060801080008070807030804--

1 0

[PATCH] Add register_poll for alsaseq
by Hector Martin 21 Apr '10

21 Apr '10

--- pyalsa/alsaseq.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) diff --git a/pyalsa/alsaseq.c b/pyalsa/alsaseq.c index de131a4..fbab6da 100644 --- a/pyalsa/alsaseq.c +++ b/pyalsa/alsaseq.c @@ -3236,6 +3236,55 @@ Sequencer_stop_queue(SequencerObject *self, Py_RETURN_NONE; } +PyDoc_STRVAR(Sequencer_registerpoll__doc__, +"register_poll(pollObj, input=False, output=False) -- Register poll file descriptors."); + +static PyObject * +Sequencer_registerpoll(SequencerObject *self, PyObject *args, PyObject *kwds) +{ + PyObject *pollObj, *reg, *t; + struct pollfd *pfd; + int i, count; + int input = 0; + int output = 0; + int mode = POLLIN|POLLOUT; + + static char * kwlist[] = { "pollObj", "input", "output", NULL }; + + if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|ii", kwlist, &pollObj, &input, &output)) + return NULL; + + if (input && !output) + mode = POLLIN; + else if (!input && output) + mode = POLLOUT; + + count = snd_seq_poll_descriptors_count(self->handle, mode); + if (count <= 0) + Py_RETURN_NONE; + pfd = malloc(sizeof(struct pollfd) * count); + if (pfd == NULL) + Py_RETURN_NONE; + count = snd_seq_poll_descriptors(self->handle, pfd, count, mode); + if (count <= 0) + Py_RETURN_NONE; + + reg = PyObject_GetAttr(pollObj, PyString_InternFromString("register")); + + for (i = 0; i < count; i++) { + t = PyTuple_New(2); + if (t) { + PyTuple_SET_ITEM(t, 0, PyInt_FromLong(pfd[i].fd)); + PyTuple_SET_ITEM(t, 1, PyInt_FromLong(pfd[i].events)); + Py_XDECREF(PyObject_CallObject(reg, t)); + Py_DECREF(t); + } + } + + Py_XDECREF(reg); + + Py_RETURN_NONE; +} @@ -3309,6 +3358,10 @@ static PyMethodDef Sequencer_methods[] = { (PyCFunction) Sequencer_stop_queue, METH_VARARGS | METH_KEYWORDS, Sequencer_stop_queue__doc__}, + {"register_poll", + (PyCFunction) Sequencer_registerpoll, + METH_VARARGS | METH_KEYWORDS, + Sequencer_registerpoll__doc__}, {NULL} }; -- 1.6.4.4 --------------080100090701000909000606--

1 0

[alsa-devel] [PATCH] da7210: Fencepost error in reg cache read
by Phil Carmody 20 Apr '10

20 Apr '10

From: Phil Carmody <ext-phil.2.carmody(a)nokia.com> An index equal to the array size may not be accessed. Signed-off-by: Phil Carmody <ext-phil.2.carmody(a)nokia.com> --- sound/soc/codecs/da7210.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/soc/codecs/da7210.c b/sound/soc/codecs/da7210.c index 366daf1..96932a8 100644 --- a/sound/soc/codecs/da7210.c +++ b/sound/soc/codecs/da7210.c @@ -165,7 +165,7 @@ static const u8 da7210_reg[] = { static inline u32 da7210_read_reg_cache(struct snd_soc_codec *codec, u32 reg) { u8 *cache = codec->reg_cache; - BUG_ON(reg > ARRAY_SIZE(da7210_reg)); + BUG_ON(reg >= ARRAY_SIZE(da7210_reg)); return cache[reg]; } -- 1.6.0.4

3 2

[alsa-devel] ASoC updates for 2.6.35
by Mark Brown 20 Apr '10

20 Apr '10

The following changes since commit d21e0f4cd16656f71207683ee27465600ad21625: Marek Vasut (1): ASoC: Zipit Z2 WM8750 ASoC driver are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.35 Huang Weiyi (1): ASoC: wm2000: remove unused #include <linux/version.h> Mark Brown (2): Merge branch 'for-2.6.34' into for-2.6.35 ASoC: Add indirection for CODEC private data Sascha Hauer (5): ASoC: imx-ssi: honor IMX_SSI_DMA flag ASoC: imx-pcm-dma-mx2: restart DMA after an error ASoC: imx-ssi: Use a hrtimer in FIQ mode ASoC: imx-ssi: increase minimum periods to 4 ASoC: imx-ssi: do not call hrtimer_disable in trigger function include/sound/soc.h | 13 ++++++++- sound/soc/codecs/ad1836.c | 2 +- sound/soc/codecs/ad193x.c | 2 +- sound/soc/codecs/ak4104.c | 2 +- sound/soc/codecs/ak4535.c | 10 +++--- sound/soc/codecs/ak4642.c | 2 +- sound/soc/codecs/ak4671.c | 2 +- sound/soc/codecs/cs4270.c | 20 +++++++------- sound/soc/codecs/cx20442.c | 2 +- sound/soc/codecs/da7210.c | 2 +- sound/soc/codecs/ssm2602.c | 12 ++++---- sound/soc/codecs/stac9766.c | 2 +- sound/soc/codecs/tlv320aic3x.c | 10 +++--- sound/soc/codecs/tlv320dac33.c | 36 ++++++++++++------------ sound/soc/codecs/twl4030.c | 32 +++++++++++----------- sound/soc/codecs/uda134x.c | 16 +++++----- sound/soc/codecs/uda1380.c | 4 +- sound/soc/codecs/wm2000.c | 1 - sound/soc/codecs/wm8350.c | 28 ++++++++++---------- sound/soc/codecs/wm8400.c | 16 +++++----- sound/soc/codecs/wm8523.c | 10 +++--- sound/soc/codecs/wm8580.c | 4 +- sound/soc/codecs/wm8711.c | 6 ++-- sound/soc/codecs/wm8731.c | 10 +++--- sound/soc/codecs/wm8750.c | 7 ++--- sound/soc/codecs/wm8753.c | 8 +++--- sound/soc/codecs/wm8776.c | 6 ++-- sound/soc/codecs/wm8900.c | 10 +++--- sound/soc/codecs/wm8903.c | 20 +++++++------- sound/soc/codecs/wm8904.c | 42 +++++++++++++++--------------- sound/soc/codecs/wm8940.c | 4 +- sound/soc/codecs/wm8955.c | 16 +++++----- sound/soc/codecs/wm8960.c | 6 ++-- sound/soc/codecs/wm8961.c | 6 ++-- sound/soc/codecs/wm8971.c | 12 ++++---- sound/soc/codecs/wm8974.c | 2 +- sound/soc/codecs/wm8978.c | 12 ++++---- sound/soc/codecs/wm8988.c | 8 +++--- sound/soc/codecs/wm8990.c | 8 +++--- sound/soc/codecs/wm8993.c | 24 ++++++++-------- sound/soc/codecs/wm8994.c | 34 ++++++++++++------------ sound/soc/codecs/wm9081.c | 18 ++++++------ sound/soc/codecs/wm9713.c | 13 +++++---- sound/soc/codecs/wm_hubs.c | 6 ++-- sound/soc/imx/imx-pcm-dma-mx2.c | 15 ++++++++++- sound/soc/imx/imx-pcm-fiq.c | 55 ++++++++++++++++++++------------------ sound/soc/imx/imx-ssi.c | 3 +- 47 files changed, 303 insertions(+), 276 deletions(-)

2 2

Re: [alsa-devel] No shutdown code in soc-core.c
by ANISH KUMAR 19 Apr '10

19 Apr '10

>Did you see Mark's reply on dev_pm_ops ? >i.e. >static const struct dev_pm_ops soc_pm_ops = { > .suspend = soc_suspend, > .resume = soc_resume, > .poweroff = soc_poweroff, >}; I missed out Mark reply.However i checked now this structure is not there in my code base.As i mentioned in my previous mail the flow of events when restart takes place. Anyway i thought something is amiss in this struct platform_driver soc_driver that is why i am mailing to the experts here otherwise my problem is fixed by having the code as mentioned in my previous mail. I just wanted to know the reason?Or Am i missing something probably the concept of turning off the audio driver?? Kerenl version used: 2.6.29 Regards, anish

3 2

Re: [alsa-devel] [regression] Sound not transferred to docking station after resume from StR
by Takashi Iwai 19 Apr '10

19 Apr '10

At Mon, 19 Apr 2010 14:39:44 +0200, Frans Pop wrote: > > On Monday 19 April 2010, Takashi Iwai wrote: > > Or how about the patch below? > > That fixes the problem too. > > Please add my: > Reported-and-tested-by: Frans Pop <elendil(a)planet.nl> Thanks for a quick check. But I found that the patch isn't fully correct. The patch below should suffice instead of the previous one. Could you check it again? thanks, Takashi --- diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c index 9cbd80c..afbe314 100644 --- a/sound/pci/hda/patch_analog.c +++ b/sound/pci/hda/patch_analog.c @@ -527,14 +527,6 @@ static int ad198x_suspend(struct hda_codec *codec, pm_message_t state) ad198x_power_eapd(codec); return 0; } - -static int ad198x_resume(struct hda_codec *codec) -{ - ad198x_init(codec); - snd_hda_codec_resume_amp(codec); - snd_hda_codec_resume_cache(codec); - return 0; -} #endif static struct hda_codec_ops ad198x_patch_ops = { @@ -547,7 +539,6 @@ static struct hda_codec_ops ad198x_patch_ops = { #endif #ifdef SND_HDA_NEEDS_RESUME .suspend = ad198x_suspend, - .resume = ad198x_resume, #endif .reboot_notify = ad198x_shutup, };

2 2

[alsa-devel] alsaproject.org web site messd up
by Justin Mattock 19 Apr '10

19 Apr '10

when I go to alsaproject.org, II get redirected to some thing saying that alsa has expired? is this real or fake? -- Justin P. Mattock

5 6

[alsa-devel] Alsa-devel missing messages?
by Alan Horstmann 19 Apr '10

19 Apr '10

Hi, I seem to be getting no mail from Alsa-devel since Sat 17th, this was the last: http://mailman.alsa-project.org/pipermail/alsa-devel/2010-April/026981.html Checking those archives over the previous few days it seems that I have been missing some sporadically, eg http://mailman.alsa-project.org/pipermail/alsa-devel/2010-April/026992.html appears not to have come to me. Are others experiencing the same? Is there a known problem? Other mail-lists to the same email address have come through. Alan

2 1

[alsa-devel] [regression] Sound not transferred to docking station after resume from StR
by Frans Pop 19 Apr '10

19 Apr '10

Scenario: - suspend laptop while *un*docked, i.e. with laptop speakers in use - dock laptop - resume With 2.6.33 and earlier the sound would always come from the external speakers connected to the docking station. But with 2.6.34-rc4 I get sound still coming from the laptop's internal speakers, which is not correct. System: HP 2510p running Debian stable ("Lenny") Sound driver: snd_hda_intel; codec: AD1981 Attached my kernel config for .34, and dmesg output for both .33 and .34 showing: - boot (docked) - undocking (visible as several USB disconnects) - suspend - resume after docking I don't see any significant changes in dmesg output during resume. I'll do a bisect, unless someone has some idea what may be causing this.

2 7