Changeset 339 for GPL

Timestamp:

Apr 5, 2008, 10:09:19 AM (17 years ago)

Author:

Paul Smedley

Message:

Cleanups + more elegant fix for HW Param setting problem for HDA that was in changeset 332

Location:

GPL/branches/uniaud32-2.0

Files:

• alsa-kernel/core/pcm_memory.c (modified) (1 diff)
• alsa-kernel/drivers/dummy.c (modified) (1 diff)
• alsa-kernel/pci/ac97/ac97_codec.c (modified) (1 diff)
• alsa-kernel/pci/hda/hda_codec.c (modified) (1 diff)
• alsa-kernel/pci/hda/hda_intel.c (modified) (2 diffs)
• lib32/sound.c (modified) (7 diffs)

GPL/branches/uniaud32-2.0/alsa-kernel/core/pcm_memory.c

@@ -30 +30 @@
 
 static int preallocate_dma = 1;
-//module_param(preallocate_dma, int, 0444);
+module_param(preallocate_dma, int, 0444);
 MODULE_PARM_DESC(preallocate_dma, "Preallocate DMA memory when the PCM devices are initialized.");
 
 static int maximum_substreams = 4;
-//module_param(maximum_substreams, int, 0444);
+module_param(maximum_substreams, int, 0444);
 MODULE_PARM_DESC(maximum_substreams, "Maximum substreams with preallocated DMA memory.");
 

GPL/branches/uniaud32-2.0/alsa-kernel/drivers/dummy.c

@@ -158 +158 @@
 module_param_array(pcm_substreams, int, NULL, 0444);
 MODULE_PARM_DESC(pcm_substreams, "PCM substreams # (1-16) for dummy driver.");
-//module_param_array(midi_devs, int, NULL, 0444);
-//MODULE_PARM_DESC(midi_devs, "MIDI devices # (0-2) for dummy driver.");
+module_param_array(midi_devs, int, NULL, 0444);
+MODULE_PARM_DESC(midi_devs, "MIDI devices # (0-2) for dummy driver.");
 
 static struct platform_device *devices[SNDRV_CARDS];

GPL/branches/uniaud32-2.0/alsa-kernel/pci/ac97/ac97_codec.c

@@ -45 +45 @@
 static int enable_loopback;
 
-//module_param(enable_loopback, bool, 0444);
+module_param(enable_loopback, bool, 0444);
 MODULE_PARM_DESC(enable_loopback, "Enable AC97 ADC/DAC Loopback Control");
 

GPL/branches/uniaud32-2.0/alsa-kernel/pci/hda/hda_codec.c

@@ -36 +36 @@
 /* define this option here to hide as static */
 static int power_save = CONFIG_SND_HDA_POWER_SAVE_DEFAULT;
-//module_param(power_save, int, 0644);
+module_param(power_save, int, 0644);
 MODULE_PARM_DESC(power_save, "Automatic power-saving timeout "
                  "(in second, 0 = disable).");

GPL/branches/uniaud32-2.0/alsa-kernel/pci/hda/hda_intel.c

@@ -63 +63 @@
 static int enable_msi;
 
-//module_param_array(index, int, NULL, 0444);
+module_param_array(index, int, NULL, 0444);
 MODULE_PARM_DESC(index, "Index value for Intel HD audio interface.");
-//module_param_array(id, charp, NULL, 0444);
+module_param_array(id, charp, NULL, 0444);
 MODULE_PARM_DESC(id, "ID string for Intel HD audio interface.");
-//module_param_array(enable, bool, NULL, 0444);
+module_param_array(enable, bool, NULL, 0444);
 MODULE_PARM_DESC(enable, "Enable Intel HD audio interface.");
-//module_param_array(model, charp, NULL, 0444);
+module_param_array(model, charp, NULL, 0444);
 MODULE_PARM_DESC(model, "Use the given board model.");
-//module_param_array(position_fix, int, NULL, 0444);
+module_param_array(position_fix, int, NULL, 0444);
 MODULE_PARM_DESC(position_fix, "Fix DMA pointer "
                  "(0 = auto, 1 = none, 2 = POSBUF, 3 = FIFO size).");
-//module_param_array(probe_mask, int, NULL, 0444);
+module_param_array(probe_mask, int, NULL, 0444);
 MODULE_PARM_DESC(probe_mask, "Bitmask to probe codecs (default = -1).");
-//module_param(single_cmd, bool, 0444);
+module_param(single_cmd, bool, 0444);
 MODULE_PARM_DESC(single_cmd, "Use single command to communicate with codecs "
                  "(for debugging only).");
-//module_param(enable_msi, int, 0444);
+module_param(enable_msi, int, 0444);
 MODULE_PARM_DESC(enable_msi, "Enable Message Signaled Interrupt (MSI)");
 
@@ -90 +90 @@
  */
 static int power_save_controller = 1;
-//module_param(power_save_controller, bool, 0644);
+module_param(power_save_controller, bool, 0644);
 MODULE_PARM_DESC(power_save_controller, "Reset controller in power save mode.");
 #endif

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

@@ -809 +809 @@
     pHandle->doublesamplesize  = samplesize * 2;
     pHandle->doublesamplesize *= pHwParams->ulNumChannels;
-    periodbytes = pHwParams->ulPeriodSize;
-    periodsize  = bytes_to_samples(periodbytes);
+//    periodbytes = pHwParams->ulPeriodSize;
+//    periodsize  = bytes_to_samples(periodbytes);
+    periodsize = pHwParams->ulPeriodSize;
+    periodbytes = samples_to_bytes(periodsize);
     // checking number of channels
 
-    printk("channels: %i, period size: %i\n",pHwParams->ulNumChannels, periodbytes);
+    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));
@@ -926 +928 @@
         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 +937 @@
         periodsize = maxperiodsize;
     }
-
     if(samples_to_bytes(periodsize) < periodbytes) {
         periodbytes = samples_to_bytes(periodsize);
@@ -944 +944 @@
         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;
@@ -992 +991 @@
     _snd_pcm_hw_param_set(&params, SNDRV_PCM_HW_PARAM_RATE,
                           pHwParams->ulSampleRate, 0);
-#if 0
     _snd_pcm_hw_param_set(&params, SNDRV_PCM_HW_PARAM_PERIOD_SIZE, 
                           periodsize, 0);
@@ -1003 +1001 @@
     _snd_pcm_hw_param_set(&params, SNDRV_PCM_HW_PARAM_BUFFER_BYTES, 
                           periodbytes*nrperiods, 0);
-#endif
+
 //#ifdef DEBUG_PK
     printk("Hardware parameters: sample rate %i, data type %i, channels %i, period size %i, periods %i\n",
@@ -1009 +1007 @@
 //#endif
     ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_HW_PARAMS, (ULONG)__Stack32ToFlat(&params));
-    if (ret == -77 && fTryAgain == FALSE)
+    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);