[PATCH] sscape: fix incorrect timeout after microcode upload

[PATCH] sscape: fix incorrect timeout after microcode upload

[Krzysztof Helt]

From: Krzysztof Helt <krzysztof.h1@wp.pl>

A comment states that one should wait up to 5 secs
while a waiting loop waits only 5 system ticks.

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
---
Ted tested that patch and it allowed him uploading
a microcode into the Soundscape Elite. However,
midi does not work for him yet.

 sound/isa/sscape.c |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sound/isa/sscape.c b/sound/isa/sscape.c
index bc44916..347a880 100644
--- a/sound/isa/sscape.c
+++ b/sound/isa/sscape.c
@@ -393,19 +393,19 @@ static int sscape_wait_dma_unsafe(unsigned io_base, enum GA_REG reg, unsigned ti
  */
 static int obp_startup_ack(struct soundscape *s, unsigned timeout)
 {
-	while (timeout != 0) {
+	unsigned long end_time = jiffies + msecs_to_jiffies(timeout);
+
+	while (time_before(jiffies, end_time)) {
 		unsigned long flags;
 		unsigned char x;
 
-		schedule_timeout_uninterruptible(1);
-
 		spin_lock_irqsave(&s->lock, flags);
 		x = inb(HOST_DATA_IO(s->io_base));
 		spin_unlock_irqrestore(&s->lock, flags);
 		if ((x & 0xfe) == 0xfe)
 			return 1;
 
-		--timeout;
+		msleep(10);
 	} /* while */
 
 	return 0;
@@ -420,19 +420,19 @@ static int obp_startup_ack(struct soundscape *s, unsigned timeout)
  */
 static int host_startup_ack(struct soundscape *s, unsigned timeout)
 {
-	while (timeout != 0) {
+	unsigned long end_time = jiffies + msecs_to_jiffies(timeout);
+
+	while (time_before(jiffies, end_time)) {
 		unsigned long flags;
 		unsigned char x;
 
-		schedule_timeout_uninterruptible(1);
-
 		spin_lock_irqsave(&s->lock, flags);
 		x = inb(HOST_DATA_IO(s->io_base));
 		spin_unlock_irqrestore(&s->lock, flags);
 		if (x == 0xfe)
 			return 1;
 
-		--timeout;
+		msleep(10);
 	} /* while */
 
 	return 0;
@@ -529,10 +529,10 @@ static int upload_dma_data(struct soundscape *s,
 	 * give it 5 seconds (max) ...
 	 */
 	ret = 0;
-	if (!obp_startup_ack(s, 5)) {
+	if (!obp_startup_ack(s, 5000)) {
 		snd_printk(KERN_ERR "sscape: No response from on-board processor after upload\n");
 		ret = -EAGAIN;
-	} else if (!host_startup_ack(s, 5)) {
+	} else if (!host_startup_ack(s, 5000)) {
 		snd_printk(KERN_ERR "sscape: SoundScape failed to initialise\n");
 		ret = -EAGAIN;
 	}
-- 
1.5.2.2


-----------------------------------------------------------------------
Promocja w Speak Up. Kwartal angielskiego za darmo. 
3 miesiace nauki gratis. Sprawdz teraz! >> http://link.interia.pl/f2019

Re: [PATCH] sscape: fix incorrect timeout after microcode upload

[Takashi Iwai]

At Mon, 12 Jan 2009 17:54:16 +0100,
Krzysztof Helt wrote:
> 
> From: Krzysztof Helt <krzysztof.h1@wp.pl>
> 
> A comment states that one should wait up to 5 secs
> while a waiting loop waits only 5 system ticks.
> 
> Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
> ---
> Ted tested that patch and it allowed him uploading
> a microcode into the Soundscape Elite. However,
> midi does not work for him yet.
> 
>  sound/isa/sscape.c |   20 ++++++++++----------
>  1 files changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/sound/isa/sscape.c b/sound/isa/sscape.c
> index bc44916..347a880 100644
> --- a/sound/isa/sscape.c
> +++ b/sound/isa/sscape.c
> @@ -393,19 +393,19 @@ static int sscape_wait_dma_unsafe(unsigned io_base, enum GA_REG reg, unsigned ti
>   */
>  static int obp_startup_ack(struct soundscape *s, unsigned timeout)
>  {
> -	while (timeout != 0) {
> +	unsigned long end_time = jiffies + msecs_to_jiffies(timeout);
> +
> +	while (time_before(jiffies, end_time)) {

In general it's better to use a do-while for the time-out check.
That is, the timeout should be checked after the data check.

Could you fix and repost?


thanks,

Takashi


>  		unsigned long flags;
>  		unsigned char x;
>  
> -		schedule_timeout_uninterruptible(1);
> -
>  		spin_lock_irqsave(&s->lock, flags);
>  		x = inb(HOST_DATA_IO(s->io_base));
>  		spin_unlock_irqrestore(&s->lock, flags);
>  		if ((x & 0xfe) == 0xfe)
>  			return 1;
>  
> -		--timeout;
> +		msleep(10);
>  	} /* while */
>  
>  	return 0;
> @@ -420,19 +420,19 @@ static int obp_startup_ack(struct soundscape *s, unsigned timeout)
>   */
>  static int host_startup_ack(struct soundscape *s, unsigned timeout)
>  {
> -	while (timeout != 0) {
> +	unsigned long end_time = jiffies + msecs_to_jiffies(timeout);
> +
> +	while (time_before(jiffies, end_time)) {
>  		unsigned long flags;
>  		unsigned char x;
>  
> -		schedule_timeout_uninterruptible(1);
> -
>  		spin_lock_irqsave(&s->lock, flags);
>  		x = inb(HOST_DATA_IO(s->io_base));
>  		spin_unlock_irqrestore(&s->lock, flags);
>  		if (x == 0xfe)
>  			return 1;
>  
> -		--timeout;
> +		msleep(10);
>  	} /* while */
>  
>  	return 0;
> @@ -529,10 +529,10 @@ static int upload_dma_data(struct soundscape *s,
>  	 * give it 5 seconds (max) ...
>  	 */
>  	ret = 0;
> -	if (!obp_startup_ack(s, 5)) {
> +	if (!obp_startup_ack(s, 5000)) {
>  		snd_printk(KERN_ERR "sscape: No response from on-board processor after upload\n");
>  		ret = -EAGAIN;
> -	} else if (!host_startup_ack(s, 5)) {
> +	} else if (!host_startup_ack(s, 5000)) {
>  		snd_printk(KERN_ERR "sscape: SoundScape failed to initialise\n");
>  		ret = -EAGAIN;
>  	}
> -- 
> 1.5.2.2
> 
> 
> -----------------------------------------------------------------------
> Promocja w Speak Up. Kwartal angielskiego za darmo. 
> 3 miesiace nauki gratis. Sprawdz teraz! >> http://link.interia.pl/f2019
> 

[PATCH] serato phono patch

[LCID Fire]

Add serato input phono switch

diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
index b8cfb7c..66fc115 100644
--- a/sound/usb/usbaudio.c
+++ b/sound/usb/usbaudio.c
@@ -2859,7 +2859,7 @@ static int snd_usb_create_streams(struct 
snd_usb_audio *chip, int ctrlif)
     /* find audiocontrol interface */
     host_iface = &usb_ifnum_to_if(dev, ctrlif)->altsetting[0];
     if (!(p1 = snd_usb_find_csint_desc(host_iface->extra, 
host_iface->extralen, NULL, HEADER))) {
-        snd_printk(KERN_ERR "cannot find HEADER\n");
+        snd_printk(KERN_ERR "cannot find HEADER for %d in %s\n", 
ctrlif, host_iface->extra);
         return -EINVAL;
     }
     if (! p1[7] || p1[0] < 8 + p1[7]) {
diff --git a/sound/usb/usbmixer.c b/sound/usb/usbmixer.c
index 89c63d0..8e936d1 100644
--- a/sound/usb/usbmixer.c
+++ b/sound/usb/usbmixer.c
@@ -2012,6 +2012,233 @@ static void snd_audigy2nx_proc_read(struct 
snd_info_entry *entry,
     }
 }
 
+void snd_usb_cleanup_interrupt_urb(struct urb* pUrb)
+{
+    if(pUrb->transfer_buffer_length > 0)
+        kfree(pUrb->transfer_buffer);
+   
+    if(pUrb->context)
+        kfree(pUrb->context);
+
+    usb_free_urb(pUrb);
+}
+
+/* Wrapper for setting and submitting the interrupt urb().*/
+int snd_usb_interrupt_trans(struct usb_device *dev, unsigned int pipe, 
void *data,
+             __u16 size, usb_complete_t callback)
+{
+    int err;
+    void *buf = NULL;
+    struct urb* pUrb = NULL;
+
+    if (size > 0) {
+        buf = kmemdup(data, size, GFP_KERNEL);
+        if (!buf)
+            return -ENOMEM;
+    }
+
+    pUrb = usb_alloc_urb(1/*int iso packets*/, GFP_KERNEL);
+
+    /*TODO: Remove hardcoded 4*/
+    usb_fill_int_urb(pUrb, dev, pipe, buf, size, callback, NULL, 4);
+
+    err = usb_submit_urb(pUrb, GFP_KERNEL);
+   
+    return err;
+}
+
+#define snd_sl_phono_info        snd_ctl_boolean_mono_info
+
+#define snd_sl_phono_receive snd_usb_cleanup_interrupt_urb
+
+#define snd_sl_phono_changed snd_sl_phono_receive
+
+static int snd_sl_phono_get(struct snd_kcontrol *kcontrol, struct 
snd_ctl_elem_value *ucontrol)
+{
+    ucontrol->value.integer.value[0] = kcontrol->private_value;
+
+/* getting value of the device - commented out
+
+    snd_usb_interrupt_trans(mixer->chip->dev,
+                usb_rcvbulkpipe(mixer->chip->dev, 0x83),
+                buffer, bufferSize, snd_sl_phono_receive);
+
+    unsigned char statusMessage[] = {7};
+
+    snd_usb_interrupt_trans(mixer->chip->dev,
+                usb_sndintpipe(mixer->chip->dev, 0x03),
+                statusMessage, 1, snd_sl_phono_receive);
+*/
+
+    return 0;
+}
+
+/* Log of usb messages on startup
+STARTUP:
+
+IN  03 Length: 0x40 ...
+OUT 83 Length: 0x01 "00"
+IN  03 Length: 0x40 "00 00 03 00 FF FF 02 00 01 00 03 00 01 00 FB FF 01 
00 FF FF 06 00 02 00 FF FF 03 00 05 00 00 00 06 00 FC FF FD FF 03 00 FD 
FF 04 00 FB FF F8 FF FC FF FD FF 06 00 01 00 01 00 FF FF 04 00 02 00"
+
+IN  03 Length: 0x40 ...
+OUT 83 Length: 0x02 "07 01"
+IN  03 Length: 0x40 "07 FF 03 00 FF FF 02 00 01 00 03 00 01 00 FB FF 01 
00 FF FF 06 00 02 00 FF FF 03 00 05 00 00 00 06 00 FC FF FD FF 03 00 FD 
FF 04 00 FB FF F8 FF FC FF FD FF 06 00 01 00 01 00 FF FF 04 00 02 00"
+
+IN  03 Length: 0x40 ...
+OUT 83 Length: 0x01 "06"
+OUT 83 Length: 0x01 "00"
+IN  03 Length: 0x40 "00 FF FE FF FD FF 01 00 03 00 07 00 FE FF 08 00 03 
00 00 00 FC FF 03 00 FF FF 00 00 01 00 03 00 FB FF F9 FF 01 00 FF FF FD 
FF 00 00 FE FF FA FF FF FF FD FF 01 00 04 00 00 00 03 00 FB FF 01 00"
+
+IN  03 Length: 0x40 ...
+OUT 83 Length: 0x01 "01"
+IN  03 Length: 0x40 "01 42 FC 54 03 FF 01 00 03 00 07 00 FE FF 08 00 03 
00 00 00 FC FF 03 00 FF FF 00 00 01 00 03 00 FB FF F9 FF 01 00 FF FF FD 
FF 00 00 FE FF FA FF FF FF FD FF 01 00 04 00 00
+*/
+
+/* Following the messages that are sent prior and after setting the device
+ * no clue what they are good for - but they don't seem necessary
+static int snd_sl_phono_start(struct snd_kcontrol *kcontrol)
+{
+    unsigned char buffer[] = {0};
+    struct usb_mixer_interface *mixer = snd_kcontrol_chip(kcontrol);
+    return snd_usb_interrupt_trans(mixer->chip->dev,
+                usb_sndintpipe(mixer->chip->dev, 0x03),
+                buffer, 1, snd_sl_phono_receive);
+}
+
+static int snd_sl_phono_end(struct snd_kcontrol *kcontrol)
+{
+    unsigned char buffer[] = {6};
+    struct usb_mixer_interface *mixer = snd_kcontrol_chip(kcontrol);
+    return snd_usb_interrupt_trans(mixer->chip->dev,
+                usb_sndintpipe(mixer->chip->dev, 0x03),
+                buffer, 1, snd_sl_phono_receive);
+}
+*/
+
+static int snd_sl_phono_put(struct snd_kcontrol *kcontrol, struct 
snd_ctl_elem_value *ucontrol)
+{
+    int err, changed;
+    const unsigned int bufferSize = 64;
+    unsigned char buffer[bufferSize];   
+    unsigned char instructions[] = {7, 0};
+   
+    struct usb_mixer_interface *mixer = snd_kcontrol_chip(kcontrol);
+    int value = ucontrol->value.integer.value[0];   
+
+/* USB traffic by serato driver
+line to phono:
+
+OUT 03 Length: 0x01 "00"
+
+IN  83 Length: 0x40 ...
+OUT 03 Length: 0x02 "07 00"
+IN  83 Length: 0x40 "07 00 01 00 04 00 02 00 02 00 05 00 04 00 02 00 05 
00 06 00 02 00 01 00 03 00 0E 00 05 00 0E 00 09 00 FF FF 02 00 02 00 05 
00 03 00 FA FF 04 00 05 00 07 00 08 00 01 00 02 00 01 00 02 00 01 00"
+
+IN  83 Length: 0x40 ...
+OUT 03 Length: 0x01 "06"
+IN  83 Length: 0x40 No answer!?
+
+phono to line:
+OUT 03 Length: 0x01 "00"
+
+IN  83 Length: 0x40 ...
+OUT 03 Length: 0x02 "07 01"
+IN  83 Length: 0x40 "07 FF F9 FF FB FF 01 00 FF FF FE FF F6 FF EF FF F8 
FF FD FF FB FF FC FF FA FF 00 00 FA FF F7 FF F5 FF FB FF 01 00 F7 FF F7 
FF FC FF F9 FF F9 FF F7 FF F7 FF 00 00 F4 FF FB FF F6 FF F9 FF FA FF"
+
+IN  83 Length: 0x40 ...
+OUT 03 Length: 0x01 "06"
+IN  83 Length: 0x40 No answer!?
+*/
+
+    if (value > 1)
+        return -EINVAL;
+
+    changed = (value != ucontrol->value.integer.value[0]);
+
+/* outcommented for now since it works without and don't have a clue 
what it's good for
+    err = snd_sl_phono_start(kcontrol);
+*/
+
+    err = snd_usb_interrupt_trans(mixer->chip->dev,
+                usb_rcvbulkpipe(mixer->chip->dev, 0x83),
+                buffer, bufferSize, snd_sl_phono_receive);
+   
+    /* 07 00 = phone
+       07 01 = line */
+    instructions[1] = !value;
+
+    err =  snd_usb_interrupt_trans(mixer->chip->dev,
+                usb_sndintpipe(mixer->chip->dev, 0x03),
+                instructions, 2, snd_sl_phono_receive);
+
+    if(err < 0)
+        return err;
+   
+    err = snd_usb_interrupt_trans(mixer->chip->dev,
+                usb_rcvbulkpipe(mixer->chip->dev, 0x83),
+                buffer, bufferSize, snd_sl_phono_changed);
+
+/* outcommented for now since it works without and don't have a clue 
what it's good for
+    err = snd_sl_phono_end(kcontrol);
+*/
+
+    if (err < 0)
+        return err;
+
+    kcontrol->private_value = value;
+    return changed;
+}
+
+static struct snd_kcontrol_new snd_sl_controls[] =
+{
+    {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = "Capture Switch",
+        .info = snd_sl_phono_info,
+        .get = snd_sl_phono_get,
+        .put = snd_sl_phono_put,
+        .private_value = 1, /*switch is activated*/
+    }
+};
+
+/* gets called multiple times! */
+static int snd_sl_controls_create(struct usb_mixer_interface *mixer)
+{
+    int i, err;
+
+    for (i = 0; i < ARRAY_SIZE(snd_sl_controls); ++i) {
+        struct snd_ctl_elem_value ucontrol;
+        struct snd_kcontrol *kcontrol = 
snd_ctl_new1(&snd_sl_controls[i], mixer);
+
+        /* Since we only need one control and the routine
+         * is called multiple times we have to ignore all
+         * attempts to attach controls multiple times*/
+        if(snd_ctl_find_id(mixer->chip->card, &kcontrol->id))
+        {
+            /* we found the control - it is already present
+             * so just continue*/
+            snd_ctl_free_one(kcontrol);
+            continue;
+        }
+
+        /* add frees the control if on err < 0! */
+        err = snd_ctl_add(mixer->chip->card,
+                  kcontrol);
+        if (err < 0)
+            return err;
+       
+        /* Phono input is on by default */
+        ucontrol.value.integer.value[0] = 1;
+
+        err = snd_sl_phono_put(kcontrol, &ucontrol);
+
+        if(err < 0)
+            return err; /* the device screwed up */
+    }
+
+    return 0;
+}
+
 int snd_usb_create_mixer(struct snd_usb_audio *chip, int ctrlif)
 {
     static struct snd_device_ops dev_ops = {
@@ -2043,6 +2270,11 @@ int snd_usb_create_mixer(struct snd_usb_audio 
*chip, int ctrlif)
     if ((err = snd_usb_soundblaster_remote_init(mixer)) < 0)
         goto _error;
 
+    if (mixer->chip->usb_id == USB_ID(0x13e5, 0x001)) {
+        if ((err = snd_sl_controls_create(mixer)) < 0)
+            goto _error;
+    }
+
     if (mixer->chip->usb_id == USB_ID(0x041e, 0x3020) ||
         mixer->chip->usb_id == USB_ID(0x041e, 0x3040)) {
         struct snd_info_entry *entry;
diff --git a/sound/usb/usbmixer_maps.c b/sound/usb/usbmixer_maps.c
index d755be0..87054af 100644
--- a/sound/usb/usbmixer_maps.c
+++ b/sound/usb/usbmixer_maps.c
@@ -261,6 +261,22 @@ static struct usbmix_name_map aureon_51_2_map[] = {
     {} /* terminator */
 };
 
+static struct usbmix_name_map scratch_live_map[] = {
+    /* 1: IT Line 1 (USB streaming) */
+    /* 2: OT Line 1 (Speaker) */
+    /* 3: IT Line 1 (Line connector) */
+    { 4, "Line 1 In" }, /* FU */
+    /* 5: OT Line 1 (USB streaming) */
+    /* 6: IT Line 2 (USB streaming) */
+    /* 7: OT Line 2 (Speaker) */
+    /* 8: IT Line 2 (Line connector) */
+    { 9, "Line 2 In" }, /* FU */
+    /* 10: OT Line 2 (USB streaming) */
+    /* 11: IT Mic (Line connector) */
+    /* 12: OT Mic (USB streaming) */
+    { 0 } /* terminator */
+};
+
 /*
  * Control map entries
  */
@@ -311,6 +327,11 @@ static struct usbmix_ctl_map usbmix_ctl_maps[] = {
         .id = USB_ID(0x0ccd, 0x0028),
         .map = aureon_51_2_map,
     },
+    {
+        .id = USB_ID(0x13e5, 0x0001),
+        .map = scratch_live_map,
+        .ignore_ctl_error = 1,
+    },
     { 0 } /* terminator */
 };

Re: [PATCH] serato phono patch

[Takashi Iwai]

At Mon, 12 Jan 2009 20:07:22 +0100,
LCID Fire wrote:
> 
> Add serato input phono switch

Thank you for the patch.

Could you give a more detailed patch description?
Also, don't forget to give your sign-off.  Otherwise I can't merge
it to the upstream for such an amount of patch.

Also, the patch embedded in your post seems broken due to line breaks
likely by your MUA.  Please fix MUA setting or use an attachment if
difficult to fix.

Some quick review comments below...

> diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
> index b8cfb7c..66fc115 100644
> --- a/sound/usb/usbaudio.c
> +++ b/sound/usb/usbaudio.c
> @@ -2859,7 +2859,7 @@ static int snd_usb_create_streams(struct 
> snd_usb_audio *chip, int ctrlif)
>      /* find audiocontrol interface */
>      host_iface = &usb_ifnum_to_if(dev, ctrlif)->altsetting[0];
>      if (!(p1 = snd_usb_find_csint_desc(host_iface->extra, 
> host_iface->extralen, NULL, HEADER))) {
> -        snd_printk(KERN_ERR "cannot find HEADER\n");
> +        snd_printk(KERN_ERR "cannot find HEADER for %d in %s\n", 
> ctrlif, host_iface->extra);

Is host_iface->extra really NULL-terminated, i.e. safe to use as a
string?

> diff --git a/sound/usb/usbmixer.c b/sound/usb/usbmixer.c
> index 89c63d0..8e936d1 100644
> --- a/sound/usb/usbmixer.c
> +++ b/sound/usb/usbmixer.c
> @@ -2012,6 +2012,233 @@ static void snd_audigy2nx_proc_read(struct 
> snd_info_entry *entry,
>      }
>  }
>  
> +void snd_usb_cleanup_interrupt_urb(struct urb* pUrb)

Make it static.

> +{
> +    if(pUrb->transfer_buffer_length > 0)
> +        kfree(pUrb->transfer_buffer);
> +   
> +    if(pUrb->context)
> +        kfree(pUrb->context);

No need of a NULL-check for kfree.

> +
> +    usb_free_urb(pUrb);
> +}
> +
> +/* Wrapper for setting and submitting the interrupt urb().*/
> +int snd_usb_interrupt_trans(struct usb_device *dev, unsigned int pipe, 
> void *data,
> +             __u16 size, usb_complete_t callback)

Make it static.

> +{
> +    int err;
> +    void *buf = NULL;
> +    struct urb* pUrb = NULL;

No need to initialize this.

> +
> +    if (size > 0) {
> +        buf = kmemdup(data, size, GFP_KERNEL);
> +        if (!buf)
> +            return -ENOMEM;
> +    }
> +
> +    pUrb = usb_alloc_urb(1/*int iso packets*/, GFP_KERNEL);

Missing NULL check.

> +    /*TODO: Remove hardcoded 4*/
> +    usb_fill_int_urb(pUrb, dev, pipe, buf, size, callback, NULL, 4);
> +
> +    err = usb_submit_urb(pUrb, GFP_KERNEL);
> +   
> +    return err;

Possible memory leak when error?

> +static int snd_sl_phono_put(struct snd_kcontrol *kcontrol, struct 
> snd_ctl_elem_value *ucontrol)
(snip)
> +
> +    err = snd_usb_interrupt_trans(mixer->chip->dev,
> +                usb_rcvbulkpipe(mixer->chip->dev, 0x83),
> +                buffer, bufferSize, snd_sl_phono_receive);

No error check?

Also, there are a few coding-style issues.
I'd suggest you to run scripts/checkpatch.pl once.


thanks,

Takashi

Re: [PATCH] serato phono patch

[LCID Fire]

Takashi Iwai wrote:
> Could you give a more detailed patch description?
Yes, I should have splitted them into single patches in the first place. 
So attached is the first one (including description ;)).

Re: [PATCH] serato phono patch

[LCID Fire]

[-- Attachment #1: Type: text/plain, Size: 204 bytes --]

Takashi Iwai wrote:
> Could you give a more detailed patch description?
Yes, I should have splitted them into single patches in the first place.
So attached is the first one (including description ;)).



[-- Attachment #2: commit-00092c5 --]
[-- Type: text/plain, Size: 1469 bytes --]

commit 00092c5912ba7eb162599686388a2cac5c72c262
Author: LCID Fire <lcid-fire@gmx.net>
Date:   Sat Jan 17 16:47:06 2009 +0100

    Ignore errors (wrong usb interface data) found when using the serato scratch live box with alsa
    Thus the alsa controls can be accessed (beware: they don't work though - but at least it's one ugly error message less)
    
    Signed-off-by: LCID Fire <lcid-fire@gmx.net>

diff --git a/sound/usb/usbmixer_maps.c b/sound/usb/usbmixer_maps.c
index d755be0..87054af 100644
--- a/sound/usb/usbmixer_maps.c
+++ b/sound/usb/usbmixer_maps.c
@@ -261,6 +261,22 @@ static struct usbmix_name_map aureon_51_2_map[] = {
 	{} /* terminator */
 };
 
+static struct usbmix_name_map scratch_live_map[] = {
+	/* 1: IT Line 1 (USB streaming) */
+	/* 2: OT Line 1 (Speaker) */
+	/* 3: IT Line 1 (Line connector) */
+	{ 4, "Line 1 In" }, /* FU */
+	/* 5: OT Line 1 (USB streaming) */
+	/* 6: IT Line 2 (USB streaming) */
+	/* 7: OT Line 2 (Speaker) */
+	/* 8: IT Line 2 (Line connector) */
+	{ 9, "Line 2 In" }, /* FU */
+	/* 10: OT Line 2 (USB streaming) */
+	/* 11: IT Mic (Line connector) */
+	/* 12: OT Mic (USB streaming) */
+	{ 0 } /* terminator */
+};
+
 /*
  * Control map entries
  */
@@ -311,6 +327,11 @@ static struct usbmix_ctl_map usbmix_ctl_maps[] = {
 		.id = USB_ID(0x0ccd, 0x0028),
 		.map = aureon_51_2_map,
 	},
+	{
+		.id = USB_ID(0x13e5, 0x0001),
+		.map = scratch_live_map,
+		.ignore_ctl_error = 1,
+	},
 	{ 0 } /* terminator */
 };
 

[-- Attachment #3: Type: text/plain, Size: 160 bytes --]

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

[PATCH] sscape: fix incorrect timeout after microcode upload

[Krzysztof Helt]

From: Krzysztof Helt <krzysztof.h1@wp.pl>

A comment states that one should wait up to 5 secs
while a waiting loop waits only 5 system ticks.
---
This is a second version of the patch with while loops
changed to do-while ones.

 sound/isa/sscape.c |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/sound/isa/sscape.c b/sound/isa/sscape.c
index bc44916..6a7f842 100644
--- a/sound/isa/sscape.c
+++ b/sound/isa/sscape.c
@@ -393,20 +393,20 @@ static int sscape_wait_dma_unsafe(unsigned io_base, enum GA_REG reg, unsigned ti
  */
 static int obp_startup_ack(struct soundscape *s, unsigned timeout)
 {
-	while (timeout != 0) {
+	unsigned long end_time = jiffies + msecs_to_jiffies(timeout);
+
+	do {
 		unsigned long flags;
 		unsigned char x;
 
-		schedule_timeout_uninterruptible(1);
-
 		spin_lock_irqsave(&s->lock, flags);
 		x = inb(HOST_DATA_IO(s->io_base));
 		spin_unlock_irqrestore(&s->lock, flags);
 		if ((x & 0xfe) == 0xfe)
 			return 1;
 
-		--timeout;
-	} /* while */
+		msleep(10);
+	} while (time_before(jiffies, end_time));
 
 	return 0;
 }
@@ -420,20 +420,20 @@ static int obp_startup_ack(struct soundscape *s, unsigned timeout)
  */
 static int host_startup_ack(struct soundscape *s, unsigned timeout)
 {
-	while (timeout != 0) {
+	unsigned long end_time = jiffies + msecs_to_jiffies(timeout);
+
+	do {
 		unsigned long flags;
 		unsigned char x;
 
-		schedule_timeout_uninterruptible(1);
-
 		spin_lock_irqsave(&s->lock, flags);
 		x = inb(HOST_DATA_IO(s->io_base));
 		spin_unlock_irqrestore(&s->lock, flags);
 		if (x == 0xfe)
 			return 1;
 
-		--timeout;
-	} /* while */
+		msleep(10);
+	} while (time_before(jiffies, end_time));
 
 	return 0;
 }
@@ -529,10 +529,10 @@ static int upload_dma_data(struct soundscape *s,
 	 * give it 5 seconds (max) ...
 	 */
 	ret = 0;
-	if (!obp_startup_ack(s, 5)) {
+	if (!obp_startup_ack(s, 5000)) {
 		snd_printk(KERN_ERR "sscape: No response from on-board processor after upload\n");
 		ret = -EAGAIN;
-	} else if (!host_startup_ack(s, 5)) {
+	} else if (!host_startup_ack(s, 5000)) {
 		snd_printk(KERN_ERR "sscape: SoundScape failed to initialise\n");
 		ret = -EAGAIN;
 	}
-- 
1.5.2.2


----------------------------------------------------------------------
Speak Up. Angielski szybko i skutecznie. 3 miesiace nauki gratis.
Sprawdz. >> http://link.interia.pl/f2019

Re: [PATCH] sscape: fix incorrect timeout after microcode upload

[Takashi Iwai]

At Mon, 12 Jan 2009 21:25:04 +0100,
Krzysztof Helt wrote:
> 
> From: Krzysztof Helt <krzysztof.h1@wp.pl>
> 
> A comment states that one should wait up to 5 secs
> while a waiting loop waits only 5 system ticks.

Thanks, applied now.
(BTW, don't forget a sign-off at each version.)


Takashi

> ---
> This is a second version of the patch with while loops
> changed to do-while ones.
> 
>  sound/isa/sscape.c |   24 ++++++++++++------------
>  1 files changed, 12 insertions(+), 12 deletions(-)
> 
> diff --git a/sound/isa/sscape.c b/sound/isa/sscape.c
> index bc44916..6a7f842 100644
> --- a/sound/isa/sscape.c
> +++ b/sound/isa/sscape.c
> @@ -393,20 +393,20 @@ static int sscape_wait_dma_unsafe(unsigned io_base, enum GA_REG reg, unsigned ti
>   */
>  static int obp_startup_ack(struct soundscape *s, unsigned timeout)
>  {
> -	while (timeout != 0) {
> +	unsigned long end_time = jiffies + msecs_to_jiffies(timeout);
> +
> +	do {
>  		unsigned long flags;
>  		unsigned char x;
>  
> -		schedule_timeout_uninterruptible(1);
> -
>  		spin_lock_irqsave(&s->lock, flags);
>  		x = inb(HOST_DATA_IO(s->io_base));
>  		spin_unlock_irqrestore(&s->lock, flags);
>  		if ((x & 0xfe) == 0xfe)
>  			return 1;
>  
> -		--timeout;
> -	} /* while */
> +		msleep(10);
> +	} while (time_before(jiffies, end_time));
>  
>  	return 0;
>  }
> @@ -420,20 +420,20 @@ static int obp_startup_ack(struct soundscape *s, unsigned timeout)
>   */
>  static int host_startup_ack(struct soundscape *s, unsigned timeout)
>  {
> -	while (timeout != 0) {
> +	unsigned long end_time = jiffies + msecs_to_jiffies(timeout);
> +
> +	do {
>  		unsigned long flags;
>  		unsigned char x;
>  
> -		schedule_timeout_uninterruptible(1);
> -
>  		spin_lock_irqsave(&s->lock, flags);
>  		x = inb(HOST_DATA_IO(s->io_base));
>  		spin_unlock_irqrestore(&s->lock, flags);
>  		if (x == 0xfe)
>  			return 1;
>  
> -		--timeout;
> -	} /* while */
> +		msleep(10);
> +	} while (time_before(jiffies, end_time));
>  
>  	return 0;
>  }
> @@ -529,10 +529,10 @@ static int upload_dma_data(struct soundscape *s,
>  	 * give it 5 seconds (max) ...
>  	 */
>  	ret = 0;
> -	if (!obp_startup_ack(s, 5)) {
> +	if (!obp_startup_ack(s, 5000)) {
>  		snd_printk(KERN_ERR "sscape: No response from on-board processor after upload\n");
>  		ret = -EAGAIN;
> -	} else if (!host_startup_ack(s, 5)) {
> +	} else if (!host_startup_ack(s, 5000)) {
>  		snd_printk(KERN_ERR "sscape: SoundScape failed to initialise\n");
>  		ret = -EAGAIN;
>  	}
> -- 
> 1.5.2.2
> 
> 
> ----------------------------------------------------------------------
> Speak Up. Angielski szybko i skutecznie. 3 miesiace nauki gratis.
> Sprawdz. >> http://link.interia.pl/f2019
>