Changeset 519 for GPL/branches/uniaud32-2.1.x/lib32/sound.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/sound.c (modified) (38 diffs)

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

@@ -281 +281 @@
            }
         } else {
-           printk("HDA audio detected - don't support 5512 - 32000 Hz audio sample rates\n");
+           dprintf(("HDA audio detected - don't support 5512 - 32000 Hz audio sample rates\n"));
         }
         if(fuRates & SNDRV_PCM_RATE_44100) {
@@ -331 +331 @@
         int max_ch;
 
-#ifdef DEBUG
         dprintf(("OSS32_QueryDevCaps"));
-#endif
 //        max_ch = GetMaxChannels(deviceid, OSS32_CAPS_WAVE_PLAYBACK);
 
@@ -340 +338 @@
         if(pcminfo == NULL) {
                 DebugInt3();
-                printk("OSS32_QueryDevCaps: out of memory\n");
+                rprintf(("OSS32_QueryDevCaps: out of memory\n"));
                 return OSSERR_OUT_OF_MEMORY;
         }
         params = (struct snd_pcm_hw_params *)(pcminfo+1);
 
-        printk("Number of cards: %i",nrCardsDetected);
-        printk("dev id: %i",deviceid);
+        dprintf(("Number of cards=%i dev id=%i", nrCardsDetected, deviceid));
         pDevCaps->nrDevices  = 1;//nrCardsDetected;
 //        pDevCaps->nrDevices  = nrCardsDetected;
@@ -359 +356 @@
                 if(ret != OSSERR_SUCCESS)
                 {
-                        printk("OSS32_QueryDevCaps: wave open error %i\n", ret);
+                        rprintf(("OSS32_QueryDevCaps: wave open error %i\n", ret));
                         DebugInt3();
                         goto fail;
@@ -365 +362 @@
                 pHandle = (soundhandle *)streamid;
                 if(pHandle == NULL || pHandle->magic != MAGIC_WAVE_ALSA32) {
-                        printk("OSS32_QueryDevCaps: invalid stream id \n");
+                        rprintf(("OSS32_QueryDevCaps: invalid stream id \n"));
                         ret = OSSERR_INVALID_STREAMID;
                         goto fail;
@@ -374 +371 @@
                 ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_INFO, (ULONG)pcminfo);
                 if(ret != 0) {
-                        printk("OSS32_QueryDevCaps: SNDRV_PCM_IOCTL_INFO error %i\n", ret);
+                        rprintf(("OSS32_QueryDevCaps: SNDRV_PCM_IOCTL_INFO error %i\n", ret));
                         ret = UNIXToOSSError(ret);
                         goto fail;
@@ -384 +381 @@
                         else strncpy(pDevCaps->szDeviceName, pcminfo->id, sizeof(pDevCaps->szDeviceName));
                 }
-                printk("Device name: %s", pDevCaps->szDeviceName);
+                dprintf(("Device name: %s", pDevCaps->szDeviceName));
                 pWaveCaps->nrStreams = pcminfo->subdevices_count;
 
@@ -391 +388 @@
                 ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_HW_REFINE, (ULONG)params);
                 if(ret != 0) {
-                        printk("OSS32_QueryDevCaps: SNDRV_PCM_IOCTL_HW_REFINE error %i\n", ret);
+                        rprintf(("OSS32_QueryDevCaps: SNDRV_PCM_IOCTL_HW_REFINE error %i\n", ret));
                         ret = UNIXToOSSError(ret);
                         goto fail;
@@ -468 +465 @@
         if(OSS32_MixQueryName(deviceid, &pDevCaps->szMixerName, sizeof(pDevCaps->szMixerName)) != OSSERR_SUCCESS) {
                 DebugInt3();
-                printk("OSS32_QueryDevCaps: OSS32_MixQueryName error\n");
+                rprintf(("OSS32_QueryDevCaps: OSS32_MixQueryName error\n"));
                 goto fail;
         }
-        printk("OSS32_QueryDevCaps: devname: [%s]\n", pDevCaps->szDeviceName);
+        dprintf(("OSS32_QueryDevCaps: devname: [%s]\n", pDevCaps->szDeviceName));
         kfree(pcminfo);
         streamid = 0;
@@ -479 +476 @@
 
 fail:
-        printk("OSS32_QueryDevCaps failed\n");
+        rprintf(("OSS32_QueryDevCaps failed\n"));
         DebugInt3();
         if(streamid)   OSS32_WaveClose(streamid);
@@ -497 +494 @@
         else
         {
-                printk("ERROR: invalid stream id pointer passed\n");
+                rprintf(("ERROR: invalid stream id pointer\n"));
                 return OSSERR_OUT_OF_MEMORY;
         }
@@ -503 +500 @@
         if(alsa_fops == NULL) {
                 DebugInt3();
-#ifdef DEBUG
-                dprintf(("OSS32_WaveOpen: no devices"));
-#endif
-                printk("OSS32_WaveOpen: no devices\n");
+                rprintf(("OSS32_WaveOpen: no devices"));
 
                 return OSSERR_NO_DEVICE_AVAILABLE;
         }
 
-//        printk("dev id: %i\n",deviceid);
+        //dprintf(("dev id: %i\n",deviceid));
 
         pHandle = kmalloc(sizeof(soundhandle), GFP_KERNEL);
         if(pHandle == NULL) {
                 DebugInt3();
-                printk("OSS32_WaveOpen: out of memory\n");
+                rprintf(("OSS32_WaveOpen: out of memory\n"));
                 return OSSERR_OUT_OF_MEMORY;
         }
@@ -540 +534 @@
                 DebugInt3();
                 kfree(pHandle);
-                printk("OSS32_WaveOpen: invalid parameter\n");
+                rprintf(("OSS32_WaveOpen: invalid parameter\n"));
                 return OSSERR_INVALID_PARAMETER;
         }
 
         ret = alsa_fops->open(&pHandle->inode, &pHandle->file);
-        printk("OSS32_WaveOpen. ret: %i\n", ret);
+        //dprintf(("OSS32_WaveOpen. ret: %i\n", ret));
         /* check if PCM already opened (stupid uniaud16.sys doesnt closes it) */
         if (ret == -16)
@@ -564 +558 @@
                                                 kfree(opened_handles[i].handle);   //free handle data
                                                 ret = alsa_fops->open(&pHandle->inode, &pHandle->file);
-                                                printk("OSS32_WaveOpen. Reopen ret: %i\n", ret);
+                                                dprintf(("OSS32_WaveOpen. Reopen ret: %i\n", ret));
                                         }
                                         else
