diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-09-10 15:32:51 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-09-10 15:32:51 +0200 |
| commit | 6a0f4021469727675b83d85ac91d106bfae0e2c3 (patch) | |
| tree | c6d7ffd99db592f4b7c294d1a5a7b54284012673 /include/sound | |
| parent | f9892a52e2405b4c5fa205d4f18ad292cb7e40bb (diff) | |
| parent | b888d1ce82ebd2bafecf64c765754968e78b4228 (diff) | |
| download | lwn-6a0f4021469727675b83d85ac91d106bfae0e2c3.tar.gz lwn-6a0f4021469727675b83d85ac91d106bfae0e2c3.zip | |
Merge branch 'topic/dummy' into for-linus
* topic/dummy:
ALSA: dummy - Increase MAX_PCM_SUBSTREAMS to 128
ALSA: dummy - Add debug proc file
ALSA: Add const prefix to proc helper functions
ALSA: Re-export snd_pcm_format_name() function
ALSA: dummy - Fake buffer allocations
ALSA: dummy - Fix the timer calculation in systimer mode
ALSA: dummy - Add more description
ALSA: dummy - Better jiffies handling
ALSA: dummy - Support high-res timer mode
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/info.h | 4 | ||||
| -rw-r--r-- | include/sound/pcm.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/sound/info.h b/include/sound/info.h index 7c2ee1a21b00..112e8949e1a7 100644 --- a/include/sound/info.h +++ b/include/sound/info.h @@ -110,13 +110,13 @@ void snd_card_info_read_oss(struct snd_info_buffer *buffer); static inline void snd_card_info_read_oss(struct snd_info_buffer *buffer) {} #endif -int snd_iprintf(struct snd_info_buffer *buffer, char *fmt, ...) \ +int snd_iprintf(struct snd_info_buffer *buffer, const char *fmt, ...) \ __attribute__ ((format (printf, 2, 3))); int snd_info_init(void); int snd_info_done(void); int snd_info_get_line(struct snd_info_buffer *buffer, char *line, int len); -char *snd_info_get_str(char *dest, char *src, int len); +const char *snd_info_get_str(char *dest, const char *src, int len); struct snd_info_entry *snd_info_create_module_entry(struct module *module, const char *name, struct snd_info_entry *parent); diff --git a/include/sound/pcm.h b/include/sound/pcm.h index 1691c7fe35af..de6d981de5d6 100644 --- a/include/sound/pcm.h +++ b/include/sound/pcm.h @@ -988,4 +988,6 @@ static inline void snd_pcm_limit_isa_dma_size(int dma, size_t *max) #define PCM_RUNTIME_CHECK(sub) snd_BUG_ON(!(sub) || !(sub)->runtime) +const char *snd_pcm_format_name(snd_pcm_format_t format); + #endif /* __SOUND_PCM_H */ |