lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ALSA: hda - Fix build without CONFIG_PROC_FS

Browse Source 
snd_print_pcm_rates() and snd_print_pcm_bits() are used by both
hda_proc.c and hda_eld.c, thus they have to be defined in the common
place.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai
2008-11-21 21:24:03 +01:00
parent c70bfa8733
commit b20222667d
2 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
sound/pci/hda/hda_codec.c
View File

@@ -3425,3 +3425,33 @@ void snd_array_free(struct snd_array *array)
array->alloced = 0; array->alloced = 0;
array->list = NULL; array->list = NULL;
} }
/*
* used by hda_proc.c and hda_eld.c
*/
void snd_print_pcm_rates(int pcm, char *buf, int buflen)
{
static unsigned int rates[] = {
8000, 11025, 16000, 22050, 32000, 44100, 48000, 88200,
96000, 176400, 192000, 384000
};
int i, j;
for (i = 0, j = 0; i < ARRAY_SIZE(rates); i++)
if (pcm & (1 << i))
j += snprintf(buf + j, buflen - j, " %d", rates[i]);
buf[j] = '\0'; /* necessary when j == 0 */
}
void snd_print_pcm_bits(int pcm, char *buf, int buflen)
{
static unsigned int bits[] = { 8, 16, 20, 24, 32 };
int i, j;
for (i = 0, j = 0; i < ARRAY_SIZE(bits); i++)
if (pcm & (AC_SUPPCM_BITS_8 << i))
j += snprintf(buf + j, buflen - j, " %d", bits[i]);
buf[j] = '\0'; /* necessary when j == 0 */
}

27
sound/pci/hda/hda_proc.c
View File

@@ -89,21 +89,6 @@ static void print_amp_vals(struct snd_info_buffer *buffer,
snd_iprintf(buffer, "\n"); snd_iprintf(buffer, "\n");
} }
void snd_print_pcm_rates(int pcm, char *buf, int buflen)
{
static unsigned int rates[] = {
8000, 11025, 16000, 22050, 32000, 44100, 48000, 88200,
96000, 176400, 192000, 384000
};
int i, j;
for (i = 0, j = 0; i < ARRAY_SIZE(rates); i++)
if (pcm & (1 << i))
j += snprintf(buf + j, buflen - j, " %d", rates[i]);
buf[j] = '\0'; /* necessary when j == 0 */
}
static void print_pcm_rates(struct snd_info_buffer *buffer, unsigned int pcm) static void print_pcm_rates(struct snd_info_buffer *buffer, unsigned int pcm)
{ {
char buf[SND_PRINT_RATES_ADVISED_BUFSIZE]; char buf[SND_PRINT_RATES_ADVISED_BUFSIZE];
@@ -114,18 +99,6 @@ static void print_pcm_rates(struct snd_info_buffer *buffer, unsigned int pcm)
snd_iprintf(buffer, "%s\n", buf); snd_iprintf(buffer, "%s\n", buf);
} }
void snd_print_pcm_bits(int pcm, char *buf, int buflen)
{
static unsigned int bits[] = { 8, 16, 20, 24, 32 };
int i, j;
for (i = 0, j = 0; i < ARRAY_SIZE(bits); i++)
if (pcm & (AC_SUPPCM_BITS_8 << 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) static void print_pcm_bits(struct snd_info_buffer *buffer, unsigned int pcm)
{ {
char buf[SND_PRINT_BITS_ADVISED_BUFSIZE]; char buf[SND_PRINT_BITS_ADVISED_BUFSIZE];