diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-06-26 11:28:06 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-06-26 12:00:01 -0400 |
commit | 33124929a23c5b555c39b99b4073766d232cb31d (patch) | |
tree | 1d6c0f49a9030deac1ce1b5f5312090213ff5c0a /sound/pci | |
parent | 703c759f38cce7950ab460552236ca1d15adb916 (diff) |
ALSA: hda - Move SD nums definitions to hda_intel.c
The defined numbers of SDs are specific to hda-intel, so move them to
there.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r-- | sound/pci/hda/hda_intel.c | 17 | ||||
-rw-r--r-- | sound/pci/hda/hda_priv.h | 17 |
2 files changed, 17 insertions, 17 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 1e971e2f1d50..bbf01fcb6893 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c | |||
@@ -94,6 +94,23 @@ enum { | |||
94 | /* Define VIA HD Audio Device ID*/ | 94 | /* Define VIA HD Audio Device ID*/ |
95 | #define VIA_HDAC_DEVICE_ID 0x3288 | 95 | #define VIA_HDAC_DEVICE_ID 0x3288 |
96 | 96 | ||
97 | /* max number of SDs */ | ||
98 | /* ICH, ATI and VIA have 4 playback and 4 capture */ | ||
99 | #define ICH6_NUM_CAPTURE 4 | ||
100 | #define ICH6_NUM_PLAYBACK 4 | ||
101 | |||
102 | /* ULI has 6 playback and 5 capture */ | ||
103 | #define ULI_NUM_CAPTURE 5 | ||
104 | #define ULI_NUM_PLAYBACK 6 | ||
105 | |||
106 | /* ATI HDMI may have up to 8 playbacks and 0 capture */ | ||
107 | #define ATIHDMI_NUM_CAPTURE 0 | ||
108 | #define ATIHDMI_NUM_PLAYBACK 8 | ||
109 | |||
110 | /* TERA has 4 playback and 3 capture */ | ||
111 | #define TERA_NUM_CAPTURE 3 | ||
112 | #define TERA_NUM_PLAYBACK 4 | ||
113 | |||
97 | 114 | ||
98 | static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; | 115 | static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; |
99 | static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; | 116 | static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; |
diff --git a/sound/pci/hda/hda_priv.h b/sound/pci/hda/hda_priv.h index 30bbbc48d314..0688aaff09f1 100644 --- a/sound/pci/hda/hda_priv.h +++ b/sound/pci/hda/hda_priv.h | |||
@@ -103,23 +103,6 @@ enum { SDI0, SDI1, SDI2, SDI3, SDO0, SDO1, SDO2, SDO3 }; | |||
103 | * other constants | 103 | * other constants |
104 | */ | 104 | */ |
105 | 105 | ||
106 | /* max number of SDs */ | ||
107 | /* ICH, ATI and VIA have 4 playback and 4 capture */ | ||
108 | #define ICH6_NUM_CAPTURE 4 | ||
109 | #define ICH6_NUM_PLAYBACK 4 | ||
110 | |||
111 | /* ULI has 6 playback and 5 capture */ | ||
112 | #define ULI_NUM_CAPTURE 5 | ||
113 | #define ULI_NUM_PLAYBACK 6 | ||
114 | |||
115 | /* ATI HDMI may have up to 8 playbacks and 0 capture */ | ||
116 | #define ATIHDMI_NUM_CAPTURE 0 | ||
117 | #define ATIHDMI_NUM_PLAYBACK 8 | ||
118 | |||
119 | /* TERA has 4 playback and 3 capture */ | ||
120 | #define TERA_NUM_CAPTURE 3 | ||
121 | #define TERA_NUM_PLAYBACK 4 | ||
122 | |||
123 | /* max number of fragments - we may use more if allocating more pages for BDL */ | 106 | /* max number of fragments - we may use more if allocating more pages for BDL */ |
124 | #define BDL_SIZE 4096 | 107 | #define BDL_SIZE 4096 |
125 | #define AZX_MAX_BDL_ENTRIES (BDL_SIZE / 16) | 108 | #define AZX_MAX_BDL_ENTRIES (BDL_SIZE / 16) |