Commit d39b4352 authored by Wu Fengguang's avatar Wu Fengguang Committed by Takashi Iwai
Browse files

ALSA: hda: make global snd_print_pcm_bits() 



Introduce a global function snd_print_pcm_bits() and use it in the ELD code.

Signed-off-by: default avatarWu Fengguang <wfg@linux.intel.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 06f69d17

sound/pci/hda/hda_eld.c

+6 −4
Original line number Diff line number Diff line
@@ -455,7 +455,7 @@ void snd_hdmi_show_eld(struct hdmi_eld *e) 
static void hdmi_print_sad_info(int i, struct cea_sad *a,

				struct snd_info_buffer *buffer)

{

	char buf[80];

	char buf[SND_PRINT_RATES_ADVISED_BUFSIZE];



	snd_iprintf(buffer, "sad%d_coding_type\t[0x%x] %s\n",

			i, a->format, cea_audio_coding_type_names[a->format]);
@@ -464,9 +464,11 @@ static void hdmi_print_sad_info(int i, struct cea_sad *a, 
	snd_print_pcm_rates(a->rates, buf, sizeof(buf));

	snd_iprintf(buffer, "sad%d_rates\t\t[0x%x]%s\n", i, a->rates, buf);



	if (a->format == AUDIO_CODING_TYPE_LPCM)

		snd_iprintf(buffer, "sad%d_bits\t\t0x%x\n",

							i, a->sample_bits);

	if (a->format == AUDIO_CODING_TYPE_LPCM) {

		snd_print_pcm_bits(a->sample_bits, buf, sizeof(buf));

		snd_iprintf(buffer, "sad%d_bits\t\t[0x%x]%s\n",

							i, a->sample_bits, buf);

	}



	if (a->max_bitrate)

		snd_iprintf(buffer, "sad%d_max_bitrate\t%d\n",

sound/pci/hda/hda_local.h

+3 −0
Original line number Diff line number Diff line
@@ -287,6 +287,9 @@ static inline int snd_hda_codec_proc_new(struct hda_codec *codec) { return 0; } 
#define SND_PRINT_RATES_ADVISED_BUFSIZE	80

void snd_print_pcm_rates(int pcm, char *buf, int buflen);



#define SND_PRINT_BITS_ADVISED_BUFSIZE	16

void snd_print_pcm_bits(int pcm, char *buf, int buflen);



/*

 * Misc

 */

sound/pci/hda/hda_proc.c

+16 −6
Original line number Diff line number Diff line
@@ -107,23 +107,33 @@ void snd_print_pcm_rates(int pcm, char *buf, int buflen) 
static void print_pcm_rates(struct snd_info_buffer *buffer, unsigned int pcm)

{

	char buf[SND_PRINT_RATES_ADVISED_BUFSIZE];



	pcm &= AC_SUPPCM_RATES;

	snd_iprintf(buffer, "    rates [0x%x]:", pcm);

	snd_print_pcm_rates(pcm, buf, sizeof(buf));

	snd_iprintf(buffer, "%s\n", buf);

}



static void print_pcm_bits(struct snd_info_buffer *buffer, unsigned int pcm)

void snd_print_pcm_bits(int pcm, char *buf, int buflen)

{

	static unsigned int bits[] = { 8, 16, 20, 24, 32 };

	int i;

	int i, j;



	for (i = 0, j = 0; i < ARRAY_SIZE(bits); i++)

		if (pcm & (1 << i))

			j += snprintf(buf + j, buflen - j,  " %d", bits[i]);



	buf[j] = '\0'; /* necessary when j == 0 */

}



static void print_pcm_bits(struct snd_info_buffer *buffer, unsigned int pcm)

{

	char buf[SND_PRINT_BITS_ADVISED_BUFSIZE];



	pcm = (pcm >> 16) & 0xff;

	snd_iprintf(buffer, "    bits [0x%x]:", pcm);

	for (i = 0; i < ARRAY_SIZE(bits); i++)

		if (pcm & (1 << i))

			snd_iprintf(buffer, " %d", bits[i]);

	snd_iprintf(buffer, "\n");

	snd_print_pcm_bits(pcm, buf, sizeof(buf));

	snd_iprintf(buffer, "%s\n", buf);

}



static void print_pcm_formats(struct snd_info_buffer *buffer,