[alsa-devel] [PATCH] ASoC: Update omap/ams-delta for TTY API change
Following the receive_buf() change to return the number of bytes received, the cx20442 CODEC driver was updated to report that we accepted all the data that was offered to us. Do the same with the corresponding Amstrad Delta sound card level wrapper function, which is actually registered as the tty line discipline callback instead of the the CODEC function, which it then calls.
Signed-off-by: Janusz Krzysztofik jkrzyszt@tis.icnet.pl --- sound/soc/omap/ams-delta.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
--- git/sound/soc/omap/ams-delta.c.orig 2011-04-09 00:39:54.000000000 +0200 +++ git/sound/soc/omap/ams-delta.c 2011-05-12 18:50:33.000000000 +0200 @@ -331,7 +331,7 @@ static int cx81801_hangup(struct tty_str }
/* Line discipline .recieve_buf() */ -static void cx81801_receive(struct tty_struct *tty, +static unsigned int cx81801_receive(struct tty_struct *tty, const unsigned char *cp, char *fp, int count) { struct snd_soc_codec *codec = tty->disc_data; @@ -347,7 +347,7 @@ static void cx81801_receive(struct tty_s /* Initialize timer used for config pulse generation */ setup_timer(&cx81801_timer, cx81801_timeout, 0);
- v253_ops.receive_buf(tty, cp, fp, count); + ret = v253_ops.receive_buf(tty, cp, fp, count);
/* Link hook switch to DAPM pins */ ret = snd_soc_jack_add_pins(&ams_delta_hook_switch, @@ -358,10 +358,10 @@ static void cx81801_receive(struct tty_s "Failed to link hook switch to DAPM pins, " "will continue with hook switch unlinked.\n");
- return; + return count; }
- v253_ops.receive_buf(tty, cp, fp, count); + ret = v253_ops.receive_buf(tty, cp, fp, count);
for (c = &cp[count - 1]; c >= cp; c--) { if (*c != '\r') @@ -381,6 +381,7 @@ static void cx81801_receive(struct tty_s AMS_DELTA_LATCH2_MODEM_CODEC); break; } + return count; }
/* Line discipline .write_wakeup() */
Following the receive_buf() change to return the number of bytes received, the cx20442 CODEC driver was updated to report that we accepted all the data that was offered to us. Do the same with the corresponding Amstrad Delta sound card level wrapper function, which is actually registered as the tty line discipline callback instead of the the CODEC function, which it then calls.
Signed-off-by: Janusz Krzysztofik jkrzyszt@tis.icnet.pl --- Resend because of line wrap, sorry. Janusz
sound/soc/omap/ams-delta.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
--- git/sound/soc/omap/ams-delta.c.orig 2011-04-09 00:39:54.000000000 +0200 +++ git/sound/soc/omap/ams-delta.c 2011-05-12 18:50:33.000000000 +0200 @@ -331,7 +331,7 @@ static int cx81801_hangup(struct tty_str }
/* Line discipline .recieve_buf() */ -static void cx81801_receive(struct tty_struct *tty, +static unsigned int cx81801_receive(struct tty_struct *tty, const unsigned char *cp, char *fp, int count) { struct snd_soc_codec *codec = tty->disc_data; @@ -347,7 +347,7 @@ static void cx81801_receive(struct tty_s /* Initialize timer used for config pulse generation */ setup_timer(&cx81801_timer, cx81801_timeout, 0);
- v253_ops.receive_buf(tty, cp, fp, count); + ret = v253_ops.receive_buf(tty, cp, fp, count);
/* Link hook switch to DAPM pins */ ret = snd_soc_jack_add_pins(&ams_delta_hook_switch, @@ -358,10 +358,10 @@ static void cx81801_receive(struct tty_s "Failed to link hook switch to DAPM pins, " "will continue with hook switch unlinked.\n");
- return; + return count; }
- v253_ops.receive_buf(tty, cp, fp, count); + ret = v253_ops.receive_buf(tty, cp, fp, count);
for (c = &cp[count - 1]; c >= cp; c--) { if (*c != '\r') @@ -381,6 +381,7 @@ static void cx81801_receive(struct tty_s AMS_DELTA_LATCH2_MODEM_CODEC); break; } + return count; }
/* Line discipline .write_wakeup() */
On Fri, May 13, 2011 at 12:36:07AM +0200, Janusz Krzysztofik wrote:
Following the receive_buf() change to return the number of bytes received, the cx20442 CODEC driver was updated to report that we accepted all the data that was offered to us. Do the same with the corresponding Amstrad Delta sound card level wrapper function, which is actually registered as the tty line discipline callback instead of the the CODEC function, which it then calls.
Signed-off-by: Janusz Krzysztofik jkrzyszt@tis.icnet.pl
Acked-by: Mark Brown broonie@opensource.wolfsonmicro.com
but as the TTY API change is in the TTY tree at the minute and not ASoC you should send this to Greg K-H (ideally also with Liam's ack) unless it's not been applied by the time the merge window comes round.
On 13/05/11 08:00, Mark Brown wrote:
On Fri, May 13, 2011 at 12:36:07AM +0200, Janusz Krzysztofik wrote:
Following the receive_buf() change to return the number of bytes received, the cx20442 CODEC driver was updated to report that we accepted all the data that was offered to us. Do the same with the corresponding Amstrad Delta sound card level wrapper function, which is actually registered as the tty line discipline callback instead of the the CODEC function, which it then calls.
Signed-off-by: Janusz Krzysztofik jkrzyszt@tis.icnet.pl
Acked-by: Mark Brown broonie@opensource.wolfsonmicro.com
but as the TTY API change is in the TTY tree at the minute and not ASoC you should send this to Greg K-H (ideally also with Liam's ack) unless it's not been applied by the time the merge window comes round.
Fine by me too.
Acked-by: Liam Girdwood lrg@ti.com
Dnia piątek 13 maj 2011 o 11:25:32 Liam Girdwood napisał(a):
On 13/05/11 08:00, Mark Brown wrote:
On Fri, May 13, 2011 at 12:36:07AM +0200, Janusz Krzysztofik wrote:
Following the receive_buf() change to return the number of bytes received, the cx20442 CODEC driver was updated to report that we accepted all the data that was offered to us. Do the same with the corresponding Amstrad Delta sound card level wrapper function, which is actually registered as the tty line discipline callback instead of the the CODEC function, which it then calls.
Signed-off-by: Janusz Krzysztofik jkrzyszt@tis.icnet.pl
Acked-by: Mark Brown broonie@opensource.wolfsonmicro.com
but as the TTY API change is in the TTY tree at the minute and not ASoC you should send this to Greg K-H (ideally also with Liam's ack) unless it's not been applied by the time the merge window comes round.
Fine by me too.
Acked-by: Liam Girdwood lrg@ti.com
Hi, I failed to send this patch to Greg before the merge window, sorry. Now that we are in the rc cycle, can it be applied to the sound tree, or should I resend it?
Thanks, Janusz
On 03/06/11 22:37, Janusz Krzysztofik wrote:
Dnia piątek 13 maj 2011 o 11:25:32 Liam Girdwood napisał(a):
On 13/05/11 08:00, Mark Brown wrote:
On Fri, May 13, 2011 at 12:36:07AM +0200, Janusz Krzysztofik wrote:
Following the receive_buf() change to return the number of bytes received, the cx20442 CODEC driver was updated to report that we accepted all the data that was offered to us. Do the same with the corresponding Amstrad Delta sound card level wrapper function, which is actually registered as the tty line discipline callback instead of the the CODEC function, which it then calls.
Signed-off-by: Janusz Krzysztofik jkrzyszt@tis.icnet.pl
Acked-by: Mark Brown broonie@opensource.wolfsonmicro.com
but as the TTY API change is in the TTY tree at the minute and not ASoC you should send this to Greg K-H (ideally also with Liam's ack) unless it's not been applied by the time the merge window comes round.
Fine by me too.
Acked-by: Liam Girdwood lrg@ti.com
Hi, I failed to send this patch to Greg before the merge window, sorry. Now that we are in the rc cycle, can it be applied to the sound tree, or should I resend it?
Best to resend with Ack's.
Thanks
Liam
Hi,
On Mon, Jun 06, 2011 at 10:53:49AM +0100, Liam Girdwood wrote:
On 03/06/11 22:37, Janusz Krzysztofik wrote:
Dnia piątek 13 maj 2011 o 11:25:32 Liam Girdwood napisał(a):
On 13/05/11 08:00, Mark Brown wrote:
On Fri, May 13, 2011 at 12:36:07AM +0200, Janusz Krzysztofik wrote:
Following the receive_buf() change to return the number of bytes received, the cx20442 CODEC driver was updated to report that we accepted all the data that was offered to us. Do the same with the corresponding Amstrad Delta sound card level wrapper function, which is actually registered as the tty line discipline callback instead of the the CODEC function, which it then calls.
Signed-off-by: Janusz Krzysztofik jkrzyszt@tis.icnet.pl
Acked-by: Mark Brown broonie@opensource.wolfsonmicro.com
but as the TTY API change is in the TTY tree at the minute and not ASoC you should send this to Greg K-H (ideally also with Liam's ack) unless it's not been applied by the time the merge window comes round.
Fine by me too.
Acked-by: Liam Girdwood lrg@ti.com
Hi, I failed to send this patch to Greg before the merge window, sorry. Now that we are in the rc cycle, can it be applied to the sound tree, or should I resend it?
Best to resend with Ack's.
I'm not sure, the commit was reverted anyway by Linus.
On Mon 06 Jun 2011 at 11:58:42 Felipe Balbi wrote:
On Mon, Jun 06, 2011 at 10:53:49AM +0100, Liam Girdwood wrote:
On 03/06/11 22:37, Janusz Krzysztofik wrote:
Dnia piątek 13 maj 2011 o 11:25:32 Liam Girdwood napisał(a):
On 13/05/11 08:00, Mark Brown wrote:
On Fri, May 13, 2011 at 12:36:07AM +0200, Janusz Krzysztofik
wrote:
Following the receive_buf() change to return the number of bytes received, the cx20442 CODEC driver was updated to report that we accepted all the data that was offered to us. Do the same with the corresponding Amstrad Delta sound card level wrapper function, which is actually registered as the tty line discipline callback instead of the the CODEC function, which it then calls.
Signed-off-by: Janusz Krzysztofik jkrzyszt@tis.icnet.pl
Acked-by: Mark Brown broonie@opensource.wolfsonmicro.com
but as the TTY API change is in the TTY tree at the minute and not ASoC you should send this to Greg K-H (ideally also with Liam's ack) unless it's not been applied by the time the merge window comes round.
Fine by me too.
Acked-by: Liam Girdwood lrg@ti.com
Hi, I failed to send this patch to Greg before the merge window, sorry. Now that we are in the rc cycle, can it be applied to the sound tree, or should I resend it?
Best to resend with Ack's.
I'm not sure, the commit was reverted anyway by Linus.
Yeah, thanks, I've just found this information while examining the cx20442 history for reference. Forget about this patch then, it's no longer applicable.
Thanks, Janusz
On Fri, May 13, 2011 at 12:36:07AM +0200, Janusz Krzysztofik wrote:
Following the receive_buf() change to return the number of bytes received, the cx20442 CODEC driver was updated to report that we accepted all the data that was offered to us. Do the same with the corresponding Amstrad Delta sound card level wrapper function, which is actually registered as the tty line discipline callback instead of the the CODEC function, which it then calls.
Signed-off-by: Janusz Krzysztofik jkrzyszt@tis.icnet.pl
Applied, thanks.
On Mon 06 Jun 2011 at 12:31:40 Mark Brown wrote:
On Fri, May 13, 2011 at 12:36:07AM +0200, Janusz Krzysztofik wrote:
Following the receive_buf() change to return the number of bytes received, the cx20442 CODEC driver was updated to report that we accepted all the data that was offered to us. Do the same with the corresponding Amstrad Delta sound card level wrapper function, which is actually registered as the tty line discipline callback instead of the the CODEC function, which it then calls.
Signed-off-by: Janusz Krzysztofik jkrzyszt@tis.icnet.pl
Applied, thanks.
Hi Mark, I've just found the underlying TTY API changes, including cx20442, have been reverted, so please drop this patch if you still can, or revert it. Sorry for inconvenience.
Thanks, Janusz
On Mon, Jun 06, 2011 at 12:46:50PM +0200, Janusz Krzysztofik wrote:
I've just found the underlying TTY API changes, including cx20442, have been reverted, so please drop this patch if you still can, or revert it. Sorry for inconvenience.
Dropped again.
participants (4)
-
Felipe Balbi -
Janusz Krzysztofik -
Liam Girdwood -
Mark Brown