Changeset 484

Timestamp:

May 8, 2010, 6:36:24 AM (15 years ago)

Author:

David Azarewicz

Message:

Fix for recording hang

Location:

GPL/trunk

Files:

• alsa-kernel/core/sgbuf.c (modified) (3 diffs)
• alsa-kernel/pci/cs5535audio/cs5535audio_olpc.err (deleted)
• drv32/dispatch.c (modified) (3 diffs)
• drv32/parse.c (modified) (1 diff)
• lib32/debug.c (modified) (2 diffs)
• lib32/sound.c (modified) (6 diffs)
• lib32/soundmixer.c (modified) (2 diffs)
• uniaud.inc (modified) (1 diff)

GPL/trunk/alsa-kernel/core/sgbuf.c

@@ -19 +19 @@
  *
  */
-
 #ifdef TARGET_OS2
 #include <sound/core.h>
 #endif
+#include <sound/config.h>
 #include <linux/slab.h>
 #include <linux/mm.h>
@@ -28 +28 @@
 #include <sound/memalloc.h>
 #include <proto.h>
+
+#ifdef CONFIG_SND_DMA_SGBUF
 
 /* table entries are align to 32 */
@@ -206 +208 @@
         return NULL;
 }
+#endif

GPL/trunk/drv32/dispatch.c

@@ -95 +95 @@
     ULONG ctl_id;
 
-#ifdef DEBUG
-    printk("StratIOCtl %d\n", rp->Function);
-#endif
     if (rp->Category != CAT_IOCTL_OSS32)
     {
@@ -105 +102 @@
     }
 
+#ifdef DEBUG
+    printk("StratIOCtl 0x%x\n", rp->Function);
+#endif
 //    printk("cmd: %x, len: %i, pack: %x\n",rp->Function, rp->ParmLength, rp->ParmPacket);
     // work with Parm Packet
@@ -394 +394 @@
             ctl_id = id & 0x0000FFFF;
 
-            //                printk("put ID %i\n",id);
             GetUniaudControlValuePut(card_id, ctl_id,(void*)*pData);
         } break;

GPL/trunk/drv32/parse.c

@@ -38 +38 @@
 #include "parse.h"         // NUM_DEVICES
 #include <string.h>
+
+#ifdef DEBUG
+#define COMM_DEBUG
+#endif
 
 // True if the /V parameter was specified

GPL/trunk/lib32/debug.c

@@ -34 +34 @@
 #define SIGNIFICANT_FIELD       0x0007
 
-//#define COMM_DEBUG
-
 BOOL  fLineTerminate=TRUE;
 int   DebugLevel = 1;
@@ -147 +145 @@
 
 #ifdef DEBUG
+#define COMM_DEBUG
 //------------------------- StringOut --------------------------//
 

GPL/trunk/lib32/sound.c

@@ -1014 +1014 @@
             minperiodsize = hw_param_interval((&params), SNDRV_PCM_HW_PARAM_PERIOD_SIZE)->min;
             maxperiodsize = hw_param_interval((&params), SNDRV_PCM_HW_PARAM_PERIOD_SIZE)->max;
+                dprintf(("Period size min=%lx max=%lx", minperiodsize, maxperiodsize));
             if(minperiodsize > maxperiodsize) {
                 //ALSA doesn't like the period size; try suggested one
@@ -1023 +1024 @@
             }
         }
-        dprintf(("Error second time.. Bailing"));
+        dprintf(("Error %ld second time.. Bailing", ret));
         return UNIXToOSSError(ret);
     }
@@ -1091 +1092 @@
     pHandle->file.f_flags = O_NONBLOCK;
 
