Changeset 615 for GPL/branches/uniaud32-next/lib32/ioctl.c

Timestamp:

Jan 1, 2021, 5:31:48 AM (5 years ago)

Author:

Paul Smedley

Message:

Add source for uniaud32 based on code from linux kernel 5.4.86

Location:

GPL/branches/uniaud32-next

Files:

• . (copied) (copied from GPL/branches/uniaud32-linux-3.2.102 )
• lib32/ioctl.c (modified) (7 diffs)

GPL/branches/uniaud32-next/lib32/ioctl.c

@@ -276 +276 @@
 
         pcms = pcm_instances(deviceid);
-
+dprintf(("PSDebug: pcms= %d",pcms));
         if (!pcaps || !pcms) return -1;
 
@@ -291 +291 @@
         for (i=0; i<pcms;i++)
         {
+pr_warn("pcm=%i",i);
                 pcaps->nrDevices  = nrCardsDetected;
                 pcaps->ulCaps     = OSS32_CAPS_WAVE_PLAYBACK | OSS32_CAPS_WAVE_CAPTURE;
@@ -297 +298 @@
                 for(j=0;j<2;j++)
                 {
+pr_warn("j=%i",j);
                         PWAVE_CAPS pWaveCaps = (j == 0) ? &pcaps->waveOutCaps : &pcaps->waveInCaps;
 
@@ -302 +304 @@
                         if(ret != OSSERR_SUCCESS)
                         {
-                                dprintf(("GetUniaudPcmCaps: wave open error %i %s at pcm %i", ret, (j == 0) ?"PLAY":"REC", i));
+                                dprintf(("GetUniaudPcmCaps1: wave open error %i %s at pcm %i", ret, (j == 0) ?"PLAY":"REC", i));
                                 continue;
                                 //goto fail;
@@ -316 +318 @@
                         pHandle->file.f_flags = O_NONBLOCK;
 
-                        dprintf(("GetUniaudPcmCaps: cp1. phandle %x", pHandle));
+                        dprintf(("GetUniaudPcmCaps: cp1. pcm %i, phandle %x", i, pHandle));
                         ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_INFO, (ULONG)pcminfo);
                         if(ret != 0) {
@@ -334 +336 @@
                         pWaveCaps->nrStreams = pcminfo->subdevices_count;
 
-                        dprintf(("GetUniaudPcmCaps: cp2. nr of streams: %i", pWaveCaps->nrStreams));
+                        dprintf(("GetUniaudPcmCaps: pcm %i, cp2. nr of streams: %i", i, pWaveCaps->nrStreams));
                         //get all hardware parameters
                         _snd_pcm_hw_params_any(params);
@@ -362 +364 @@
                                 pWaveCaps->ulChanFlags |= OSS32_CAPS_PCM_CHAN_5_1;
                         }
-
                         pWaveCaps->ulMinRate     = hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE)->min;
                         pWaveCaps->ulMaxRate     = hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE)->max;