Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
779d0659
Commit
779d0659
authored
May 02, 2011
by
Takashi Iwai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ALSA: hda - Constify fixup and other array data in patch_cmedia.c
Signed-off-by:
Takashi Iwai
<
tiwai@suse.de
>
parent
498f5b17
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
20 deletions
+20
-20
sound/pci/hda/patch_cmedia.c
sound/pci/hda/patch_cmedia.c
+20
-20
No files found.
sound/pci/hda/patch_cmedia.c
View file @
779d0659
...
@@ -53,7 +53,7 @@ struct cmi_spec {
...
@@ -53,7 +53,7 @@ struct cmi_spec {
int
num_dacs
;
int
num_dacs
;
/* capture */
/* capture */
hda_nid_t
*
adc_nids
;
const
hda_nid_t
*
adc_nids
;
hda_nid_t
dig_in_nid
;
hda_nid_t
dig_in_nid
;
/* capture source */
/* capture source */
...
@@ -110,7 +110,7 @@ static int cmi_mux_enum_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_v
...
@@ -110,7 +110,7 @@ static int cmi_mux_enum_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_v
*/
*/
/* 3-stack / 2 channel */
/* 3-stack / 2 channel */
static
struct
hda_verb
cmi9880_ch2_init
[]
=
{
static
const
struct
hda_verb
cmi9880_ch2_init
[]
=
{
/* set line-in PIN for input */
/* set line-in PIN for input */
{
0x0c
,
AC_VERB_SET_PIN_WIDGET_CONTROL
,
PIN_IN
},
{
0x0c
,
AC_VERB_SET_PIN_WIDGET_CONTROL
,
PIN_IN
},
/* set mic PIN for input, also enable vref */
/* set mic PIN for input, also enable vref */
...
@@ -121,7 +121,7 @@ static struct hda_verb cmi9880_ch2_init[] = {
...
@@ -121,7 +121,7 @@ static struct hda_verb cmi9880_ch2_init[] = {
};
};
/* 3-stack / 6 channel */
/* 3-stack / 6 channel */
static
struct
hda_verb
cmi9880_ch6_init
[]
=
{
static
const
struct
hda_verb
cmi9880_ch6_init
[]
=
{
/* set line-in PIN for output */
/* set line-in PIN for output */
{
0x0c
,
AC_VERB_SET_PIN_WIDGET_CONTROL
,
PIN_OUT
},
{
0x0c
,
AC_VERB_SET_PIN_WIDGET_CONTROL
,
PIN_OUT
},
/* set mic PIN for output */
/* set mic PIN for output */
...
@@ -132,7 +132,7 @@ static struct hda_verb cmi9880_ch6_init[] = {
...
@@ -132,7 +132,7 @@ static struct hda_verb cmi9880_ch6_init[] = {
};
};
/* 3-stack+front / 8 channel */
/* 3-stack+front / 8 channel */
static
struct
hda_verb
cmi9880_ch8_init
[]
=
{
static
const
struct
hda_verb
cmi9880_ch8_init
[]
=
{
/* set line-in PIN for output */
/* set line-in PIN for output */
{
0x0c
,
AC_VERB_SET_PIN_WIDGET_CONTROL
,
PIN_OUT
},
{
0x0c
,
AC_VERB_SET_PIN_WIDGET_CONTROL
,
PIN_OUT
},
/* set mic PIN for output */
/* set mic PIN for output */
...
@@ -142,7 +142,7 @@ static struct hda_verb cmi9880_ch8_init[] = {
...
@@ -142,7 +142,7 @@ static struct hda_verb cmi9880_ch8_init[] = {
{}
{}
};
};
static
struct
hda_channel_mode
cmi9880_channel_modes
[
3
]
=
{
static
const
struct
hda_channel_mode
cmi9880_channel_modes
[
3
]
=
{
{
2
,
cmi9880_ch2_init
},
{
2
,
cmi9880_ch2_init
},
{
6
,
cmi9880_ch6_init
},
{
6
,
cmi9880_ch6_init
},
{
8
,
cmi9880_ch8_init
},
{
8
,
cmi9880_ch8_init
},
...
@@ -174,7 +174,7 @@ static int cmi_ch_mode_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_va
...
@@ -174,7 +174,7 @@ static int cmi_ch_mode_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_va
/*
/*
*/
*/
static
struct
snd_kcontrol_new
cmi9880_basic_mixer
[]
=
{
static
const
struct
snd_kcontrol_new
cmi9880_basic_mixer
[]
=
{
/* CMI9880 has no playback volumes! */
/* CMI9880 has no playback volumes! */
HDA_CODEC_MUTE
(
"PCM Playback Switch"
,
0x03
,
0x0
,
HDA_OUTPUT
),
/* front */
HDA_CODEC_MUTE
(
"PCM Playback Switch"
,
0x03
,
0x0
,
HDA_OUTPUT
),
/* front */
HDA_CODEC_MUTE
(
"Surround Playback Switch"
,
0x04
,
0x0
,
HDA_OUTPUT
),
HDA_CODEC_MUTE
(
"Surround Playback Switch"
,
0x04
,
0x0
,
HDA_OUTPUT
),
...
@@ -205,7 +205,7 @@ static struct snd_kcontrol_new cmi9880_basic_mixer[] = {
...
@@ -205,7 +205,7 @@ static struct snd_kcontrol_new cmi9880_basic_mixer[] = {
/*
/*
* shared I/O pins
* shared I/O pins
*/
*/
static
struct
snd_kcontrol_new
cmi9880_ch_mode_mixer
[]
=
{
static
const
struct
snd_kcontrol_new
cmi9880_ch_mode_mixer
[]
=
{
{
{
.
iface
=
SNDRV_CTL_ELEM_IFACE_MIXER
,
.
iface
=
SNDRV_CTL_ELEM_IFACE_MIXER
,
.
name
=
"Channel Mode"
,
.
name
=
"Channel Mode"
,
...
@@ -219,7 +219,7 @@ static struct snd_kcontrol_new cmi9880_ch_mode_mixer[] = {
...
@@ -219,7 +219,7 @@ static struct snd_kcontrol_new cmi9880_ch_mode_mixer[] = {
/* AUD-in selections:
/* AUD-in selections:
* 0x0b 0x0c 0x0d 0x0e 0x0f 0x10 0x11 0x1f 0x20
* 0x0b 0x0c 0x0d 0x0e 0x0f 0x10 0x11 0x1f 0x20
*/
*/
static
struct
hda_input_mux
cmi9880_basic_mux
=
{
static
const
struct
hda_input_mux
cmi9880_basic_mux
=
{
.
num_items
=
4
,
.
num_items
=
4
,
.
items
=
{
.
items
=
{
{
"Front Mic"
,
0x5
},
{
"Front Mic"
,
0x5
},
...
@@ -229,7 +229,7 @@ static struct hda_input_mux cmi9880_basic_mux = {
...
@@ -229,7 +229,7 @@ static struct hda_input_mux cmi9880_basic_mux = {
}
}
};
};
static
struct
hda_input_mux
cmi9880_no_line_mux
=
{
static
const
struct
hda_input_mux
cmi9880_no_line_mux
=
{
.
num_items
=
3
,
.
num_items
=
3
,
.
items
=
{
.
items
=
{
{
"Front Mic"
,
0x5
},
{
"Front Mic"
,
0x5
},
...
@@ -239,11 +239,11 @@ static struct hda_input_mux cmi9880_no_line_mux = {
...
@@ -239,11 +239,11 @@ static struct hda_input_mux cmi9880_no_line_mux = {
};
};
/* front, rear, clfe, rear_surr */
/* front, rear, clfe, rear_surr */
static
hda_nid_t
cmi9880_dac_nids
[
4
]
=
{
static
const
hda_nid_t
cmi9880_dac_nids
[
4
]
=
{
0x03
,
0x04
,
0x05
,
0x06
0x03
,
0x04
,
0x05
,
0x06
};
};
/* ADC0, ADC1 */
/* ADC0, ADC1 */
static
hda_nid_t
cmi9880_adc_nids
[
2
]
=
{
static
const
hda_nid_t
cmi9880_adc_nids
[
2
]
=
{
0x08
,
0x09
0x08
,
0x09
};
};
...
@@ -252,7 +252,7 @@ static hda_nid_t cmi9880_adc_nids[2] = {
...
@@ -252,7 +252,7 @@ static hda_nid_t cmi9880_adc_nids[2] = {
/*
/*
*/
*/
static
struct
hda_verb
cmi9880_basic_init
[]
=
{
static
const
struct
hda_verb
cmi9880_basic_init
[]
=
{
/* port-D for line out (rear panel) */
/* port-D for line out (rear panel) */
{
0x0b
,
AC_VERB_SET_PIN_WIDGET_CONTROL
,
PIN_HP
},
{
0x0b
,
AC_VERB_SET_PIN_WIDGET_CONTROL
,
PIN_HP
},
/* port-E for HP out (front panel) */
/* port-E for HP out (front panel) */
...
@@ -281,7 +281,7 @@ static struct hda_verb cmi9880_basic_init[] = {
...
@@ -281,7 +281,7 @@ static struct hda_verb cmi9880_basic_init[] = {
{}
/* terminator */
{}
/* terminator */
};
};
static
struct
hda_verb
cmi9880_allout_init
[]
=
{
static
const
struct
hda_verb
cmi9880_allout_init
[]
=
{
/* port-D for line out (rear panel) */
/* port-D for line out (rear panel) */
{
0x0b
,
AC_VERB_SET_PIN_WIDGET_CONTROL
,
PIN_HP
},
{
0x0b
,
AC_VERB_SET_PIN_WIDGET_CONTROL
,
PIN_HP
},
/* port-E for HP out (front panel) */
/* port-E for HP out (front panel) */
...
@@ -528,7 +528,7 @@ static int cmi9880_capture_pcm_cleanup(struct hda_pcm_stream *hinfo,
...
@@ -528,7 +528,7 @@ static int cmi9880_capture_pcm_cleanup(struct hda_pcm_stream *hinfo,
/*
/*
*/
*/
static
struct
hda_pcm_stream
cmi9880_pcm_analog_playback
=
{
static
const
struct
hda_pcm_stream
cmi9880_pcm_analog_playback
=
{
.
substreams
=
1
,
.
substreams
=
1
,
.
channels_min
=
2
,
.
channels_min
=
2
,
.
channels_max
=
8
,
.
channels_max
=
8
,
...
@@ -540,7 +540,7 @@ static struct hda_pcm_stream cmi9880_pcm_analog_playback = {
...
@@ -540,7 +540,7 @@ static struct hda_pcm_stream cmi9880_pcm_analog_playback = {
},
},
};
};
static
struct
hda_pcm_stream
cmi9880_pcm_analog_capture
=
{
static
const
struct
hda_pcm_stream
cmi9880_pcm_analog_capture
=
{
.
substreams
=
2
,
.
substreams
=
2
,
.
channels_min
=
2
,
.
channels_min
=
2
,
.
channels_max
=
2
,
.
channels_max
=
2
,
...
@@ -551,7 +551,7 @@ static struct hda_pcm_stream cmi9880_pcm_analog_capture = {
...
@@ -551,7 +551,7 @@ static struct hda_pcm_stream cmi9880_pcm_analog_capture = {
},
},
};
};
static
struct
hda_pcm_stream
cmi9880_pcm_digital_playback
=
{
static
const
struct
hda_pcm_stream
cmi9880_pcm_digital_playback
=
{
.
substreams
=
1
,
.
substreams
=
1
,
.
channels_min
=
2
,
.
channels_min
=
2
,
.
channels_max
=
2
,
.
channels_max
=
2
,
...
@@ -563,7 +563,7 @@ static struct hda_pcm_stream cmi9880_pcm_digital_playback = {
...
@@ -563,7 +563,7 @@ static struct hda_pcm_stream cmi9880_pcm_digital_playback = {
},
},
};
};
static
struct
hda_pcm_stream
cmi9880_pcm_digital_capture
=
{
static
const
struct
hda_pcm_stream
cmi9880_pcm_digital_capture
=
{
.
substreams
=
1
,
.
substreams
=
1
,
.
channels_min
=
2
,
.
channels_min
=
2
,
.
channels_max
=
2
,
.
channels_max
=
2
,
...
@@ -617,14 +617,14 @@ static const char * const cmi9880_models[CMI_MODELS] = {
...
@@ -617,14 +617,14 @@ static const char * const cmi9880_models[CMI_MODELS] = {
[
CMI_AUTO
]
=
"auto"
,
[
CMI_AUTO
]
=
"auto"
,
};
};
static
struct
snd_pci_quirk
cmi9880_cfg_tbl
[]
=
{
static
const
struct
snd_pci_quirk
cmi9880_cfg_tbl
[]
=
{
SND_PCI_QUIRK
(
0x1043
,
0x813d
,
"ASUS P5AD2"
,
CMI_FULL_DIG
),
SND_PCI_QUIRK
(
0x1043
,
0x813d
,
"ASUS P5AD2"
,
CMI_FULL_DIG
),
SND_PCI_QUIRK
(
0x1854
,
0x002b
,
"LG LS75"
,
CMI_MINIMAL
),
SND_PCI_QUIRK
(
0x1854
,
0x002b
,
"LG LS75"
,
CMI_MINIMAL
),
SND_PCI_QUIRK
(
0x1854
,
0x0032
,
"LG"
,
CMI_FULL_DIG
),
SND_PCI_QUIRK
(
0x1854
,
0x0032
,
"LG"
,
CMI_FULL_DIG
),
{}
/* terminator */
{}
/* terminator */
};
};
static
struct
hda_codec_ops
cmi9880_patch_ops
=
{
static
const
struct
hda_codec_ops
cmi9880_patch_ops
=
{
.
build_controls
=
cmi9880_build_controls
,
.
build_controls
=
cmi9880_build_controls
,
.
build_pcms
=
cmi9880_build_pcms
,
.
build_pcms
=
cmi9880_build_pcms
,
.
init
=
cmi9880_init
,
.
init
=
cmi9880_init
,
...
@@ -745,7 +745,7 @@ static int patch_cmi9880(struct hda_codec *codec)
...
@@ -745,7 +745,7 @@ static int patch_cmi9880(struct hda_codec *codec)
/*
/*
* patch entries
* patch entries
*/
*/
static
struct
hda_codec_preset
snd_hda_preset_cmedia
[]
=
{
static
const
struct
hda_codec_preset
snd_hda_preset_cmedia
[]
=
{
{
.
id
=
0x13f69880
,
.
name
=
"CMI9880"
,
.
patch
=
patch_cmi9880
},
{
.
id
=
0x13f69880
,
.
name
=
"CMI9880"
,
.
patch
=
patch_cmi9880
},
{
.
id
=
0x434d4980
,
.
name
=
"CMI9880"
,
.
patch
=
patch_cmi9880
},
{
.
id
=
0x434d4980
,
.
name
=
"CMI9880"
,
.
patch
=
patch_cmi9880
},
{}
/* terminator */
{}
/* terminator */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment