diff options
Diffstat (limited to 'sound/core/pcm.c')
-rw-r--r-- | sound/core/pcm.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/sound/core/pcm.c b/sound/core/pcm.c index cf9b9493d41..9dd9bc73fe1 100644 --- a/sound/core/pcm.c +++ b/sound/core/pcm.c | |||
@@ -19,7 +19,6 @@ | |||
19 | * | 19 | * |
20 | */ | 20 | */ |
21 | 21 | ||
22 | #include <sound/driver.h> | ||
23 | #include <linux/init.h> | 22 | #include <linux/init.h> |
24 | #include <linux/slab.h> | 23 | #include <linux/slab.h> |
25 | #include <linux/time.h> | 24 | #include <linux/time.h> |
@@ -228,7 +227,7 @@ static char *snd_pcm_subformat_names[] = { | |||
228 | 227 | ||
229 | static char *snd_pcm_tstamp_mode_names[] = { | 228 | static char *snd_pcm_tstamp_mode_names[] = { |
230 | TSTAMP(NONE), | 229 | TSTAMP(NONE), |
231 | TSTAMP(MMAP), | 230 | TSTAMP(ENABLE), |
232 | }; | 231 | }; |
233 | 232 | ||
234 | static const char *snd_pcm_stream_name(int stream) | 233 | static const char *snd_pcm_stream_name(int stream) |
@@ -359,7 +358,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); | 358 | 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); | 359 | snd_iprintf(buffer, "period_size: %lu\n", runtime->period_size); |
361 | snd_iprintf(buffer, "buffer_size: %lu\n", runtime->buffer_size); | 360 | 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) | 361 | #if defined(CONFIG_SND_PCM_OSS) || defined(CONFIG_SND_PCM_OSS_MODULE) |
364 | if (substream->oss.oss) { | 362 | if (substream->oss.oss) { |
365 | snd_iprintf(buffer, "OSS format: %s\n", snd_pcm_oss_format_name(runtime->oss.format)); | 363 | snd_iprintf(buffer, "OSS format: %s\n", snd_pcm_oss_format_name(runtime->oss.format)); |
@@ -387,9 +385,7 @@ static void snd_pcm_substream_proc_sw_params_read(struct snd_info_entry *entry, | |||
387 | } | 385 | } |
388 | snd_iprintf(buffer, "tstamp_mode: %s\n", snd_pcm_tstamp_mode_name(runtime->tstamp_mode)); | 386 | 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); | 387 | 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); | 388 | snd_iprintf(buffer, "avail_min: %lu\n", runtime->control->avail_min); |
392 | snd_iprintf(buffer, "xfer_align: %lu\n", runtime->xfer_align); | ||
393 | snd_iprintf(buffer, "start_threshold: %lu\n", runtime->start_threshold); | 389 | snd_iprintf(buffer, "start_threshold: %lu\n", runtime->start_threshold); |
394 | snd_iprintf(buffer, "stop_threshold: %lu\n", runtime->stop_threshold); | 390 | snd_iprintf(buffer, "stop_threshold: %lu\n", runtime->stop_threshold); |
395 | snd_iprintf(buffer, "silence_threshold: %lu\n", runtime->silence_threshold); | 391 | snd_iprintf(buffer, "silence_threshold: %lu\n", runtime->silence_threshold); |
@@ -765,12 +761,6 @@ static int snd_pcm_dev_free(struct snd_device *device) | |||
765 | return snd_pcm_free(pcm); | 761 | return snd_pcm_free(pcm); |
766 | } | 762 | } |
767 | 763 | ||
768 | static void snd_pcm_tick_timer_func(unsigned long data) | ||
769 | { | ||
770 | struct snd_pcm_substream *substream = (struct snd_pcm_substream *) data; | ||
771 | snd_pcm_tick_elapsed(substream); | ||
772 | } | ||
773 | |||
774 | int snd_pcm_attach_substream(struct snd_pcm *pcm, int stream, | 764 | int snd_pcm_attach_substream(struct snd_pcm *pcm, int stream, |
775 | struct file *file, | 765 | struct file *file, |
776 | struct snd_pcm_substream **rsubstream) | 766 | struct snd_pcm_substream **rsubstream) |
@@ -877,9 +867,6 @@ int snd_pcm_attach_substream(struct snd_pcm *pcm, int stream, | |||
877 | memset((void*)runtime->control, 0, size); | 867 | memset((void*)runtime->control, 0, size); |
878 | 868 | ||
879 | init_waitqueue_head(&runtime->sleep); | 869 | init_waitqueue_head(&runtime->sleep); |
880 | init_timer(&runtime->tick_timer); | ||
881 | runtime->tick_timer.function = snd_pcm_tick_timer_func; | ||
882 | runtime->tick_timer.data = (unsigned long) substream; | ||
883 | 870 | ||
884 | runtime->status->state = SNDRV_PCM_STATE_OPEN; | 871 | runtime->status->state = SNDRV_PCM_STATE_OPEN; |
885 | 872 | ||