Changeset 267 for GPL/trunk/lib32/sound.c

Timestamp:

Nov 8, 2007, 4:47:51 AM (18 years ago)

Author:

Brendan Oakley

Message:

Fix HDA buffering in Uniaud32, from Pavel

File:

• GPL/trunk/lib32/sound.c (modified) (3 diffs)

GPL/trunk/lib32/sound.c

@@ -1072 +1072 @@
     int                 ret, align, size1, ret1;
     LONG                transferred;
-    ULONG               position;
+    ULONG               position,i;
     char                *buf;
     int toret = 0;
@@ -1140 +1140 @@
         while(TRUE) {
         again:
+            for ( i=0; i < 10000; i++)
+            {
+            ret1 = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_STATUS, (ULONG)__Stack32ToFlat(&status));
+            if ( status.state != SNDRV_PCM_STATE_XRUN ) break;
+            }
+            if ( i > 9998 ) 
+            {
+                printk("timeout stat %x avail:%i:%i \n",status.state,samples_to_bytes(status.avail),status.avail);
+                ret1 = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_PREPARE, 0);
+                ret1 = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_STATUS, (ULONG)__Stack32ToFlat(&status));
+            }
             ret = pHandle->file.f_op->write(&pHandle->file, (char *)buffer, size, &pHandle->file.f_pos);
             if(ret < 0) {
@@ -1153 +1164 @@
                     printk("OSS32_WaveAddBuffer failed on partial transfer %x %i; ret = %i\n", buffer, size, ret);
                     *pTransferred = transferred;
-                    if (toret)
+                    if (toret > 4)
                         return OSSERR_SUCCESS; /* avoid infinite loop */
-                    toret = 1;
+                    toret++;
                     goto again;
                 }