@@ -592 +586 @@
                 kfree(pHandle);
                 DebugInt3();
-                printk("OSS32_WaveOpen: open error: %i\n",ret);
+                rprintf(("OSS32_WaveOpen: open error: %i\n",ret));
                 return UNIXToOSSError(ret);
         }
@@ -599 +593 @@
                 *pStreamId = (ULONG)pHandle;
         // filling opened handles table
-        printk("OSS32_WaveOpen. streamid %X\n",(ULONG)pHandle);
+        dprintf(("OSS32_WaveOpen. streamid %X\n",(ULONG)pHandle));
         return OSSERR_SUCCESS;
 }
@@ -612 +606 @@
         if(pHandle == NULL || pHandle->magic != MAGIC_WAVE_ALSA32) {
                 DebugInt3();
-                printk("OSS32_WaveClose. invalid streamid %X\n",(ULONG)pHandle);
+                rprintf(("OSS32_WaveClose. invalid streamid %X\n",(ULONG)pHandle));
                 return OSSERR_INVALID_STREAMID;
         }
@@ -623 +617 @@
                 if (opened_handles[i].handle == pHandle)
                 {
-                        printk("Found phandle for closing: %x reuse flag: %i\n", pHandle, opened_handles[i].reuse);
+                        dprintf(("Found phandle for closing: %x reuse flag: %i\n", pHandle, opened_handles[i].reuse));
                         if (!opened_handles[i].reuse)
                         {
@@ -643 +637 @@
         {
                 //all already closed
-                printk("phandle %x not found\n", pHandle);
+                dprintf(("phandle %x not found\n", pHandle));
 //                return OSSERR_SUCCESS;
         }
@@ -649 +643 @@
 
         if(ret) {
-                printk("Error closing wave. rc = %i\n", ret);
+                dprintf(("Error closing wave. rc = %i\n", ret));
                 DebugInt3();
                 return UNIXToOSSError(ret);
         }
-        printk("OSS32_WaveClose. streamid %X\n",(ULONG)pHandle);
+        dprintf(("OSS32_WaveClose. streamid %X\n", (ULONG)pHandle));
         return OSSERR_SUCCESS;
 }
@@ -663 +657 @@
         int                     ret;
 
-#ifdef DEBUG
         dprintf(("OSS32_WavePrepare"));
-#endif
 
         if(pHandle == NULL || pHandle->magic != MAGIC_WAVE_ALSA32) {
                 DebugInt3();
-//#ifdef DEBUG
-                printk("vladest: OSS32_WavePrepare: invalid streamID\n");
-//#endif
+                rprintf(("vladest: OSS32_WavePrepare: invalid streamID\n"));
 
                   return OSSERR_INVALID_STREAMID;
@@ -680 +670 @@
         ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_PREPARE, 0);
         if (ret)
-                printk("Wave prepare ret = %i, streamid %X\n",ret,(ULONG)pHandle);
+                rprintf(("Wave prepare ret = %i, streamid %X\n",ret,(ULONG)pHandle));
 
         return UNIXToOSSError(ret);;
@@ -699 +689 @@
         ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_START, 0);
         if (ret)