-    //first check how much room is left in the circular dma buffer
-    //this is done to make sure we don't block inside ALSA while trying to write
-    //more data than fits in the internal dma buffer.
-    ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_STATUS, (ULONG)__Stack32ToFlat(&status));
-
-    if(ret) {
-        DebugInt3();
-        return UNIXToOSSError(ret);
-    }
-
-    size1 = size;
-
-    size = min(size, samples_to_bytes(status.avail));
-
-#ifdef DEBUG_PK
-    if (size1 != size)
-        printk("requested size [%d] less then available [%d]\n", size1, size);
-#endif
-
-    CountWv++;
-
-#ifdef DEBUG
-    printk("OSS32_WaveAddBuffer N:%d hw %x app %x avail %x, orig size: %x, size %x\n",CountWv, samples_to_bytes(status.hw_ptr), samples_to_bytes(status.appl_ptr), samples_to_bytes(status.avail), size1, size);
-#endif
-
-    if (size == 0)
-    {
-#ifdef DEBUG_PK
-        printk("OSS32_WaveAddBuffer: no room left in hardware buffer!!\n");
-        printk("state = %i\n",status.state);
-        printk("avail = %i\n",status.avail);
-        printk("size req = %i\n",size1);
-#endif
-        *pTransferred = 0;
-        return OSSERR_BUFFER_FULL;
-    }
-
+        /* get the status of the circular dma buffer */
+        ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_STATUS, (ULONG)__Stack32ToFlat(&status));
+
+        if(ret) {
+                DebugInt3();
+                return UNIXToOSSError(ret);
+        }
+
+        CountWv++;
     transferred = 0;
     *pTransferred = 0;
@@ -1134 +1107 @@
     {
     case SNDRV_MINOR_PCM_PLAYBACK:
-        // size should be aligned to channels number * samplesize  //PS+++ what is it and why?!?!?!
-        j = 10;            // 10 try if error
-        while (size && j && ret)
-        {
-               for (i=0; i < 1000; i++)
-               {
-                     ret1 = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_STATUS, (ULONG)__Stack32ToFlat(&status));
-                     // If here any state and have free buffer to any byte
-                     if ((status.state != SNDRV_PCM_STATE_XRUN ) && samples_to_bytes(status.avail) )
-                         break;
-                     if (i > 998)
-                     {
-//                         printk("timeout stat %x avail:%d hw:%d app:%d\n",status.state,samples_to_bytes(status.avail),samples_to_bytes(status.hw_ptr), samples_to_bytes(status.appl_ptr));
-                         ret1 = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_PREPARE, 0);
-                     }
-               }
-
-               if (ret1 < 0)
-               {
-//                   printk("Status Error ret1:%i trans: %i need %d tot:%d\n",ret1,transferred, size,size1);
-                   break;     // We have any global error, don't try more
-               }
-
-               ret = pHandle->file.f_op->write(&pHandle->file, (char *)buffer, size, &pHandle->file.f_pos);
-
-               if (ret < 0 )
-               {  // We have any error, don't try more
-                  j--;
-                  if ( ret != -11 )
-                      ret1 = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_PREPARE, 0);
-//                  printk("Error ret:%i ret1:%i trans: %d need %d tot:%d\n",ret,ret1,transferred, size,size1);
-                  continue;
-               }
-               if (ret == 0)  continue;
-               transferred += ret;
-//               printk("written: now: %d, trans: %d need %d tot:%d\n", ret, transferred, size,size1);
-               buffer += ret;
-               if (size > ret)
-                  size   -= ret;
-               else
-                  size = 0;
-        }
+
+                //first check how much room is left in the circular dma buffer
+                //this is done to make sure we don't block inside ALSA while trying to write
+                //more data than fits in the internal dma buffer.
+            size1 = size;
+            size = min(size, samples_to_bytes(status.avail));
+
+#ifdef DEBUG
+                //printk("OSS32_WaveAddBuffer N:%d hw=%x app=%x avail=%x req size=%x size=%x\n",
+                //      CountWv, samples_to_bytes(status.hw_ptr), samples_to_bytes(status.appl_ptr), samples_to_bytes(status.avail), size1, size);
+#endif
+
+            if (size == 0) {
+#ifdef DEBUG_PK
+                printk("OSS32_WaveAddBuffer: no room left in hardware buffer!!\n");
+            printk("state = %i\n",status.state);
+                printk("avail = %i\n",status.avail);
+                printk("size req = %i\n",size1);
+#endif
+                *pTransferred = 0;
+            return OSSERR_BUFFER_FULL;
+            }
+
+                // size should be aligned to channels number * samplesize  //PS+++ what is it and why?!?!?!
+                j = 10;            // 10 try if error
+                while (size && j && ret)
+                {
+                        for (i=0; i < 1000; i++)
+                        {
+                                ret1 = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_STATUS, (ULONG)__Stack32ToFlat(&status));
+                                // If here any state and have free buffer to any byte
+                                if ((status.state != SNDRV_PCM_STATE_XRUN ) && samples_to_bytes(status.avail) ) break;
+                                if (i > 998) {
+                                        // printk("timeout stat %x avail:%d hw:%d app:%d\n",status.state,samples_to_bytes(status.avail),samples_to_bytes(status.hw_ptr), samples_to_bytes(status.appl_ptr));
+                                        ret1 = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_PREPARE, 0);
+                                }
+                        }
+
+                        if (ret1 < 0) {
+                                // printk("Status Error ret1:%i trans: %i need %d tot:%d\n",ret1,transferred, size,size1);
+                                break;     // We have any global error, don't try more
+                        }
+
+                        ret = pHandle->file.f_op->write(&pHandle->file, (char *)buffer, size, &pHandle->file.f_pos);
+
+                        if (ret < 0 ) {  // We have any error, don't try more
+                                j--;
+                                if ( ret != -11 )
+                                ret1 = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_PREPARE, 0);
+                                // printk("Error ret:%i ret1:%i trans: %d need %d tot:%d\n",ret,ret1,transferred, size,size1);
+                                continue;
+                        }
+                        if (ret == 0)  continue;
+                        transferred += ret;
+                        // printk("written: now: %d, trans: %d need %d tot:%d\n", ret, transferred, size,size1);
+                        buffer += ret;
+                        if (size > ret)
+                                size   -= ret;
+                        else
+                                size = 0;
+                }
         break;
     case SNDRV_MINOR_PCM_CAPTURE:
