leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ALSA: au88x0 - Use a better name for pcm devices of au88x0

Browse Source 
Signed-off-by: Raymond Yau <superquad.vortex2@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Raymond Yau 2011-04-26 12:15:23 +08:00 committed by Takashi Iwai
parent 8ae9572b5b
commit 13eb4ab8ca
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/pci/au88x0/au8810.h
View File

@ -4,7 +4,7 @@
#define CHIP_AU8810 #define CHIP_AU8810
#define CARD_NAME "Aureal Advantage 3D Sound Processor" #define CARD_NAME "Aureal Advantage"
#define CARD_NAME_SHORT "au8810" #define CARD_NAME_SHORT "au8810"
#define NR_ADB 0x10 #define NR_ADB 0x10

2
sound/pci/au88x0/au8820.h
View File

@ -11,7 +11,7 @@
#define CHIP_AU8820 #define CHIP_AU8820
#define CARD_NAME "Aureal Vortex 3D Sound Processor" #define CARD_NAME "Aureal Vortex"
#define CARD_NAME_SHORT "au8820" #define CARD_NAME_SHORT "au8820"
/* Number of ADB and WT channels */ /* Number of ADB and WT channels */

2
sound/pci/au88x0/au8830.h
View File

@ -11,7 +11,7 @@
#define CHIP_AU8830 #define CHIP_AU8830
#define CARD_NAME "Aureal Vortex 2 3D Sound Processor" #define CARD_NAME "Aureal Vortex 2"
#define CARD_NAME_SHORT "au8830" #define CARD_NAME_SHORT "au8830"
#define NR_ADB 0x20 #define NR_ADB 0x20

13
sound/pci/au88x0/au88x0_pcm.c
View File

@ -423,11 +423,11 @@ static struct snd_pcm_ops snd_vortex_playback_ops = {
*/ */
static char *vortex_pcm_prettyname[VORTEX_PCM_LAST] = { static char *vortex_pcm_prettyname[VORTEX_PCM_LAST] = {
"AU88x0 ADB", CARD_NAME " ADB",
"AU88x0 SPDIF", CARD_NAME " SPDIF",
"AU88x0 A3D", CARD_NAME " A3D",
"AU88x0 WT", CARD_NAME " WT",
"AU88x0 I2S", CARD_NAME " I2S",
}; };
static char *vortex_pcm_name[VORTEX_PCM_LAST] = { static char *vortex_pcm_name[VORTEX_PCM_LAST] = {
"adb", "adb",
@ -524,7 +524,8 @@ static int __devinit snd_vortex_new_pcm(vortex_t *chip, int idx, int nr)
nr_capt, &pcm); nr_capt, &pcm);
if (err < 0) if (err < 0)
return err; return err;
strcpy(pcm->name, vortex_pcm_name[idx]); snprintf(pcm->name, sizeof(pcm->name),
"%s %s", CARD_NAME_SHORT, vortex_pcm_name[idx]);
chip->pcm[idx] = pcm; chip->pcm[idx] = pcm;
// This is an evil hack, but it saves a lot of duplicated code. // This is an evil hack, but it saves a lot of duplicated code.
VORTEX_PCM_TYPE(pcm) = idx; VORTEX_PCM_TYPE(pcm) = idx;