lkml.org 
[lkml]   [2008]   [Apr]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: usb audio: make quirk handling more readable, and fix commented-out code
At Sat, 29 Mar 2008 23:35:40 +0100,
Pavel Machek wrote:
>
>
> usb audio contains useful debugging code, protected by #if
> 0. Unfortunately, it will not compile because variable names changed;
> fix it.
>
> Dallas workaround is formatted in a way where it is not quite obvious
> what is normal code and what is quirk. Reformat it to make it obvious.
>
> Signed-off-by: Pavel Machek <pavel@suse.cz>

Applied to ALSA tree now. Thanks.


Takashi

> diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
> index 257a4e1..b6b2490 100644
> --- a/sound/usb/usbaudio.c
> +++ b/sound/usb/usbaudio.c
> @@ -1427,9 +1433,9 @@ static int set_format(struct snd_usb_sub
>
> subs->cur_audiofmt = fmt;
>
> -#if 0
> - printk("setting done: format = %d, rate = %d, channels = %d\n",
> - fmt->format, fmt->rate, fmt->channels);
> +#if 0
> + printk("setting done: format = %d, rate = %d..%d, channels = %d\n",
> + fmt->format, fmt->rate_min, fmt->rate_max, fmt->channels);
> printk(" datapipe = 0x%0x, syncpipe = 0x%0x\n",
> subs->datapipe, subs->syncpipe);
> #endif
> @@ -2464,11 +2470,12 @@ static int parse_audio_format_i_type(str
> }
> break;
> case USB_AUDIO_FORMAT_PCM8:
> - /* Dallas DS4201 workaround */
> + pcm_format = SNDRV_PCM_FORMAT_U8;
> +
> + /* Dallas DS4201 workaround: it advertises U8 format, but really
> + supports S8. */
> if (chip->usb_id == USB_ID(0x04fa, 0x4201))
> pcm_format = SNDRV_PCM_FORMAT_S8;
> - else
> - pcm_format = SNDRV_PCM_FORMAT_U8;
> break;
> case USB_AUDIO_FORMAT_IEEE_FLOAT:
> pcm_format = SNDRV_PCM_FORMAT_FLOAT_LE;
>
> --
> (english) http://www.livejournal.com/~pavelmachek
> (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
>


\
 
 \ /
  Last update: 2008-04-14 12:25    [W:0.032 / U:0.364 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site