+#ifdef DEBUG
+                //printk("OSS32_WaveAddBuffer N:%d state=%x hw=%x app=%x avail=%x size=%x\n",
+                //      CountWv, status.state, samples_to_bytes(status.hw_ptr), samples_to_bytes(status.appl_ptr), samples_to_bytes(status.avail), size);
+#endif
+//              Need to handle overrun condition when reading
+//              if (status.state == SNDRV_PCM_STATE_XRUN) {
+//                  *pTransferred = 0;
+//                      return OSSERR_BUFFER_FULL;
+//              }
         transferred = pHandle->file.f_op->read(&pHandle->file, (char *)buffer, size, &pHandle->file.f_pos);
-//        printk("readed %i bytes\n", transferred);
+                if (transferred < 0) {
+                    *pTransferred = 0;
+                        return OSSERR_BUFFER_FULL;
+                }
         break;
     default:
@@ -1189 +1193 @@
     *pTransferred = transferred;
     prev_size = transferred;
-    if (*pTransferred < size1)
-    {
-        printk("warning: transferred [%d] less than requested [%d]\n", *pTransferred, size1);
+//    if (*pTransferred < size1)
+//    {
+//        printk("warning: transferred [%d] less than requested [%d]\n", *pTransferred, size1);
 //        ret1 = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_PREPARE, 0);
-    }
+//    }
 
     return OSSERR_SUCCESS;
@@ -1291 +1295 @@
     }
 
-    dprintf(("OSS32_WaveGetHwPtr: %lx", samples_to_bytes(status.appl_ptr)));
     *pPosition = samples_to_bytes(status.appl_ptr);  //return new hardware position
     return OSSERR_SUCCESS;

GPL/trunk/lib32/soundmixer.c

@@ -376 +376 @@
     int                   ret, idx, lVol, rVol = 0, idxMute, cnt;
 
-    dprintf(("OSS32_MixSetVolume line=%d\n", line));
+    //dprintf(("OSS32_MixSetVolume line=%d\n", line));
     if(pHandle == NULL || pHandle->magic != MAGIC_MIXER_ALSA32) {
         printk("Invalid handle in OSS32_MixSetVolume\n");
@@ -512 +512 @@
     }
 
-    printk("OSS32_MixSetVolume of %s streamid %X to (%d,%d)(%d,%d) caps %d\n",
-           pHandle->pids[idx].name,
-           (ULONG)pHandle, GET_VOLUME_L(volume),
-           GET_VOLUME_R(volume), lVol, rVol, pElemInfo->value.integer.max);
+        printk("OSS32_MixSetVolume of %s streamid %X to (%d,%d)(%d,%d) caps %d\n",
+                pHandle->pids[idx].name, (ULONG)pHandle,
+                GET_VOLUME_L(volume), GET_VOLUME_R(volume), lVol, rVol, pElemInfo->value.integer.max);
 
     // looking for more, then one opened streams to prevent of muting active stream

GPL/trunk/uniaud.inc

@@ -13 +13 @@
 # ex RC3  GA  FIXPACK2 beta_47
 # Comment out to avoid a fixpack line in bldlevel
-FIXPACK = SVN r478
+FIXPACK = SVN r484
 
 # ALSA BUILD VERSION