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 /include/sound/pcm.h | |
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 'include/sound/pcm.h')
-rw-r--r-- | include/sound/pcm.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/sound/pcm.h b/include/sound/pcm.h index 1270cbce776a..51d58ccda2d8 100644 --- a/include/sound/pcm.h +++ b/include/sound/pcm.h | |||
@@ -274,7 +274,6 @@ struct snd_pcm_runtime { | |||
274 | snd_pcm_uframes_t period_size; /* period size */ | 274 | snd_pcm_uframes_t period_size; /* period size */ |
275 | unsigned int periods; /* periods */ | 275 | unsigned int periods; /* periods */ |
276 | snd_pcm_uframes_t buffer_size; /* buffer size */ | 276 | snd_pcm_uframes_t buffer_size; /* buffer size */ |
277 | unsigned int tick_time; /* tick time */ | ||
278 | snd_pcm_uframes_t min_align; /* Min alignment for the format */ | 277 | snd_pcm_uframes_t min_align; /* Min alignment for the format */ |
279 | size_t byte_align; | 278 | size_t byte_align; |
280 | unsigned int frame_bits; | 279 | unsigned int frame_bits; |
@@ -286,7 +285,6 @@ struct snd_pcm_runtime { | |||
286 | /* -- SW params -- */ | 285 | /* -- SW params -- */ |
287 | int tstamp_mode; /* mmap timestamp is updated */ | 286 | int tstamp_mode; /* mmap timestamp is updated */ |
288 | unsigned int period_step; | 287 | unsigned int period_step; |
289 | unsigned int sleep_min; /* min ticks to sleep */ | ||
290 | snd_pcm_uframes_t start_threshold; | 288 | snd_pcm_uframes_t start_threshold; |
291 | snd_pcm_uframes_t stop_threshold; | 289 | snd_pcm_uframes_t stop_threshold; |
292 | snd_pcm_uframes_t silence_threshold; /* Silence filling happens when | 290 | snd_pcm_uframes_t silence_threshold; /* Silence filling happens when |
@@ -305,7 +303,6 @@ struct snd_pcm_runtime { | |||
305 | 303 | ||
306 | /* -- locking / scheduling -- */ | 304 | /* -- locking / scheduling -- */ |
307 | wait_queue_head_t sleep; | 305 | wait_queue_head_t sleep; |
308 | struct timer_list tick_timer; | ||
309 | struct fasync_struct *fasync; | 306 | struct fasync_struct *fasync; |
310 | 307 | ||
311 | /* -- private section -- */ | 308 | /* -- private section -- */ |
@@ -810,7 +807,6 @@ static inline const struct snd_interval *hw_param_interval_c(const struct snd_pc | |||
810 | #define params_periods(p) hw_param_interval((p), SNDRV_PCM_HW_PARAM_PERIODS)->min | 807 | #define params_periods(p) hw_param_interval((p), SNDRV_PCM_HW_PARAM_PERIODS)->min |
811 | #define params_buffer_size(p) hw_param_interval((p), SNDRV_PCM_HW_PARAM_BUFFER_SIZE)->min | 808 | #define params_buffer_size(p) hw_param_interval((p), SNDRV_PCM_HW_PARAM_BUFFER_SIZE)->min |
812 | #define params_buffer_bytes(p) hw_param_interval((p), SNDRV_PCM_HW_PARAM_BUFFER_BYTES)->min | 809 | #define params_buffer_bytes(p) hw_param_interval((p), SNDRV_PCM_HW_PARAM_BUFFER_BYTES)->min |
813 | #define params_tick_time(p) hw_param_interval((p), SNDRV_PCM_HW_PARAM_TICK_TIME)->min | ||
814 | 810 | ||
815 | 811 | ||
816 | int snd_interval_refine(struct snd_interval *i, const struct snd_interval *v); | 812 | int snd_interval_refine(struct snd_interval *i, const struct snd_interval *v); |
@@ -908,9 +904,6 @@ int snd_pcm_capture_xrun_check(struct snd_pcm_substream *substream); | |||
908 | int snd_pcm_playback_xrun_asap(struct snd_pcm_substream *substream); | 904 | int snd_pcm_playback_xrun_asap(struct snd_pcm_substream *substream); |
909 | int snd_pcm_capture_xrun_asap(struct snd_pcm_substream *substream); | 905 | int snd_pcm_capture_xrun_asap(struct snd_pcm_substream *substream); |
910 | void snd_pcm_playback_silence(struct snd_pcm_substream *substream, snd_pcm_uframes_t new_hw_ptr); | 906 | void snd_pcm_playback_silence(struct snd_pcm_substream *substream, snd_pcm_uframes_t new_hw_ptr); |
911 | void snd_pcm_tick_prepare(struct snd_pcm_substream *substream); | ||
912 | void snd_pcm_tick_set(struct snd_pcm_substream *substream, unsigned long ticks); | ||
913 | void snd_pcm_tick_elapsed(struct snd_pcm_substream *substream); | ||
914 | void snd_pcm_period_elapsed(struct snd_pcm_substream *substream); | 907 | void snd_pcm_period_elapsed(struct snd_pcm_substream *substream); |
915 | snd_pcm_sframes_t snd_pcm_lib_write(struct snd_pcm_substream *substream, | 908 | snd_pcm_sframes_t snd_pcm_lib_write(struct snd_pcm_substream *substream, |
916 | const void __user *buf, | 909 | const void __user *buf, |