diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-01-08 12:09:57 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2008-01-31 11:29:47 -0500 |
commit | 31e8960b35975ed235d283d6fb95d0e28dffded0 (patch) | |
tree | f084becc6e5dbec3efa1d79d0961facd68e585f9 /sound/core/pcm.c | |
parent | 130755108ba03461f69da990e54e02a254accd23 (diff) |
[ALSA] Remove PCM sleep_min and tick
The 'tick' in PCM is set (again) via sw_params. And, nobody uses
this feature at all except for a command line option of aplay.
(This is literally 'nobody', as I checked alsa-lib API calls in all
programs in major distros.)
Above all, if we need finer wake-ups for the position update, it's
basically an issue that the driver should solve, not tuned by each
application.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/core/pcm.c')
-rw-r--r-- | sound/core/pcm.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/sound/core/pcm.c b/sound/core/pcm.c index 97cb681502a..cf3af39c351 100644 --- a/sound/core/pcm.c +++ b/sound/core/pcm.c | |||
@@ -359,7 +359,6 @@ static void snd_pcm_substream_proc_hw_params_read(struct snd_info_entry *entry, | |||
359 | snd_iprintf(buffer, "rate: %u (%u/%u)\n", runtime->rate, runtime->rate_num, runtime->rate_den); | 359 | snd_iprintf(buffer, "rate: %u (%u/%u)\n", runtime->rate, runtime->rate_num, runtime->rate_den); |
360 | snd_iprintf(buffer, "period_size: %lu\n", runtime->period_size); | 360 | snd_iprintf(buffer, "period_size: %lu\n", runtime->period_size); |
361 | snd_iprintf(buffer, "buffer_size: %lu\n", runtime->buffer_size); | 361 | snd_iprintf(buffer, "buffer_size: %lu\n", runtime->buffer_size); |
362 | snd_iprintf(buffer, "tick_time: %u\n", runtime->tick_time); | ||
363 | #if defined(CONFIG_SND_PCM_OSS) || defined(CONFIG_SND_PCM_OSS_MODULE) | 362 | #if defined(CONFIG_SND_PCM_OSS) || defined(CONFIG_SND_PCM_OSS_MODULE) |
364 | if (substream->oss.oss) { | 363 | if (substream->oss.oss) { |
365 | snd_iprintf(buffer, "OSS format: %s\n", snd_pcm_oss_format_name(runtime->oss.format)); | 364 | snd_iprintf(buffer, "OSS format: %s\n", snd_pcm_oss_format_name(runtime->oss.format)); |
@@ -387,7 +386,6 @@ static void snd_pcm_substream_proc_sw_params_read(struct snd_info_entry *entry, | |||
387 | } | 386 | } |
388 | snd_iprintf(buffer, "tstamp_mode: %s\n", snd_pcm_tstamp_mode_name(runtime->tstamp_mode)); | 387 | snd_iprintf(buffer, "tstamp_mode: %s\n", snd_pcm_tstamp_mode_name(runtime->tstamp_mode)); |
389 | snd_iprintf(buffer, "period_step: %u\n", runtime->period_step); | 388 | snd_iprintf(buffer, "period_step: %u\n", runtime->period_step); |
390 | snd_iprintf(buffer, "sleep_min: %u\n", runtime->sleep_min); | ||
391 | snd_iprintf(buffer, "avail_min: %lu\n", runtime->control->avail_min); | 389 | snd_iprintf(buffer, "avail_min: %lu\n", runtime->control->avail_min); |
392 | snd_iprintf(buffer, "start_threshold: %lu\n", runtime->start_threshold); | 390 | snd_iprintf(buffer, "start_threshold: %lu\n", runtime->start_threshold); |
393 | snd_iprintf(buffer, "stop_threshold: %lu\n", runtime->stop_threshold); | 391 | snd_iprintf(buffer, "stop_threshold: %lu\n", runtime->stop_threshold); |
@@ -764,12 +762,6 @@ static int snd_pcm_dev_free(struct snd_device *device) | |||
764 | return snd_pcm_free(pcm); | 762 | return snd_pcm_free(pcm); |
765 | } | 763 | } |
766 | 764 | ||
767 | static void snd_pcm_tick_timer_func(unsigned long data) | ||
768 | { | ||
769 | struct snd_pcm_substream *substream = (struct snd_pcm_substream *) data; | ||
770 | snd_pcm_tick_elapsed(substream); | ||
771 | } | ||
772 | |||
773 | int snd_pcm_attach_substream(struct snd_pcm *pcm, int stream, | 765 | int snd_pcm_attach_substream(struct snd_pcm *pcm, int stream, |
774 | struct file *file, | 766 | struct file *file, |
775 | struct snd_pcm_substream **rsubstream) | 767 | struct snd_pcm_substream **rsubstream) |
@@ -876,9 +868,6 @@ int snd_pcm_attach_substream(struct snd_pcm *pcm, int stream, | |||
876 | memset((void*)runtime->control, 0, size); | 868 | memset((void*)runtime->control, 0, size); |
877 | 869 | ||
878 | init_waitqueue_head(&runtime->sleep); | 870 | init_waitqueue_head(&runtime->sleep); |
879 | init_timer(&runtime->tick_timer); | ||
880 | runtime->tick_timer.function = snd_pcm_tick_timer_func; | ||
881 | runtime->tick_timer.data = (unsigned long) substream; | ||
882 | 871 | ||
883 | runtime->status->state = SNDRV_PCM_STATE_OPEN; | 872 | runtime->status->state = SNDRV_PCM_STATE_OPEN; |
884 | 873 | ||