summaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/hda_eld.c
diff options
context:
space:
mode:
authorWu Fengguang <wfg@linux.intel.com>2008-11-19 15:14:01 +0800
committerTakashi Iwai <tiwai@suse.de>2008-11-19 09:42:21 +0100
commit06f69d17a90ced7d74ff12ce69b7b101aed4ffd9 (patch)
tree35d1d83b7ab4559842fab31a4173a661dfad7845 /sound/pci/hda/hda_eld.c
parent5b87ebb7a79455358c1910f2896112ac0fa0d0fa (diff)
downloadop-kernel-dev-06f69d17a90ced7d74ff12ce69b7b101aed4ffd9.zip
op-kernel-dev-06f69d17a90ced7d74ff12ce69b7b101aed4ffd9.tar.gz
ALSA: hda: minor output message cleanups
Some minor user visible message cleanups. Signed-off-by: Wu Fengguang <wfg@linux.intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_eld.c')
-rw-r--r--sound/pci/hda/hda_eld.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/sound/pci/hda/hda_eld.c b/sound/pci/hda/hda_eld.c
index 1b3ec1e..75e9a40 100644
--- a/sound/pci/hda/hda_eld.c
+++ b/sound/pci/hda/hda_eld.c
@@ -118,7 +118,7 @@ static char *cea_audio_coding_type_names[] = {
/* 6 */ "AAC-LC",
/* 7 */ "DTS",
/* 8 */ "ATRAC",
- /* 9 */ "DSD (1-bit audio)",
+ /* 9 */ "DSD (One Bit Audio)",
/* 10 */ "E-AC-3/DD+ (Dolby Digital Plus)",
/* 11 */ "DTS-HD",
/* 12 */ "MLP (Dolby TrueHD)",
@@ -395,7 +395,7 @@ static void hdmi_show_short_audio_desc(struct cea_sad *a)
printk(KERN_INFO "channels: %d\n", a->channels);
snd_print_pcm_rates(a->rates, buf, sizeof(buf));
- printk(KERN_INFO "sampling frequencies: %s\n", buf);
+ printk(KERN_INFO "sampling rates: %s\n", buf);
if (a->format == AUDIO_CODING_TYPE_LPCM)
printk(KERN_INFO "sample bits: 0x%x\n", a->sample_bits);
@@ -413,11 +413,9 @@ void snd_print_channel_allocation(int spk_alloc, char *buf, int buflen)
for (i = 0, j = 0; i < ARRAY_SIZE(cea_speaker_allocation_names); i++) {
if (spk_alloc & (1 << i))
- j += snprintf(buf + j, buflen - j, "%s ",
+ j += snprintf(buf + j, buflen - j, " %s",
cea_speaker_allocation_names[i]);
}
- if (j)
- j--; /* skip last space */
buf[j] = '\0'; /* necessary when j == 0 */
}
@@ -464,11 +462,10 @@ static void hdmi_print_sad_info(int i, struct cea_sad *a,
snd_iprintf(buffer, "sad%d_channels\t\t%d\n", i, a->channels);
snd_print_pcm_rates(a->rates, buf, sizeof(buf));
- snd_iprintf(buffer, "sad%d_sampling_rates\t[0x%x] %s\n",
- i, a->rates, 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_sample_bits\t0x%x\n",
+ snd_iprintf(buffer, "sad%d_bits\t\t0x%x\n",
i, a->sample_bits);
if (a->max_bitrate)
@@ -501,7 +498,7 @@ static void hdmi_print_eld_info(struct snd_info_entry *entry,
snd_iprintf(buffer, "audio_sync_delay\t%d\n", e->aud_synch_delay);
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);
OpenPOWER on IntegriCloud