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

Timestamp:

Apr 21, 2008, 11:54:49 AM (17 years ago)

Author:

Paul Smedley

Message:

IRQ patch from Pavel

File:

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

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

@@ -778 +778 @@
     BOOL                fTryAgain = FALSE;
     ULONG ulMinRate, ulMaxRate;
-    struct snd_pcm_info      *pcminfo = NULL;
 
 #ifdef DEBUG
@@ -803 +802 @@
         return OSSERR_INVALID_PARAMETER;
     }
-
-    // Get pcminfo so that we have the device & mixer name so we can do chipset specific hacks 
-    pcminfo = (struct snd_pcm_info *)kmalloc(sizeof(struct snd_pcm_info)+sizeof(struct snd_pcm_hw_params), GFP_KERNEL);
-    //set operation to non-blocking
-    pHandle->file.f_flags = O_NONBLOCK;
-    
-    ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_INFO, (ULONG)pcminfo);
-
 tryagain:
     //set operation to non-blocking
@@ -930 +921 @@
     minperiodbytes = hw_param_interval((&params), SNDRV_PCM_HW_PARAM_PERIOD_BYTES)->min;
     maxperiodbytes = hw_param_interval((&params), SNDRV_PCM_HW_PARAM_PERIOD_BYTES)->max;
+
     if(periodbytes < minperiodbytes) {
         periodbytes = minperiodbytes;
@@ -955 +947 @@
     //make sure period size is a whole fraction of the buffer size
     bufsize = hw_param_interval((&params), SNDRV_PCM_HW_PARAM_BUFFER_BYTES)->max;
+
+#if 0
     if(periodsize) {
         nrperiods = bufsize/periodbytes;
@@ -964 +958 @@
         return OSSERR_INVALID_PARAMETER;
     }
+#else
+    nrperiods = 3;
+#endif
     //check nr of periods against lower and upper boundaries
     minnrperiods = hw_param_interval((&params), SNDRV_PCM_HW_PARAM_PERIODS)->min;
@@ -1012 +1009 @@
 
 //#ifdef DEBUG_PK
-    printk("Hardware parameters: sample rate %i, data type %i, channels %i, period size %i, nrperiods %i\n",
-             pHwParams->ulSampleRate, pHwParams->ulDataType, pHwParams->ulNumChannels, periodsize, nrperiods);
+    printk("Hardware parameters: sample rate %i, data type %i, channels %i, period bytes %i, period size %i, nrperiods %i\n",
+             pHwParams->ulSampleRate, pHwParams->ulDataType, pHwParams->ulNumChannels, periodbytes, periodsize, nrperiods);
 //#endif
     ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_HW_PARAMS, (ULONG)__Stack32ToFlat(&params));