Commit 6e5265ec authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: Re-export snd_pcm_format_name() function 



Re-export snd_pcm_format_name() function to be used outside the PCM core.
As a first example, usbaudio is changed to use it now again.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent a68c4d11

include/sound/pcm.h

+2 −0
Original line number Diff line number Diff line
@@ -965,4 +965,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 */

sound/core/pcm.c

+14 −12
Original line number Diff line number Diff line
@@ -162,18 +162,7 @@ static int snd_pcm_control_ioctl(struct snd_card *card, 
	return -ENOIOCTLCMD;

}



#ifdef CONFIG_SND_VERBOSE_PROCFS



#define STATE(v) [SNDRV_PCM_STATE_##v] = #v

#define STREAM(v) [SNDRV_PCM_STREAM_##v] = #v

#define READY(v) [SNDRV_PCM_READY_##v] = #v

#define XRUN(v) [SNDRV_PCM_XRUN_##v] = #v

#define SILENCE(v) [SNDRV_PCM_SILENCE_##v] = #v

#define TSTAMP(v) [SNDRV_PCM_TSTAMP_##v] = #v

#define ACCESS(v) [SNDRV_PCM_ACCESS_##v] = #v

#define START(v) [SNDRV_PCM_START_##v] = #v

#define FORMAT(v) [SNDRV_PCM_FORMAT_##v] = #v

#define SUBFORMAT(v) [SNDRV_PCM_SUBFORMAT_##v] = #v 



static char *snd_pcm_format_names[] = {

	FORMAT(S8),
@@ -216,10 +205,23 @@ static char *snd_pcm_format_names[] = { 
	FORMAT(U18_3BE),

};



static const char *snd_pcm_format_name(snd_pcm_format_t format)

const char *snd_pcm_format_name(snd_pcm_format_t format)

{

	return snd_pcm_format_names[format];

}

EXPORT_SYMBOL_GPL(snd_pcm_format_name);



#ifdef CONFIG_SND_VERBOSE_PROCFS



#define STATE(v) [SNDRV_PCM_STATE_##v] = #v

#define STREAM(v) [SNDRV_PCM_STREAM_##v] = #v

#define READY(v) [SNDRV_PCM_READY_##v] = #v

#define XRUN(v) [SNDRV_PCM_XRUN_##v] = #v

#define SILENCE(v) [SNDRV_PCM_SILENCE_##v] = #v

#define TSTAMP(v) [SNDRV_PCM_TSTAMP_##v] = #v

#define ACCESS(v) [SNDRV_PCM_ACCESS_##v] = #v

#define START(v) [SNDRV_PCM_START_##v] = #v

#define SUBFORMAT(v) [SNDRV_PCM_SUBFORMAT_##v] = #v 



static char *snd_pcm_stream_names[] = {

	STREAM(PLAYBACK),

sound/usb/usbaudio.c

+2 −2
Original line number Diff line number Diff line
@@ -2124,8 +2124,8 @@ static void proc_dump_substream_formats(struct snd_usb_substream *subs, struct s 
		fp = list_entry(p, struct audioformat, list);

		snd_iprintf(buffer, "  Interface %d\n", fp->iface);

		snd_iprintf(buffer, "    Altset %d\n", fp->altsetting);

		snd_iprintf(buffer, "    Format: %#x (%d bits)\n",

			    fp->format, snd_pcm_format_width(fp->format));

		snd_iprintf(buffer, "    Format: %s\n",

			    snd_pcm_format_name(fp->format));

		snd_iprintf(buffer, "    Channels: %d\n", fp->channels);

		snd_iprintf(buffer, "    Endpoint: %d %s (%s)\n",

			    fp->endpoint & USB_ENDPOINT_NUMBER_MASK,