hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ALSA: hda: make global snd_print_channel_allocation() 

code refactor: make a global function snd_print_channel_allocation().

Signed-off-by: Wu Fengguang <wfg@linux.intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Wu Fengguang 2008-11-19 08:56:16 +08:00 committed by Takashi Iwai
parent 5457a98039
commit 903b21d8b7
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sound/pci/hda/hda_eld.c
View File

@ -407,8 +407,7 @@ static void hdmi_show_short_audio_desc(struct cea_sad *a)
printk(KERN_INFO "profile: %d\n", a->profile); printk(KERN_INFO "profile: %d\n", a->profile);
} }
#define HDMI_PRINT_CHANNEL_ALLOCATION_ADVISED_BUFSIZE 80 void snd_print_channel_allocation(int spk_alloc, char *buf, int buflen)
static void hdmi_print_channel_allocation(int spk_alloc, char *buf, int buflen)
{ {
int i, j; int i, j;
@ -425,7 +424,7 @@ static void hdmi_print_channel_allocation(int spk_alloc, char *buf, int buflen)
void snd_hdmi_show_eld(struct sink_eld *e) void snd_hdmi_show_eld(struct sink_eld *e)
{ {
int i; int i;
char buf[HDMI_PRINT_CHANNEL_ALLOCATION_ADVISED_BUFSIZE]; char buf[SND_PRINT_CHANNEL_ALLOCATION_ADVISED_BUFSIZE];
printk(KERN_INFO "ELD buffer size is %d\n", e->eld_size); printk(KERN_INFO "ELD buffer size is %d\n", e->eld_size);
printk(KERN_INFO "ELD baseline len is %d*4\n", e->baseline_len); printk(KERN_INFO "ELD baseline len is %d*4\n", e->baseline_len);
@ -446,7 +445,7 @@ void snd_hdmi_show_eld(struct sink_eld *e)
eld_connection_type_names[e->conn_type]); eld_connection_type_names[e->conn_type]);
printk(KERN_INFO "monitor name is %s\n", e->monitor_name); printk(KERN_INFO "monitor name is %s\n", e->monitor_name);
hdmi_print_channel_allocation(e->spk_alloc, buf, sizeof(buf)); snd_print_channel_allocation(e->spk_alloc, buf, sizeof(buf));
printk(KERN_INFO "speaker allocations: (0x%x)%s\n", e->spk_alloc, buf); printk(KERN_INFO "speaker allocations: (0x%x)%s\n", e->spk_alloc, buf);
for (i = 0; i < e->sad_count; i++) for (i = 0; i < e->sad_count; i++)
@ -484,7 +483,7 @@ static void hdmi_print_eld_info(struct snd_info_entry *entry,
struct snd_info_buffer *buffer) struct snd_info_buffer *buffer)
{ {
struct sink_eld *e = entry->private_data; struct sink_eld *e = entry->private_data;
char buf[HDMI_PRINT_CHANNEL_ALLOCATION_ADVISED_BUFSIZE]; char buf[SND_PRINT_CHANNEL_ALLOCATION_ADVISED_BUFSIZE];
int i; int i;
snd_iprintf(buffer, "monitor name\t\t%s\n", e->monitor_name); snd_iprintf(buffer, "monitor name\t\t%s\n", e->monitor_name);
@ -501,7 +500,7 @@ static void hdmi_print_eld_info(struct snd_info_entry *entry,
snd_iprintf(buffer, "support_ai\t\t%d\n", e->support_ai); snd_iprintf(buffer, "support_ai\t\t%d\n", e->support_ai);
snd_iprintf(buffer, "audio_sync_delay\t%d\n", e->aud_synch_delay); snd_iprintf(buffer, "audio_sync_delay\t%d\n", e->aud_synch_delay);
hdmi_print_channel_allocation(e->spk_alloc, buf, sizeof(buf)); snd_print_channel_allocation(e->spk_alloc, buf, sizeof(buf));
snd_iprintf(buffer, "speakers\t\t[0x%x] %s\n", e->spk_alloc, buf); snd_iprintf(buffer, "speakers\t\t[0x%x] %s\n", e->spk_alloc, buf);
snd_iprintf(buffer, "sad_count\t\t%d\n", e->sad_count); snd_iprintf(buffer, "sad_count\t\t%d\n", e->sad_count);

3
sound/pci/hda/hda_local.h
View File

@ -493,4 +493,7 @@ inline int snd_hda_eld_proc_new(struct hda_codec *codec, struct sink_eld *eld)
} }
#endif #endif
#define SND_PRINT_CHANNEL_ALLOCATION_ADVISED_BUFSIZE 80
void snd_print_channel_allocation(int spk_alloc, char *buf, int buflen);
#endif /* __SOUND_HDA_LOCAL_H */ #endif /* __SOUND_HDA_LOCAL_H */