Changeset 519 for GPL/branches/uniaud32-2.1.x/lib32/ioctl.c

Timestamp:

Jul 20, 2010, 5:52:49 PM (15 years ago)

Author:

David Azarewicz

Message:

Changes to PCI bus scan, malloc, cleanup all warnings, misc other changes

File:

• GPL/branches/uniaud32-2.1.x/lib32/ioctl.c (modified) (7 diffs)

GPL/branches/uniaud32-2.1.x/lib32/ioctl.c

@@ -284 +284 @@
     if(pcminfo == NULL) {
         DebugInt3();
-        printk("GetUniaudPcmCaps: out of memory\n");
+        rprintf(("GetUniaudPcmCaps: out of memory"));
         return OSSERR_OUT_OF_MEMORY;
     }
@@ -302 +302 @@
             if(ret != OSSERR_SUCCESS)
             {
-                printk("GetUniaudPcmCaps: wave open error %i %s at pcm %i\n", ret,
-                       (j == 0) ?"PLAY":"REC", i);
+                rprintf(("GetUniaudPcmCaps: wave open error %i %s at pcm %i", ret,
+                       (j == 0) ?"PLAY":"REC", i));
                 continue;
 //                goto fail;
@@ -309 +309 @@
             pHandle = (soundhandle *)streamid;
             if(pHandle == NULL || pHandle->magic != MAGIC_WAVE_ALSA32) {
-                printk("GetUniaudPcmCaps: invalid stream id \n");
+                rprintf(("GetUniaudPcmCaps: invalid stream id"));
                 ret = OSSERR_INVALID_STREAMID;
 //                goto fail;
@@ -317 +317 @@
             pHandle->file.f_flags = O_NONBLOCK;
 
-            printk("GetUniaudPcmCaps: cp1. phandle %x\n", pHandle);
+            dprintf(("GetUniaudPcmCaps: cp1. phandle %x", pHandle));
             ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_INFO, (ULONG)pcminfo);
             if(ret != 0) {
-                printk("GetUniaudPcmCaps: SNDRV_PCM_IOCTL_INFO error %i\n", ret);
+                rprintf(("GetUniaudPcmCaps: SNDRV_PCM_IOCTL_INFO error %i", ret));
                 ret = UNIXToOSSError(ret);
                 continue;
@@ -335 +335 @@
             pWaveCaps->nrStreams = pcminfo->subdevices_count;
 
-            printk("GetUniaudPcmCaps: cp2. nr of streams: %i\n", pWaveCaps->nrStreams);
+            dprintf(("GetUniaudPcmCaps: cp2. nr of streams: %i", pWaveCaps->nrStreams));
             //get all hardware parameters
             _snd_pcm_hw_params_any(params);
             ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_HW_REFINE, (ULONG)params);
             if(ret != 0) {
-                printk("GetUniaudPcmCaps: SNDRV_PCM_IOCTL_HW_REFINE error %i\n", ret);
+                rprintf(("GetUniaudPcmCaps: SNDRV_PCM_IOCTL_HW_REFINE error %i", ret));
                 ret = UNIXToOSSError(ret);
                 //goto fail;
                 continue;
             }
-            printk("GetUniaudPcmCaps: cp3\n");
+            //dprintf("GetUniaudPcmCaps: cp3"));
 
             pWaveCaps->ulMinChannels = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS)->min;
             pWaveCaps->ulMaxChannels = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS)->max;
-            printk("chan: from %i to %i\n", pWaveCaps->ulMinChannels,pWaveCaps->ulMaxChannels);
+            dprintf(("chan: from %i to %i\n", pWaveCaps->ulMinChannels,pWaveCaps->ulMaxChannels));
             pWaveCaps->ulChanFlags   = 0;
             if(pWaveCaps->ulMinChannels == 1) {
@@ -368 +368 @@
 
             mask = hw_param_mask(params, SNDRV_PCM_HW_PARAM_RATE_MASK);
-//            mask = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);
+                        //mask = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);
             pWaveCaps->ulRateFlags   = mask->bits[0];
 
@@ -403 +403 @@
     pcms = pcm_instances(deviceid);
 
-    printk("pcms = %i\n", pcms); //uncommented
+    dprintf(("FillCaps: pcms=%i\n", pcms));
     if (!pcmcaps[deviceid])
     {