-                printk("Wave start ret = %i, streamid %X\n",ret,(ULONG)pHandle);
+                rprintf(("Wave start ret = %i, streamid %X\n",ret,(ULONG)pHandle));
 
         return UNIXToOSSError(ret);;
@@ -719 +709 @@
         ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_DROP, 0);
         if (ret)
-                printk("Wave stop ret = %i. streamid %X\n",ret,(ULONG)pHandle);
+                rprintf(("Wave stop ret = %i. streamid %X\n",ret,(ULONG)pHandle));
 
         return UNIXToOSSError(ret);;
@@ -739 +729 @@
         ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_PAUSE, 0);
         if (ret)
-                printk("Wave pause ret = %i, streamid %X\n",ret,(ULONG)pHandle);
+                rprintf(("Wave pause ret = %i, streamid %X\n",ret,(ULONG)pHandle));
 
         return UNIXToOSSError(ret);;
@@ -759 +749 @@
         ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_PAUSE, 1);
         if (ret)
-                printk("Wave resume ret = %i, streamid %X\n",ret,(ULONG)pHandle);
+                rprintf(("Wave resume ret = %i, streamid %X\n",ret,(ULONG)pHandle));
 
         return UNIXToOSSError(ret);;
@@ -801 +791 @@
         }
         if ((int)pHwParams->ulNumChannels <= 0) {
-                printk("OSS32_WaveSetHwParams error. Invalid number of channels: %i\n", pHwParams->ulNumChannels);
+                rprintf(("OSS32_WaveSetHwParams error. Invalid number of channels: %i\n", pHwParams->ulNumChannels));
                 DebugInt3();
                 return OSSERR_INVALID_PARAMETER;
@@ -840 +830 @@
         ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_HW_REFINE, (ULONG)__Stack32ToFlat(&params));
         if(ret != 0) {
-                dprintf(("invalid format %lx\n", OSSToALSADataType[pHwParams->ulDataType]));
+                rprintf(("invalid format %lx\n", OSSToALSADataType[pHwParams->ulDataType]));
                 return UNIXToOSSError(ret);
         }
