Changeset 356

Timestamp:

May 17, 2008, 9:49:53 AM (17 years ago)

Author:

Paul Smedley

Message:

test fix to see if reverting OSS32_SetHwParams to original Innotek version fixes HDA for all users

Location:

GPL/branches/uniaud32-2.0

Files:

• lib32/sound.c (modified) (14 diffs)
• uniaud.inc (modified) (2 diffs)

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

@@ -1 @@
-/* $Id: sound.c,v 1.2 2003/08/08 15:09:03 vladest Exp $ */
 /*
  * MMPM/2 to OSS interface translation layer
@@ -43 +42 @@
 #define samples_to_bytes(a)     ((a*pHandle->doublesamplesize)/2)
 #define bytes_to_samples(a)    (pHandle->doublesamplesize ? ((a*2)/pHandle->doublesamplesize) : a)
-
 int GetMaxChannels(ULONG deviceid, int type);
 
@@ -771 +769 @@
     soundhandle        *pHandle = (soundhandle *)streamid;
     struct snd_pcm_hw_params params;
-    struct snd_pcm_status    status;
     struct snd_pcm_sw_params swparams;
-    int                 ret, ret1, nrperiods, minnrperiods, maxnrperiods, samplesize, i;
+
+    int                 ret, nrperiods, minnrperiods, maxnrperiods, samplesize;
     ULONG               bufsize, periodsize, minperiodsize, maxperiodsize;
     ULONG               periodbytes, minperiodbytes, maxperiodbytes;
     BOOL                fTryAgain = FALSE;
-    ULONG ulMinRate, ulMaxRate;
-
-#ifdef DEBUG
-    dprintf(("OSS32_WaveSetHwParams"));
-#endif
+
     if(pHandle == NULL || pHandle->magic != MAGIC_WAVE_ALSA32) {
-        printk("OSS32_WaveSetHwParams error. Invalid handle: %x\n", pHandle);
-        DebugInt3();
-        return OSSERR_INVALID_STREAMID;
+          DebugInt3();
+          return OSSERR_INVALID_STREAMID;
     }
     if(pHwParams == NULL) {
-        printk("OSS32_WaveSetHwParams error. params = NULL\n");
-        DebugInt3();
-        return OSSERR_INVALID_PARAMETER;
+          DebugInt3();
+          return OSSERR_INVALID_PARAMETER;
     }
     if(pHwParams->ulDataType >= OSS32_PCM_MAX_FORMATS) {
-        printk("OSS32_WaveSetHwParams error. Too high PCM format\n");
-        DebugInt3();
-        return OSSERR_INVALID_PARAMETER;
-    }
-    if ((int)pHwParams->ulNumChannels <= 0) {
-        printk("OSS32_WaveSetHwParams error. Invalid number of channels: %i\n", pHwParams->ulNumChannels);
-        DebugInt3();
-        return OSSERR_INVALID_PARAMETER;
-    }
-tryagain:
+          DebugInt3();
+          return OSSERR_INVALID_PARAMETER;
+    }
+
     //set operation to non-blocking
     pHandle->file.f_flags = O_NONBLOCK;
+
     //size of two samples (adpcm sample can be as small as 4 bits (mono), so take two)
     samplesize = snd_pcm_format_size(OSSToALSADataType[pHwParams->ulDataType], 1);
@@ -811 +798 @@
     periodbytes = pHwParams->ulPeriodSize;
     periodsize  = bytes_to_samples(periodbytes);
-    // checking number of channels
-
-    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));
-    ulMinRate     = hw_param_interval(&params, SNDRV_PCM_HW_PARAM_RATE)->min;
-    ulMaxRate     = hw_param_interval(&params, SNDRV_PCM_HW_PARAM_RATE)->max;
-
-    _snd_pcm_hw_params_any(&params);
-    do {
-        _snd_pcm_hw_param_set(&params, SNDRV_PCM_HW_PARAM_ACCESS,
-                              SNDRV_PCM_ACCESS_RW_INTERLEAVED, 0);
-        _snd_pcm_hw_param_set(&params, SNDRV_PCM_HW_PARAM_CHANNELS,
-                              pHwParams->ulNumChannels, 0);
-        ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_HW_REFINE, (ULONG)__Stack32ToFlat(&params));
-        if (ret == 0) break;
-        pHwParams->ulNumChannels--;
-    } while(ret < 0 && pHwParams->ulNumChannels > 1);
-
-    printk("channels selected: %i\n",pHwParams->ulNumChannels);
 
     //get all hardware parameters
@@ -836 +803 @@
     _snd_pcm_hw_param_set(&params, SNDRV_PCM_HW_PARAM_ACCESS,
                           SNDRV_PCM_ACCESS_RW_INTERLEAVED, 0);
-    _snd_pcm_hw_param_set(&params, SNDRV_PCM_HW_PARAM_FORMAT,
-                          OSSToALSADataType[pHwParams->ulDataType], 0);
-    ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_HW_REFINE, (ULONG)__Stack32ToFlat(&params));
-    if(ret != 0) {
-        printk("invalid format %i\n", OSSToALSADataType[pHwParams->ulDataType]);
-        return UNIXToOSSError(ret);
-    }
-    _snd_pcm_hw_param_set(&params, SNDRV_PCM_HW_PARAM_SAMPLE_BITS,
-                          pHwParams->ulBitsPerSample, 0);
-    ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_HW_REFINE, (ULONG)__Stack32ToFlat(&params));
-    if(ret != 0) {
-        printk("invalid number of sample bits %i\n", pHwParams->ulBitsPerSample);
-        return UNIXToOSSError(ret);
-    }
-    _snd_pcm_hw_param_set(&params, SNDRV_PCM_HW_PARAM_FRAME_BITS,
-                          pHwParams->ulBitsPerSample*pHwParams->ulNumChannels, 0);
-    ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_HW_REFINE, (ULONG)__Stack32ToFlat(&params));
-    if(ret != 0) {
-        printk("invalid number of frame bits %i\n", pHwParams->ulBitsPerSample*pHwParams->ulNumChannels);
-        return UNIXToOSSError(ret);
-    }
-
     _snd_pcm_hw_param_set(&params, SNDRV_PCM_HW_PARAM_SAMPLE_BITS,
                           pHwParams->ulBitsPerSample, 0);
@@ -868 +813 @@
     _snd_pcm_hw_param_set(&params, SNDRV_PCM_HW_PARAM_RATE,
                           pHwParams->ulSampleRate, 0);
-
     ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_HW_REFINE, (ULONG)__Stack32ToFlat(&params));
     if(ret != 0) {
-        printk("OSS32_WaveSetHwParams (first pass) error %i\n", ret);
-        printk("bps: %i\n",pHwParams->ulBitsPerSample);
-        printk("format: %i\n",OSSToALSADataType[pHwParams->ulDataType]);
-        printk("channels: %i\n",pHwParams->ulNumChannels);
-        printk("sample rate: %i\n",pHwParams->ulSampleRate);
-
-//        printk("OSS32_WaveSetHwParams invalid sample rate %i\n", pHwParams->ulSampleRate);
-        //        printk("will set to nearest\n");
-        _snd_pcm_hw_params_any(&params);
-        for (i=0; i<(sizeof(rates)/sizeof(unsigned))-1;i++)
-        {
-            if (pHwParams->ulSampleRate >= rates[i] &&
-                pHwParams->ulSampleRate <= rates[i+1])
-            {
-                pHwParams->ulSampleRate = rates[i];
-                _snd_pcm_hw_param_set(&params, SNDRV_PCM_HW_PARAM_RATE,
-                                      pHwParams->ulSampleRate, 0);
-                ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_HW_REFINE, (ULONG)__Stack32ToFlat(&params));
-                if(ret == 0)
-                {
-                    _snd_pcm_hw_params_any(&params);
-                    _snd_pcm_hw_param_set(&params, SNDRV_PCM_HW_PARAM_SAMPLE_BITS,
-                                          pHwParams->ulBitsPerSample, 0);
-                    _snd_pcm_hw_param_set(&params, SNDRV_PCM_HW_PARAM_FRAME_BITS,
-                                          pHwParams->ulBitsPerSample*pHwParams->ulNumChannels, 0);
-                    _snd_pcm_hw_param_set(&params, SNDRV_PCM_HW_PARAM_FORMAT,
-                                          OSSToALSADataType[pHwParams->ulDataType], 0);
-                    _snd_pcm_hw_param_set(&params, SNDRV_PCM_HW_PARAM_CHANNELS,
-                                          pHwParams->ulNumChannels, 0);
-                    _snd_pcm_hw_param_set(&params, SNDRV_PCM_HW_PARAM_RATE,
-                                          pHwParams->ulSampleRate, 0);
-                    ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_HW_REFINE, (ULONG)__Stack32ToFlat(&params));
-                    goto __next;
-                }
-            }
-        }
-
-//        ret1 = pHandle->file.f_op->release(&pHandle->inode, &pHandle->file);
         DebugInt3();
         return UNIXToOSSError(ret);
     }
-__next:
-
-    printk("sample rate: %i\n",pHwParams->ulSampleRate);
 
     //check period size against lower and upper boundaries
     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;
@@ -927 +829 @@
         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 +839 @@
         periodsize = maxperiodsize;
     }
+
     if(samples_to_bytes(periodsize) < periodbytes) {
         periodbytes = samples_to_bytes(periodsize);
@@ -943 +847 @@
         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;
-
     if(periodsize) {
         nrperiods = bufsize/periodbytes;
     }
     else {
-        printk("OSS32_WaveSetHwParams error. Invalid periodsize (=0). closing file\n");
-//        ret1 = pHandle->file.f_op->release(&pHandle->inode, &pHandle->file);
         DebugInt3();
         return OSSERR_INVALID_PARAMETER;
     }
-
     //check nr of periods against lower and upper boundaries
     minnrperiods = hw_param_interval((&params), SNDRV_PCM_HW_PARAM_PERIODS)->min;
@@ -970 +871 @@
     if(nrperiods == 1) {
         DebugInt3();
-        printk("OSS32_WaveSetHwParams error. Invalid number of periods(=1). closing file\n");
-//        ret1 = pHandle->file.f_op->release(&pHandle->inode, &pHandle->file);
         return OSSERR_INVALID_PARAMETER;
     }
@@ -978 +877 @@
     //initialize parameter block & set sample rate, nr of channels and sample format, nr of periods,
     //period size and buffer size
-//tryagain:
+tryagain:
     _snd_pcm_hw_params_any(&params);
     _snd_pcm_hw_param_set(&params, SNDRV_PCM_HW_PARAM_ACCESS,
@@ -1003 +902 @@
                           periodbytes*nrperiods, 0);
 
-//#ifdef DEBUG_PK
-    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
+    dprintf(("Hardware parameters: sample rate %d, data type %d, channels %d, period size %d, periods %d", 
+             pHwParams->ulSampleRate, pHwParams->ulDataType, pHwParams->ulNumChannels, periodsize, nrperiods));
+
     ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_HW_PARAMS, (ULONG)__Stack32ToFlat(&params));
-    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);
-        fTryAgain = TRUE;
-        goto tryagain;
-    }
     if(ret) {
         if(fTryAgain == FALSE) {
@@ -1027 +918 @@
             }
         }
-        printk("OSS32_WaveSetHwParams (second pass) error %i\n", ret);
-        printk("bps: %i\n",pHwParams->ulBitsPerSample);
-        printk("format: %i\n",OSSToALSADataType[pHwParams->ulDataType]);
-        printk("channels: %i\n",pHwParams->ulNumChannels);
-        printk("sample rate: %i\n",pHwParams->ulSampleRate);
-        printk("periodsize: %i\n",periodsize);
-        printk("periodbytes: %i\n",periodbytes);
-        printk("periods: %i\n",nrperiods);
-//        ret1 = pHandle->file.f_op->release(&pHandle->inode, &pHandle->file);
         return UNIXToOSSError(ret);
     }
@@ -1059 +941 @@
         ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_SW_PARAMS, (ULONG)__Stack32ToFlat(&swparams));
     }
-    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_SETUP) &&
-          (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);
 }

GPL/branches/uniaud32-2.0/uniaud.inc

@@ -7 +7 @@
 # BUILDVERSION must be 3 parts, and only numbers like 5.44.108
 # It is best that 2'nd number is always 2 digits, eg at least 10
-BUILDVERSION = 1.9.3
+BUILDVERSION = 1.9.4
 
 # Fixpack version
@@ -13 +13 @@
 # ex RC3  GA  FIXPACK2 beta_47
 # Comment out to avoid a fixpack line in bldlevel
-FIXPACK = SVN r340
+FIXPACK = SVN r353
 
 # ALSA BUILD VERSION