Changeset 344 for GPL

Timestamp:

Apr 9, 2008, 9:53:10 AM (17 years ago)

Author:

Paul Smedley

Message:

Make device/mixer name available in OSS32_WaveSetHwParams to allow device specific hacks

Location:

GPL/branches/uniaud32-2.0/lib32

Files:

• ossidc.cpp (modified) (1 diff)
• sound.c (modified) (3 diffs)

GPL/branches/uniaud32-2.0/lib32/ossidc.cpp

@@ -110 +110 @@
         return OSSERR_INIT_FAILED;
     }
-    dprintf(("Uniaud version %s\n",UNIAUD_VERSION));
+    dprintf(("\nUniaud version %s\n",UNIAUD_VERSION));
     dprintf(("OSS32_Initialize. Start address: %X", OffsetBeginCS32));
 //    DebugInt3();

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

@@ -778 +778 @@
     BOOL                fTryAgain = FALSE;
     ULONG ulMinRate, ulMaxRate;
+    struct snd_pcm_info      *pcminfo = NULL;
 
 #ifdef DEBUG
@@ -802 +803 @@
         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
@@ -1003 +1012 @@
 
 //#ifdef DEBUG_PK
-    printk("Hardware parameters: sample rate %i, data type %i, channels %i, period size %i, periods %i\n",
+    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);
 //#endif