@@ -847 +837 @@
         ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_HW_REFINE, (ULONG)__Stack32ToFlat(&params));
         if(ret != 0) {
-                dprintf(("invalid number of sample bits %d\n", pHwParams->ulBitsPerSample));
+                rprintf(("invalid number of sample bits %d\n", pHwParams->ulBitsPerSample));
                 return UNIXToOSSError(ret);
         }
@@ -854 +844 @@
         ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_HW_REFINE, (ULONG)__Stack32ToFlat(&params));
         if(ret != 0) {
-                dprintf(("invalid number of frame bits %d\n", pHwParams->ulBitsPerSample*pHwParams->ulNumChannels));
+                rprintf(("invalid number of frame bits %d\n", pHwParams->ulBitsPerSample*pHwParams->ulNumChannels));
                 return UNIXToOSSError(ret);
         }
@@ -871 +861 @@
         ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_HW_REFINE, (ULONG)__Stack32ToFlat(&params));
         if(ret != 0) {
-                dprintf(("32_WSetHwPms (first pass) error %d bps:%d fmt: %d ch: %d sr: %d\n",
+                rprintf(("32_WSetHwPms (first pass) error %d bps:%d fmt: %d ch: %d sr: %d\n",
                                   ret,
                                   pHwParams->ulBitsPerSample,
@@ -947 +937 @@
         }
         else {
-                dprintf(("32_WSHwPrms error. Invalid periodsize (=0). closing file\n"));
+                rprintf(("32_WSHwPrms error. Invalid periodsize (=0). closing file\n"));
                 DebugInt3();
                 return OSSERR_INVALID_PARAMETER;
@@ -964 +954 @@
         //so we make sure it's an even number.
         if(nrperiods == 1) {
-                dprintf(("32_WSHwPrms error. Invalid Num periods(=1). closing file\n"));
+                rprintf(("32_WSHwPrms error. Invalid Num periods(=1). closing file\n"));
                 DebugInt3();
                 return OSSERR_INVALID_PARAMETER;
@@ -1006 +996 @@
                 ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_PREPARE, 0);
                 fTryAgain = TRUE;
-                dprintf((" Error -77 from first IOCTL HW Parms"));
+                rprintf((" Error -77 from first IOCTL HW Parms"));
                 goto tryagain;
         }
@@ -1024 +1014 @@
                         }
                 }
-                dprintf(("Error %ld second time.. Bailing", ret));
+                rprintf(("Error %ld second time.. Bailing", ret));
                 return UNIXToOSSError(ret);
         }
@@ -1056 +1046 @@
                    (status.state != SNDRV_PCM_STATE_RUNNING) &&
                    (status.state != SNDRV_PCM_STATE_DRAINING))) {
-                dprintf(("Device is not in proper state: %lx. Calling prepare\n", status.state));
+                rprintf(("Device is not in proper state: %lx. Calling prepare\n", status.state));
                 ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_PREPARE, 0);
         }
@@ -1149 +1139 @@
                 while (ulSize && ulJ && iRet)
                 {
-                        for (i=0; i < 1000; i++)
+                        for (ulI=0; ulI < 1000; ulI++)
                         {
                                 iRet1 = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_STATUS, (ULONG)__Stack32ToFlat(&status));
@@ -1157 +1147 @@
                                         rprintf(("Internal Error: Xrun\n"));
                                 }
-                                if (i > 998) {
+                                if (ulI > 998) {
                                         // printk("timeout stat %x avail:%d hw:%d app:%d\n",status.state,samples_to_bytes(status.avail),samples_to_bytes(status.hw_ptr), samples_to_bytes(status.appl_ptr));
                                         iRet1 = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_PREPARE, 0);