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

Timestamp:

Oct 23, 2006, 11:07:11 PM (19 years ago)

Author:

vladest

Message:

SB code update
HDA code update
Some other updates

File:

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

GPL/trunk/lib32/sound.c

@@ -754 +754 @@
     soundhandle        *pHandle = (soundhandle *)streamid;
     snd_pcm_hw_params_t params;
+    snd_pcm_status_t    status;
     snd_pcm_sw_params_t swparams;
     int                 ret, ret1, nrperiods, minnrperiods, maxnrperiods, samplesize, i;
@@ -889 +890 @@
             }
         }
+
 //        ret1 = pHandle->file.f_op->release(&pHandle->inode, &pHandle->file);
         DebugInt3();
@@ -1040 +1042 @@
     total = 0;
     per_bytes = periodbytes;
+    ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_STATUS, (ULONG)__Stack32ToFlat(&status));
+    if ( ((status.state != SNDRV_PCM_STATE_PREPARED) &&
+          (status.state != SNDRV_PCM_STATE_RUNNING) &&
+          (status.state != SNDRV_PCM_STATE_DRAINING))) {
+        printk("Device is not in proper state: %i. Calling prepare\n", status.state);
+        ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_PREPARE, 0);
+    }
     printk("OSS32_WaveSetHwParams return %d after SNDRV_PCM_IOCTL_SW_PARAMS ioctl, streamid %X", ret,(ULONG)pHandle);
     return UNIXToOSSError(ret);
@@ -1133 +1142 @@
                     printk("OSS32_WaveAddBuffer failed on partial transfer %x %i; ret = %i\n", buffer, size, ret);
                     *pTransferred = transferred;
-                    return OSSERR_SUCCESS;
+                    if (toret)
+                        return OSSERR_SUCCESS; /* avoid infinite loop */
+                    toret = 1;
+                    goto again;
                 }
 
@@ -1143 +1155 @@
                     ret1 = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_PREPARE, 0);
                     printk("OSS32_WaveAddBuffer buffer overrun: size %i, ret %i, trans %i, prev sz %i per sz %i total %i\n", size, ret, transferred, prev_size, per_bytes, total);
-                    ret = size;
-                    transferred = size;
-                    break; /* UGLY hack*/
-                    //goto again;
+                    //ret = size;
+                    //transferred = size;
+                    if (toret) break; /* avoid infinite loop */
+                    toret = 1;
+                    goto again;
                 }
                 else {
@@ -1162 +1175 @@
                 break;
             }
+            toret = 0;
             transferred += ret;
 //            printk("written: now: %i, buffer: %i, total: %i\n", ret, transferred, total);