* [PATCH] ASoC: Update omap/ams-delta for TTY API change
@ 2011-05-12 17:29 Janusz Krzysztofik
2011-05-12 22:36 ` [RESEND][PATCH] " Janusz Krzysztofik
0 siblings, 1 reply; 11+ messages in thread
From: Janusz Krzysztofik @ 2011-05-12 17:29 UTC (permalink / raw)
To: alsa-devel, patches; +Cc: Mark Brown, Felipe Balbi, Liam Girdwood
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() */
^ permalink raw reply [flat|nested] 11+ messages in thread* [RESEND][PATCH] ASoC: Update omap/ams-delta for TTY API change
2011-05-12 17:29 [PATCH] ASoC: Update omap/ams-delta for TTY API change Janusz Krzysztofik
@ 2011-05-12 22:36 ` Janusz Krzysztofik
2011-05-13 7:00 ` Mark Brown
2011-06-06 10:31 ` Mark Brown
0 siblings, 2 replies; 11+ messages in thread
From: Janusz Krzysztofik @ 2011-05-12 22:36 UTC (permalink / raw)
To: alsa-devel; +Cc: Liam Girdwood, patches, Felipe Balbi, Mark Brown
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() */
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [RESEND][PATCH] ASoC: Update omap/ams-delta for TTY API change
2011-05-12 22:36 ` [RESEND][PATCH] " Janusz Krzysztofik
@ 2011-05-13 7:00 ` Mark Brown
2011-05-13 9:25 ` Liam Girdwood
2011-06-06 10:31 ` Mark Brown
1 sibling, 1 reply; 11+ messages in thread
From: Mark Brown @ 2011-05-13 7:00 UTC (permalink / raw)
To: Janusz Krzysztofik; +Cc: alsa-devel, patches, Felipe Balbi, Liam Girdwood
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.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [RESEND][PATCH] ASoC: Update omap/ams-delta for TTY API change
2011-05-13 7:00 ` Mark Brown
@ 2011-05-13 9:25 ` Liam Girdwood
2011-06-03 21:37 ` Janusz Krzysztofik
0 siblings, 1 reply; 11+ messages in thread
From: Liam Girdwood @ 2011-05-13 9:25 UTC (permalink / raw)
To: Mark Brown
Cc: alsa-devel@alsa-project.org, Janusz Krzysztofik,
patches@opensource.wolfsonmicro.com, Balbi, Felipe, Liam,
Girdwood
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>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [RESEND][PATCH] ASoC: Update omap/ams-delta for TTY API change
2011-05-13 9:25 ` Liam Girdwood
@ 2011-06-03 21:37 ` Janusz Krzysztofik
2011-06-06 9:53 ` Liam Girdwood
0 siblings, 1 reply; 11+ messages in thread
From: Janusz Krzysztofik @ 2011-06-03 21:37 UTC (permalink / raw)
To: Liam Girdwood
Cc: alsa-devel@alsa-project.org, Mark Brown,
patches@opensource.wolfsonmicro.com, Balbi, Felipe, Liam Girdwood
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
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [RESEND][PATCH] ASoC: Update omap/ams-delta for TTY API change
2011-06-03 21:37 ` Janusz Krzysztofik
@ 2011-06-06 9:53 ` Liam Girdwood
2011-06-06 9:58 ` Felipe Balbi
0 siblings, 1 reply; 11+ messages in thread
From: Liam Girdwood @ 2011-06-06 9:53 UTC (permalink / raw)
To: Janusz Krzysztofik
Cc: alsa-devel@alsa-project.org, Mark Brown,
patches@opensource.wolfsonmicro.com, Balbi, Felipe, Liam Girdwood
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
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [RESEND][PATCH] ASoC: Update omap/ams-delta for TTY API change
2011-06-06 9:53 ` Liam Girdwood
@ 2011-06-06 9:58 ` Felipe Balbi
2011-06-06 10:37 ` Janusz Krzysztofik
0 siblings, 1 reply; 11+ messages in thread
From: Felipe Balbi @ 2011-06-06 9:58 UTC (permalink / raw)
To: Liam Girdwood
Cc: alsa-devel@alsa-project.org, patches@opensource.wolfsonmicro.com,
Janusz Krzysztofik, Mark Brown, Balbi, Felipe, Liam Girdwood
[-- Attachment #1.1: Type: text/plain, Size: 1505 bytes --]
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.
--
balbi
[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [RESEND][PATCH] ASoC: Update omap/ams-delta for TTY API change
2011-06-06 9:58 ` Felipe Balbi
@ 2011-06-06 10:37 ` Janusz Krzysztofik
0 siblings, 0 replies; 11+ messages in thread
From: Janusz Krzysztofik @ 2011-06-06 10:37 UTC (permalink / raw)
To: balbi
Cc: alsa-devel@alsa-project.org, Mark Brown, Liam Girdwood,
Liam Girdwood, patches@opensource.wolfsonmicro.com
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
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [RESEND][PATCH] ASoC: Update omap/ams-delta for TTY API change
2011-05-12 22:36 ` [RESEND][PATCH] " Janusz Krzysztofik
2011-05-13 7:00 ` Mark Brown
@ 2011-06-06 10:31 ` Mark Brown
2011-06-06 10:46 ` Janusz Krzysztofik
1 sibling, 1 reply; 11+ messages in thread
From: Mark Brown @ 2011-06-06 10:31 UTC (permalink / raw)
To: Janusz Krzysztofik; +Cc: alsa-devel, patches, Felipe Balbi, Liam Girdwood
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.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [RESEND][PATCH] ASoC: Update omap/ams-delta for TTY API change
2011-06-06 10:31 ` Mark Brown
@ 2011-06-06 10:46 ` Janusz Krzysztofik
2011-06-06 10:57 ` Mark Brown
0 siblings, 1 reply; 11+ messages in thread
From: Janusz Krzysztofik @ 2011-06-06 10:46 UTC (permalink / raw)
To: Mark Brown; +Cc: alsa-devel, patches, Felipe Balbi, Liam Girdwood
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
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [RESEND][PATCH] ASoC: Update omap/ams-delta for TTY API change
2011-06-06 10:46 ` Janusz Krzysztofik
@ 2011-06-06 10:57 ` Mark Brown
0 siblings, 0 replies; 11+ messages in thread
From: Mark Brown @ 2011-06-06 10:57 UTC (permalink / raw)
To: Janusz Krzysztofik; +Cc: alsa-devel, patches, Felipe Balbi, Liam Girdwood
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.
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2011-06-06 10:57 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-12 17:29 [PATCH] ASoC: Update omap/ams-delta for TTY API change Janusz Krzysztofik
2011-05-12 22:36 ` [RESEND][PATCH] " Janusz Krzysztofik
2011-05-13 7:00 ` Mark Brown
2011-05-13 9:25 ` Liam Girdwood
2011-06-03 21:37 ` Janusz Krzysztofik
2011-06-06 9:53 ` Liam Girdwood
2011-06-06 9:58 ` Felipe Balbi
2011-06-06 10:37 ` Janusz Krzysztofik
2011-06-06 10:31 ` Mark Brown
2011-06-06 10:46 ` Janusz Krzysztofik
2011-06-06 10:57 ` Mark Brown
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.