Update of /cvsroot/alsa/alsa-kernel/pci/cs46xx In directory sc8-pr-cvs1:/tmp/cvs-serv22583
Modified Files: cs46xx_lib.c Log Message: Fixed compilation warnings for old DSP Index: cs46xx_lib.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/pci/cs46xx/cs46xx_lib.c,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- cs46xx_lib.c 3 Mar 2003 11:33:00 -0000 1.52 +++ cs46xx_lib.c 6 Mar 2003 19:29:21 -0000 1.53 @@ -964,13 +964,14 @@ static int snd_cs46xx_playback_hw_params(snd_pcm_substream_t * substream, snd_pcm_hw_params_t * hw_params) { - /*cs46xx_t *chip = snd_pcm_substream_chip(substream);*/ snd_pcm_runtime_t *runtime = substream->runtime; cs46xx_pcm_t *cpcm; int err; +#ifdef CONFIG_SND_CS46XX_NEW_DSP cs46xx_t *chip = snd_pcm_substream_chip(substream); int sample_rate = params_rate(hw_params); int period_size = params_period_bytes(hw_params); +#endif cpcm = snd_magic_cast(cs46xx_pcm_t, runtime->private_data, return -ENXIO); #ifdef CONFIG_SND_CS46XX_NEW_DSP @@ -1157,10 +1158,9 @@ cs46xx_t *chip = snd_pcm_substream_chip(substream); snd_pcm_runtime_t *runtime = substream->runtime; int err; - int period_size = params_period_bytes(hw_params); #ifdef CONFIG_SND_CS46XX_NEW_DSP - cs46xx_dsp_pcm_ostream_set_period (chip,period_size); + cs46xx_dsp_pcm_ostream_set_period (chip, params_period_bytes(hw_params)); #endif if (runtime->periods == CS46XX_FRAGS) { if (runtime->dma_area != chip->capt.hw_area) @@ -1345,6 +1345,8 @@ .fifo_size = 0, }; +#ifdef CONFIG_SND_CS46XX_NEW_DSP + static unsigned int period_sizes[] = { 32, 64, 128, 256, 512, 1024, 2048 }; #define PERIOD_SIZES sizeof(period_sizes) / sizeof(period_sizes[0]) @@ -1354,6 +1356,8 @@ .list = period_sizes, .mask = 0 }; + +#endif static void snd_cs46xx_pcm_free_substream(snd_pcm_runtime_t *runtime) { ------------------------------------------------------- This SF.net email is sponsored by: Etnus, makers of TotalView, The debugger for complex code. Debugging C/C++ programs can leave you feeling lost and disoriented. TotalView can help you find your way. Available on major UNIX and Linux platforms. Try it free. www.etnus.com _______________________________________________ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog