Changeset 339 for GPL/branches/uniaud32-2.0/lib32/sound.c

Timestamp:

Apr 5, 2008, 10:09:19 AM (17 years ago)

Author:

Paul Smedley

Message:

Cleanups + more elegant fix for HW Param setting problem for HDA that was in changeset 332

File:

• GPL/branches/uniaud32-2.0/lib32/sound.c (modified) (7 diffs)

GPL/branches/uniaud32-2.0/lib32/sound.c

@@ -809 +809 @@
     pHandle->doublesamplesize  = samplesize * 2;
     pHandle->doublesamplesize *= pHwParams->ulNumChannels;
-    periodbytes = pHwParams->ulPeriodSize;
-    periodsize  = bytes_to_samples(periodbytes);
+//    periodbytes = pHwParams->ulPeriodSize;
+//    periodsize  = bytes_to_samples(periodbytes);
+    periodsize = pHwParams->ulPeriodSize;
+    periodbytes = samples_to_bytes(periodsize);
     // checking number of channels
 
-    printk("channels: %i, period size: %i\n",pHwParams->ulNumChannels, periodbytes);
+    printk("channels: %i, period bytes: %i\n",pHwParams->ulNumChannels, periodbytes);
     _snd_pcm_hw_params_any(&params);
     ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_HW_REFINE, (ULONG)__Stack32ToFlat(&params));
@@ -926 +928 @@
         periodbytes = maxperiodbytes;
     }
-
     minperiodsize = hw_param_interval((&params), SNDRV_PCM_HW_PARAM_PERIOD_SIZE)->min;
     maxperiodsize = hw_param_interval((&params), SNDRV_PCM_HW_PARAM_PERIOD_SIZE)->max;
@@ -936 +937 @@
         periodsize = maxperiodsize;
     }
-
     if(samples_to_bytes(periodsize) < periodbytes) {
         periodbytes = samples_to_bytes(periodsize);
@@ -944 +944 @@
         periodsize = bytes_to_samples(periodbytes);
     }
-
     //make sure period size is a whole fraction of the buffer size
     bufsize = hw_param_interval((&params), SNDRV_PCM_HW_PARAM_BUFFER_BYTES)->max;
@@ -992 +991 @@
     _snd_pcm_hw_param_set(&params, SNDRV_PCM_HW_PARAM_RATE,
                           pHwParams->ulSampleRate, 0);
-#if 0
     _snd_pcm_hw_param_set(&params, SNDRV_PCM_HW_PARAM_PERIOD_SIZE, 
                           periodsize, 0);
@@ -1003 +1001 @@
     _snd_pcm_hw_param_set(&params, SNDRV_PCM_HW_PARAM_BUFFER_BYTES, 
                           periodbytes*nrperiods, 0);
-#endif
+
 //#ifdef DEBUG_PK
     printk("Hardware parameters: sample rate %i, data type %i, channels %i, period size %i, periods %i\n",
@@ -1009 +1007 @@
 //#endif
     ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_HW_PARAMS, (ULONG)__Stack32ToFlat(&params));
-    if (ret == -77 && fTryAgain == FALSE)
+    printk("OSS32_WaveSetHwParams return %d after SNDRV_PCM_IOCTL_HW_PARAMS ioctl", ret);
+    if (ret == -77 && fTryAgain == FALSE) 
     {
         ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_PREPARE, 0);