Changeset 434

Timestamp:

May 31, 2009, 6:14:56 AM (16 years ago)

Author:

Paul Smedley

Message:

Re-implement hack in hda_intel.c to stop looping in azx_update_rirb() when jiffies stops updating + tidy ups

Location:

GPL/trunk

Files:

• alsa-kernel/pci/hda/hda_intel.c (modified) (7 diffs)
• drv32/devhlp.asm (modified) (1 diff)

GPL/trunk/alsa-kernel/pci/hda/hda_intel.c

@@ -617 +617 @@
         struct azx *chip = bus->private_data;
         unsigned long timeout;
+#ifdef TARGET_OS2
+        int count = 0;
+#endif
 
  again:
@@ -632 +635 @@
                 if (time_after(jiffies, timeout))
                         break;
+#ifdef TARGET_OS2
+                if (count >= 5000) /* Hack on OS/2 to stop infinite loop as jiffies sometimes don't increment */
+                        break;
+#endif
                 if (bus->needs_damn_long_delay)
                         msleep(2); /* temporary workaround */
@@ -638 +645 @@
                         cond_resched();
                 }
-        }
-
+#ifdef TARGET_OS2
+        count++;
+#endif
+        }
+#ifdef TARGET_OS2
+        if (count >= 5000)
+                snd_printk(KERN_WARNING "hda_intel: count >= 5000, aborting loop in azx_rirb_get_response\n");
+
+#endif
         if (chip->msi) {
                 snd_printk(KERN_WARNING "hda_intel: No response from codec, "
@@ -999 +1013 @@
         struct azx_dev *azx_dev;
         u32 status;
-#ifdef TARGET_OS2
-        u32 ignore_irq = 0;
-#endif
         int i, ok;
 
@@ -1018 +1029 @@
                         if (!azx_dev->substream || !azx_dev->running)
                                 continue;
-#if 0 /* ??????? */
-#ifdef TARGET_OS2
-                        ignore_irq |= azx_dev->sd_int_sta_mask; 
-#endif
-                        continue;
-#endif
                         /* check whether this IRQ is really acceptable */
                         ok = azx_position_ok(chip, azx_dev);
@@ -1055 +1060 @@
         spin_unlock(&chip->reg_lock);
 
-   #ifdef TARGET_OS2
-   if ((status & RIRB_INT_MASK) || ignore_irq) {
+#ifdef TARGET_OS2
+   if (status & RIRB_INT_MASK) {
        return 2;
    }
-   #endif
+#endif
 
         return IRQ_HANDLED;
@@ -1108 +1113 @@
                              struct azx_dev *azx_dev)
 {
-#ifdef TARGET_OS2xx /* Anyone know why this is set to volatile - causes a warning when it is set */
-        volatile u32 *bdl;
-#else
         u32 *bdl;
-#endif
         int i, ofs, periods, period_bytes;
         int pos_adj;

GPL/trunk/drv32/devhlp.asm

@@ -143 +143 @@
 iodelay32_ endp
 
+;iodelay32_ proc near
+;       mov ax,DOSIODELAYCNT
+;       top:
+;       dec ax
+;       jnz top
+;iodelay32_ ENDP
+
 CODE32  ends