mirror of
https://github.com/torvalds/linux.git
synced 2024-11-26 22:21:42 +00:00
[ALSA] Add 'const' to files in pci/ice1712/
Mark a lot of data as 'const' Signed-of-by: Philipp Matthias Hahn <pmhahn@pmhahn.de> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
This commit is contained in:
Takashi Iwai
Jaroslav Kysela
parent
189bc17143
commit
32b47da035
@ -42,7 +42,7 @@ static void wm_put(struct snd_ice1712 *ice, int reg, unsigned short val)
|
||||
|
||||
static int __devinit snd_vt1724_amp_init(struct snd_ice1712 *ice)
|
||||
{
|
||||
static unsigned short wm_inits[] = {
|
||||
static const unsigned short wm_inits[] = {
|
||||
WM_ATTEN_L, 0x0000, /* 0 db */
|
||||
WM_ATTEN_R, 0x0000, /* 0 db */
|
||||
WM_DAC_CTRL, 0x0008, /* 24bit I2S */
|
||||
@ -75,7 +75,7 @@ static int __devinit snd_vt1724_amp_add_controls(struct snd_ice1712 *ice)
|
||||
|
||||
|
||||
/* entry point */
|
||||
struct snd_ice1712_card_info snd_vt1724_amp_cards[] __devinitdata = {
|
||||
const struct snd_ice1712_card_info snd_vt1724_amp_cards[] __devinitdata = {
|
||||
{
|
||||
.subvendor = VT1724_SUBDEVICE_AV710,
|
||||
.name = "Chaintech AV-710",
|
||||
|
||||
@ -42,7 +42,7 @@
|
||||
#define WM_DAC_CTRL 0x02
|
||||
#define WM_INT_CTRL 0x03
|
||||
|
||||
extern struct snd_ice1712_card_info snd_vt1724_amp_cards[];
|
||||
extern const struct snd_ice1712_card_info snd_vt1724_amp_cards[];
|
||||
|
||||
|
||||
#endif /* __SOUND_AMP_H */
|
||||
|
||||
@ -294,7 +294,7 @@ static unsigned short aureon_ac97_read(struct snd_ice1712 *ice, unsigned short r
|
||||
static int aureon_ac97_init (struct snd_ice1712 *ice)
|
||||
{
|
||||
int i;
|
||||
static unsigned short ac97_defaults[] = {
|
||||
static const unsigned short ac97_defaults[] = {
|
||||
0x00, 0x9640,
|
||||
0x02, 0x8000,
|
||||
0x04, 0x8000,
|
||||
@ -674,7 +674,7 @@ static DECLARE_TLV_DB_SCALE(db_scale_ac97_gain, -3450, 150, 0);
|
||||
* Logarithmic volume values for WM8770
|
||||
* Computed as 20 * Log10(255 / x)
|
||||
*/
|
||||
static unsigned char wm_vol[256] = {
|
||||
static const unsigned char wm_vol[256] = {
|
||||
127, 48, 42, 39, 36, 34, 33, 31, 30, 29, 28, 27, 27, 26, 25, 25, 24, 24, 23,
|
||||
23, 22, 22, 21, 21, 21, 20, 20, 20, 19, 19, 19, 18, 18, 18, 18, 17, 17, 17,
|
||||
17, 16, 16, 16, 16, 15, 15, 15, 15, 15, 15, 14, 14, 14, 14, 14, 13, 13, 13,
|
||||
@ -1067,14 +1067,14 @@ static int wm_adc_vol_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_val
|
||||
*/
|
||||
static int wm_adc_mux_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
|
||||
{
|
||||
static char *texts[] = {
|
||||
static const char * const texts[] = {
|
||||
"CD", //AIN1
|
||||
"Aux", //AIN2
|
||||
"Line", //AIN3
|
||||
"Mic", //AIN4
|
||||
"AC97" //AIN5
|
||||
};
|
||||
static char *universe_texts[] = {
|
||||
static const char * const universe_texts[] = {
|
||||
"Aux1", //AIN1
|
||||
"CD", //AIN2
|
||||
"Phono", //AIN3
|
||||
@ -1140,11 +1140,11 @@ static int wm_adc_mux_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_val
|
||||
static int aureon_cs8415_mux_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
|
||||
{
|
||||
struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);
|
||||
static char *aureon_texts[] = {
|
||||
static const char * const aureon_texts[] = {
|
||||
"CD", //RXP0
|
||||
"Optical" //RXP1
|
||||
};
|
||||
static char *prodigy_texts[] = {
|
||||
static const char * const prodigy_texts[] = {
|
||||
"CD",
|
||||
"Coax"
|
||||
};
|
||||
@ -1368,7 +1368,7 @@ static int aureon_deemp_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_v
|
||||
*/
|
||||
static int aureon_oversampling_info(struct snd_kcontrol *k, struct snd_ctl_elem_info *uinfo)
|
||||
{
|
||||
static char *texts[2] = { "128x", "64x" };
|
||||
static const char * const texts[2] = { "128x", "64x" };
|
||||
|
||||
uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
|
||||
uinfo->count = 1;
|
||||
@ -1411,7 +1411,7 @@ static int aureon_oversampling_put(struct snd_kcontrol *kcontrol, struct snd_ctl
|
||||
* mixers
|
||||
*/
|
||||
|
||||
static struct snd_kcontrol_new aureon_dac_controls[] __devinitdata = {
|
||||
static const struct snd_kcontrol_new aureon_dac_controls[] __devinitdata = {
|
||||
{
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "Master Playback Switch",
|
||||
@ -1526,7 +1526,7 @@ static struct snd_kcontrol_new aureon_dac_controls[] __devinitdata = {
|
||||
}
|
||||
};
|
||||
|
||||
static struct snd_kcontrol_new wm_controls[] __devinitdata = {
|
||||
static const struct snd_kcontrol_new wm_controls[] __devinitdata = {
|
||||
{
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "PCM Playback Switch",
|
||||
@ -1592,7 +1592,7 @@ static struct snd_kcontrol_new wm_controls[] __devinitdata = {
|
||||
}
|
||||
};
|
||||
|
||||
static struct snd_kcontrol_new ac97_controls[] __devinitdata = {
|
||||
static const struct snd_kcontrol_new ac97_controls[] __devinitdata = {
|
||||
{
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "AC97 Playback Switch",
|
||||
@ -1697,7 +1697,7 @@ static struct snd_kcontrol_new ac97_controls[] __devinitdata = {
|
||||
}
|
||||
};
|
||||
|
||||
static struct snd_kcontrol_new universe_ac97_controls[] __devinitdata = {
|
||||
static const struct snd_kcontrol_new universe_ac97_controls[] __devinitdata = {
|
||||
{
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "AC97 Playback Switch",
|
||||
@ -1829,8 +1829,7 @@ static struct snd_kcontrol_new universe_ac97_controls[] __devinitdata = {
|
||||
|
||||
};
|
||||
|
||||
|
||||
static struct snd_kcontrol_new cs8415_controls[] __devinitdata = {
|
||||
static const struct snd_kcontrol_new cs8415_controls[] __devinitdata = {
|
||||
{
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = SNDRV_CTL_NAME_IEC958("",CAPTURE,SWITCH),
|
||||
@ -1875,7 +1874,6 @@ static struct snd_kcontrol_new cs8415_controls[] __devinitdata = {
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
static int __devinit aureon_add_controls(struct snd_ice1712 *ice)
|
||||
{
|
||||
unsigned int i, counts;
|
||||
@ -1943,7 +1941,7 @@ static int __devinit aureon_add_controls(struct snd_ice1712 *ice)
|
||||
*/
|
||||
static int __devinit aureon_init(struct snd_ice1712 *ice)
|
||||
{
|
||||
static unsigned short wm_inits_aureon[] = {
|
||||
static const unsigned short wm_inits_aureon[] = {
|
||||
/* These come first to reduce init pop noise */
|
||||
0x1b, 0x044, /* ADC Mux (AC'97 source) */
|
||||
0x1c, 0x00B, /* Out Mux1 (VOUT1 = DAC+AUX, VOUT2 = DAC) */
|
||||
@ -1979,7 +1977,7 @@ static int __devinit aureon_init(struct snd_ice1712 *ice)
|
||||
0x1a, 0x000, /* -12dB ADC/R */
|
||||
(unsigned short)-1
|
||||
};
|
||||
static unsigned short wm_inits_prodigy[] = {
|
||||
static const unsigned short wm_inits_prodigy[] = {
|
||||
|
||||
/* These come first to reduce init pop noise */
|
||||
0x1b, 0x000, /* ADC Mux */
|
||||
@ -2021,7 +2019,7 @@ static int __devinit aureon_init(struct snd_ice1712 *ice)
|
||||
(unsigned short)-1
|
||||
|
||||
};
|
||||
static unsigned short cs_inits[] = {
|
||||
static const unsigned short cs_inits[] = {
|
||||
0x0441, /* RUN */
|
||||
0x0180, /* no mute, OMCK output on RMCK pin */
|
||||
0x0201, /* S/PDIF source on RXP1 */
|
||||
@ -2029,7 +2027,7 @@ static int __devinit aureon_init(struct snd_ice1712 *ice)
|
||||
(unsigned short)-1
|
||||
};
|
||||
unsigned int tmp;
|
||||
unsigned short *p;
|
||||
const unsigned short *p;
|
||||
int err, i;
|
||||
|
||||
if (ice->eeprom.subvendor == VT1724_SUBDEVICE_AUREON51_SKY) {
|
||||
@ -2109,7 +2107,7 @@ static int __devinit aureon_init(struct snd_ice1712 *ice)
|
||||
* hence the driver needs to sets up it properly.
|
||||
*/
|
||||
|
||||
static unsigned char aureon51_eeprom[] __devinitdata = {
|
||||
static const unsigned char aureon51_eeprom[] __devinitdata = {
|
||||
[ICE_EEP2_SYSCONF] = 0x0a, /* clock 512, spdif-in/ADC, 3DACs */
|
||||
[ICE_EEP2_ACLINK] = 0x80, /* I2S */
|
||||
[ICE_EEP2_I2S] = 0xfc, /* vol, 96k, 24bit, 192k */
|
||||
@ -2125,7 +2123,7 @@ static unsigned char aureon51_eeprom[] __devinitdata = {
|
||||
[ICE_EEP2_GPIO_STATE2] = 0x00,
|
||||
};
|
||||
|
||||
static unsigned char aureon71_eeprom[] __devinitdata = {
|
||||
static const unsigned char aureon71_eeprom[] __devinitdata = {
|
||||
[ICE_EEP2_SYSCONF] = 0x0b, /* clock 512, spdif-in/ADC, 4DACs */
|
||||
[ICE_EEP2_ACLINK] = 0x80, /* I2S */
|
||||
[ICE_EEP2_I2S] = 0xfc, /* vol, 96k, 24bit, 192k */
|
||||
@ -2142,7 +2140,7 @@ static unsigned char aureon71_eeprom[] __devinitdata = {
|
||||
};
|
||||
#define prodigy71_eeprom aureon71_eeprom
|
||||
|
||||
static unsigned char prodigy71lt_eeprom[] __devinitdata = {
|
||||
static const unsigned char prodigy71lt_eeprom[] __devinitdata = {
|
||||
[ICE_EEP2_SYSCONF] = 0x4b, /* clock 384, spdif-in/ADC, 4DACs */
|
||||
[ICE_EEP2_ACLINK] = 0x80, /* I2S */
|
||||
[ICE_EEP2_I2S] = 0xfc, /* vol, 96k, 24bit, 192k */
|
||||
@ -2160,7 +2158,7 @@ static unsigned char prodigy71lt_eeprom[] __devinitdata = {
|
||||
#define prodigy71xt_eeprom prodigy71lt_eeprom
|
||||
|
||||
/* entry point */
|
||||
struct snd_ice1712_card_info snd_vt1724_aureon_cards[] __devinitdata = {
|
||||
const struct snd_ice1712_card_info snd_vt1724_aureon_cards[] __devinitdata = {
|
||||
{
|
||||
.subvendor = VT1724_SUBDEVICE_AUREON51_SKY,
|
||||
.name = "Terratec Aureon 5.1-Sky",
|
||||
|
||||
@ -38,7 +38,7 @@
|
||||
#define VT1724_SUBDEVICE_PRODIGY71LT 0x32315441 /* PRODIGY 7.1 LT */
|
||||
#define VT1724_SUBDEVICE_PRODIGY71XT 0x36315441 /* PRODIGY 7.1 XT*/
|
||||
|
||||
extern struct snd_ice1712_card_info snd_vt1724_aureon_cards[];
|
||||
extern const struct snd_ice1712_card_info snd_vt1724_aureon_cards[];
|
||||
|
||||
/* GPIO bits */
|
||||
#define AUREON_CS8415_CS (1 << 22)
|
||||
|
||||
@ -416,7 +416,7 @@ static int snd_ice1712_delta1010lt_wordclock_status_get(struct snd_kcontrol *kco
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_ice1712_delta1010lt_wordclock_status __devinitdata =
|
||||
static const struct snd_kcontrol_new snd_ice1712_delta1010lt_wordclock_status __devinitdata =
|
||||
{
|
||||
.access = (SNDRV_CTL_ELEM_ACCESS_READ),
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
@ -429,7 +429,7 @@ static struct snd_kcontrol_new snd_ice1712_delta1010lt_wordclock_status __devini
|
||||
* initialize the chips on M-Audio cards
|
||||
*/
|
||||
|
||||
static struct snd_akm4xxx akm_audiophile __devinitdata = {
|
||||
static const struct snd_akm4xxx akm_audiophile __devinitdata = {
|
||||
.type = SND_AK4528,
|
||||
.num_adcs = 2,
|
||||
.num_dacs = 2,
|
||||
@ -438,7 +438,7 @@ static struct snd_akm4xxx akm_audiophile __devinitdata = {
|
||||
}
|
||||
};
|
||||
|
||||
static struct snd_ak4xxx_private akm_audiophile_priv __devinitdata = {
|
||||
static const struct snd_ak4xxx_private akm_audiophile_priv __devinitdata = {
|
||||
.caddr = 2,
|
||||
.cif = 0,
|
||||
.data_mask = ICE1712_DELTA_AP_DOUT,
|
||||
@ -450,7 +450,7 @@ static struct snd_ak4xxx_private akm_audiophile_priv __devinitdata = {
|
||||
.mask_flags = 0,
|
||||
};
|
||||
|
||||
static struct snd_akm4xxx akm_delta410 __devinitdata = {
|
||||
static const struct snd_akm4xxx akm_delta410 __devinitdata = {
|
||||
.type = SND_AK4529,
|
||||
.num_adcs = 2,
|
||||
.num_dacs = 8,
|
||||
@ -459,7 +459,7 @@ static struct snd_akm4xxx akm_delta410 __devinitdata = {
|
||||
}
|
||||
};
|
||||
|
||||
static struct snd_ak4xxx_private akm_delta410_priv __devinitdata = {
|
||||
static const struct snd_ak4xxx_private akm_delta410_priv __devinitdata = {
|
||||
.caddr = 0,
|
||||
.cif = 0,
|
||||
.data_mask = ICE1712_DELTA_AP_DOUT,
|
||||
@ -471,7 +471,7 @@ static struct snd_ak4xxx_private akm_delta410_priv __devinitdata = {
|
||||
.mask_flags = 0,
|
||||
};
|
||||
|
||||
static struct snd_akm4xxx akm_delta1010lt __devinitdata = {
|
||||
static const struct snd_akm4xxx akm_delta1010lt __devinitdata = {
|
||||
.type = SND_AK4524,
|
||||
.num_adcs = 8,
|
||||
.num_dacs = 8,
|
||||
@ -481,7 +481,7 @@ static struct snd_akm4xxx akm_delta1010lt __devinitdata = {
|
||||
}
|
||||
};
|
||||
|
||||
static struct snd_ak4xxx_private akm_delta1010lt_priv __devinitdata = {
|
||||
static const struct snd_ak4xxx_private akm_delta1010lt_priv __devinitdata = {
|
||||
.caddr = 2,
|
||||
.cif = 0, /* the default level of the CIF pin from AK4524 */
|
||||
.data_mask = ICE1712_DELTA_1010LT_DOUT,
|
||||
@ -493,7 +493,7 @@ static struct snd_ak4xxx_private akm_delta1010lt_priv __devinitdata = {
|
||||
.mask_flags = 0,
|
||||
};
|
||||
|
||||
static struct snd_akm4xxx akm_delta44 __devinitdata = {
|
||||
static const struct snd_akm4xxx akm_delta44 __devinitdata = {
|
||||
.type = SND_AK4524,
|
||||
.num_adcs = 4,
|
||||
.num_dacs = 4,
|
||||
@ -503,7 +503,7 @@ static struct snd_akm4xxx akm_delta44 __devinitdata = {
|
||||
}
|
||||
};
|
||||
|
||||
static struct snd_ak4xxx_private akm_delta44_priv __devinitdata = {
|
||||
static const struct snd_ak4xxx_private akm_delta44_priv __devinitdata = {
|
||||
.caddr = 2,
|
||||
.cif = 0, /* the default level of the CIF pin from AK4524 */
|
||||
.data_mask = ICE1712_DELTA_CODEC_SERIAL_DATA,
|
||||
@ -515,7 +515,7 @@ static struct snd_ak4xxx_private akm_delta44_priv __devinitdata = {
|
||||
.mask_flags = 0,
|
||||
};
|
||||
|
||||
static struct snd_akm4xxx akm_vx442 __devinitdata = {
|
||||
static const struct snd_akm4xxx akm_vx442 __devinitdata = {
|
||||
.type = SND_AK4524,
|
||||
.num_adcs = 4,
|
||||
.num_dacs = 4,
|
||||
@ -525,7 +525,7 @@ static struct snd_akm4xxx akm_vx442 __devinitdata = {
|
||||
}
|
||||
};
|
||||
|
||||
static struct snd_ak4xxx_private akm_vx442_priv __devinitdata = {
|
||||
static const struct snd_ak4xxx_private akm_vx442_priv __devinitdata = {
|
||||
.caddr = 2,
|
||||
.cif = 0,
|
||||
.data_mask = ICE1712_VX442_DOUT,
|
||||
@ -650,15 +650,15 @@ static int __devinit snd_ice1712_delta_init(struct snd_ice1712 *ice)
|
||||
* additional controls for M-Audio cards
|
||||
*/
|
||||
|
||||
static struct snd_kcontrol_new snd_ice1712_delta1010_wordclock_select __devinitdata =
|
||||
static const struct snd_kcontrol_new snd_ice1712_delta1010_wordclock_select __devinitdata =
|
||||
ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_MIXER, "Word Clock Sync", 0, ICE1712_DELTA_WORD_CLOCK_SELECT, 1, 0);
|
||||
static struct snd_kcontrol_new snd_ice1712_delta1010lt_wordclock_select __devinitdata =
|
||||
static const struct snd_kcontrol_new snd_ice1712_delta1010lt_wordclock_select __devinitdata =
|
||||
ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_MIXER, "Word Clock Sync", 0, ICE1712_DELTA_1010LT_WORDCLOCK, 0, 0);
|
||||
static struct snd_kcontrol_new snd_ice1712_delta1010_wordclock_status __devinitdata =
|
||||
static const struct snd_kcontrol_new snd_ice1712_delta1010_wordclock_status __devinitdata =
|
||||
ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_MIXER, "Word Clock Status", 0, ICE1712_DELTA_WORD_CLOCK_STATUS, 1, SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE);
|
||||
static struct snd_kcontrol_new snd_ice1712_deltadio2496_spdif_in_select __devinitdata =
|
||||
static const struct snd_kcontrol_new snd_ice1712_deltadio2496_spdif_in_select __devinitdata =
|
||||
ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_MIXER, "IEC958 Input Optical", 0, ICE1712_DELTA_SPDIF_INPUT_SELECT, 0, 0);
|
||||
static struct snd_kcontrol_new snd_ice1712_delta_spdif_in_status __devinitdata =
|
||||
static const struct snd_kcontrol_new snd_ice1712_delta_spdif_in_status __devinitdata =
|
||||
ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_MIXER, "Delta IEC958 Input Status", 0, ICE1712_DELTA_SPDIF_IN_STAT, 1, SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE);
|
||||
|
||||
|
||||
@ -735,7 +735,7 @@ static int __devinit snd_ice1712_delta_add_controls(struct snd_ice1712 *ice)
|
||||
|
||||
|
||||
/* entry point */
|
||||
struct snd_ice1712_card_info snd_ice1712_delta_cards[] __devinitdata = {
|
||||
const struct snd_ice1712_card_info snd_ice1712_delta_cards[] __devinitdata = {
|
||||
{
|
||||
.subvendor = ICE1712_SUBDEVICE_DELTA1010,
|
||||
.name = "M Audio Delta 1010",
|
||||
|
||||
@ -46,7 +46,7 @@
|
||||
#define ICE1712_SUBDEVICE_MEDIASTATION 0x694c0100
|
||||
|
||||
/* entry point */
|
||||
extern struct snd_ice1712_card_info snd_ice1712_delta_cards[];
|
||||
extern const struct snd_ice1712_card_info snd_ice1712_delta_cards[];
|
||||
|
||||
|
||||
/*
|
||||
|
||||
@ -332,7 +332,7 @@ static void ews88_setup_spdif(struct snd_ice1712 *ice, int rate)
|
||||
|
||||
/*
|
||||
*/
|
||||
static struct snd_akm4xxx akm_ews88mt __devinitdata = {
|
||||
static const struct snd_akm4xxx akm_ews88mt __devinitdata = {
|
||||
.num_adcs = 8,
|
||||
.num_dacs = 8,
|
||||
.type = SND_AK4524,
|
||||
@ -342,7 +342,7 @@ static struct snd_akm4xxx akm_ews88mt __devinitdata = {
|
||||
}
|
||||
};
|
||||
|
||||
static struct snd_ak4xxx_private akm_ews88mt_priv __devinitdata = {
|
||||
static const struct snd_ak4xxx_private akm_ews88mt_priv __devinitdata = {
|
||||
.caddr = 2,
|
||||
.cif = 1, /* CIF high */
|
||||
.data_mask = ICE1712_EWS88_SERIAL_DATA,
|
||||
@ -354,7 +354,7 @@ static struct snd_ak4xxx_private akm_ews88mt_priv __devinitdata = {
|
||||
.mask_flags = 0,
|
||||
};
|
||||
|
||||
static struct snd_akm4xxx akm_ewx2496 __devinitdata = {
|
||||
static const struct snd_akm4xxx akm_ewx2496 __devinitdata = {
|
||||
.num_adcs = 2,
|
||||
.num_dacs = 2,
|
||||
.type = SND_AK4524,
|
||||
@ -363,7 +363,7 @@ static struct snd_akm4xxx akm_ewx2496 __devinitdata = {
|
||||
}
|
||||
};
|
||||
|
||||
static struct snd_ak4xxx_private akm_ewx2496_priv __devinitdata = {
|
||||
static const struct snd_ak4xxx_private akm_ewx2496_priv __devinitdata = {
|
||||
.caddr = 2,
|
||||
.cif = 1, /* CIF high */
|
||||
.data_mask = ICE1712_EWS88_SERIAL_DATA,
|
||||
@ -375,7 +375,7 @@ static struct snd_ak4xxx_private akm_ewx2496_priv __devinitdata = {
|
||||
.mask_flags = 0,
|
||||
};
|
||||
|
||||
static struct snd_akm4xxx akm_6fire __devinitdata = {
|
||||
static const struct snd_akm4xxx akm_6fire __devinitdata = {
|
||||
.num_adcs = 6,
|
||||
.num_dacs = 6,
|
||||
.type = SND_AK4524,
|
||||
@ -384,7 +384,7 @@ static struct snd_akm4xxx akm_6fire __devinitdata = {
|
||||
}
|
||||
};
|
||||
|
||||
static struct snd_ak4xxx_private akm_6fire_priv __devinitdata = {
|
||||
static const struct snd_ak4xxx_private akm_6fire_priv __devinitdata = {
|
||||
.caddr = 2,
|
||||
.cif = 1, /* CIF high */
|
||||
.data_mask = ICE1712_6FIRE_SERIAL_DATA,
|
||||
@ -578,7 +578,7 @@ static int snd_ice1712_ewx_io_sense_put(struct snd_kcontrol *kcontrol, struct sn
|
||||
return val != nval;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_ice1712_ewx2496_controls[] __devinitdata = {
|
||||
static const struct snd_kcontrol_new snd_ice1712_ewx2496_controls[] __devinitdata = {
|
||||
{
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "Input Sensitivity Switch",
|
||||
@ -678,7 +678,7 @@ static int snd_ice1712_ews88mt_input_sense_put(struct snd_kcontrol *kcontrol, st
|
||||
return ndata != data;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_ice1712_ews88mt_input_sense __devinitdata = {
|
||||
static const struct snd_kcontrol_new snd_ice1712_ews88mt_input_sense __devinitdata = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "Input Sensitivity Switch",
|
||||
.info = snd_ice1712_ewx_io_sense_info,
|
||||
@ -687,7 +687,7 @@ static struct snd_kcontrol_new snd_ice1712_ews88mt_input_sense __devinitdata = {
|
||||
.count = 8,
|
||||
};
|
||||
|
||||
static struct snd_kcontrol_new snd_ice1712_ews88mt_output_sense __devinitdata = {
|
||||
static const struct snd_kcontrol_new snd_ice1712_ews88mt_output_sense __devinitdata = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "Output Sensitivity Switch",
|
||||
.info = snd_ice1712_ewx_io_sense_info,
|
||||
@ -769,7 +769,7 @@ static int snd_ice1712_ews88d_control_put(struct snd_kcontrol *kcontrol, struct
|
||||
.private_value = xshift | (xinvert << 8),\
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_ice1712_ews88d_controls[] __devinitdata = {
|
||||
static const struct snd_kcontrol_new snd_ice1712_ews88d_controls[] __devinitdata = {
|
||||
EWS88D_CONTROL(SNDRV_CTL_ELEM_IFACE_MIXER, "IEC958 Input Optical", 0, 1, 0), /* inverted */
|
||||
EWS88D_CONTROL(SNDRV_CTL_ELEM_IFACE_MIXER, "ADAT Output Optical", 1, 0, 0),
|
||||
EWS88D_CONTROL(SNDRV_CTL_ELEM_IFACE_MIXER, "ADAT External Master Clock", 2, 0, 0),
|
||||
@ -909,7 +909,7 @@ static int snd_ice1712_6fire_select_input_put(struct snd_kcontrol *kcontrol, str
|
||||
.private_value = xshift | (xinvert << 8),\
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_ice1712_6fire_controls[] __devinitdata = {
|
||||
static const struct snd_kcontrol_new snd_ice1712_6fire_controls[] __devinitdata = {
|
||||
{
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "Analog Input Select",
|
||||
@ -989,7 +989,7 @@ static int __devinit snd_ice1712_ews_add_controls(struct snd_ice1712 *ice)
|
||||
|
||||
|
||||
/* entry point */
|
||||
struct snd_ice1712_card_info snd_ice1712_ews_cards[] __devinitdata = {
|
||||
const struct snd_ice1712_card_info snd_ice1712_ews_cards[] __devinitdata = {
|
||||
{
|
||||
.subvendor = ICE1712_SUBDEVICE_EWX2496,
|
||||
.name = "TerraTec EWX24/96",
|
||||
|
||||
@ -40,7 +40,7 @@
|
||||
#define ICE1712_SUBDEVICE_PHASE88 0x3b155111
|
||||
|
||||
/* entry point */
|
||||
extern struct snd_ice1712_card_info snd_ice1712_ews_cards[];
|
||||
extern const struct snd_ice1712_card_info snd_ice1712_ews_cards[];
|
||||
|
||||
|
||||
/* TerraTec EWX 24/96 configuration definitions */
|
||||
|
||||
@ -239,7 +239,7 @@ static void stdsp24_ak4524_lock(struct snd_akm4xxx *ak, int chip)
|
||||
static int __devinit snd_ice1712_value_init(struct snd_ice1712 *ice)
|
||||
{
|
||||
/* Hoontech STDSP24 with modified hardware */
|
||||
static struct snd_akm4xxx akm_stdsp24_mv __devinitdata = {
|
||||
static const struct snd_akm4xxx akm_stdsp24_mv __devinitdata = {
|
||||
.num_adcs = 2,
|
||||
.num_dacs = 2,
|
||||
.type = SND_AK4524,
|
||||
@ -248,7 +248,7 @@ static int __devinit snd_ice1712_value_init(struct snd_ice1712 *ice)
|
||||
}
|
||||
};
|
||||
|
||||
static struct snd_ak4xxx_private akm_stdsp24_mv_priv __devinitdata = {
|
||||
static const struct snd_ak4xxx_private akm_stdsp24_mv_priv __devinitdata = {
|
||||
.caddr = 2,
|
||||
.cif = 1, /* CIF high */
|
||||
.data_mask = ICE1712_STDSP24_SERIAL_DATA,
|
||||
@ -298,7 +298,7 @@ static int __devinit snd_ice1712_ez8_init(struct snd_ice1712 *ice)
|
||||
|
||||
|
||||
/* entry point */
|
||||
struct snd_ice1712_card_info snd_ice1712_hoontech_cards[] __devinitdata = {
|
||||
const struct snd_ice1712_card_info snd_ice1712_hoontech_cards[] __devinitdata = {
|
||||
{
|
||||
.subvendor = ICE1712_SUBDEVICE_STDSP24,
|
||||
.name = "Hoontech SoundTrack Audio DSP24",
|
||||
@ -325,4 +325,3 @@ struct snd_ice1712_card_info snd_ice1712_hoontech_cards[] __devinitdata = {
|
||||
},
|
||||
{ } /* terminator */
|
||||
};
|
||||
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
#define ICE1712_SUBDEVICE_STDSP24_MEDIA7_1 0x16141217 /* Hoontech ST Audio DSP24 Media 7.1 */
|
||||
#define ICE1712_SUBDEVICE_EVENT_EZ8 0x00010001 /* A dummy id for EZ8 */
|
||||
|
||||
extern struct snd_ice1712_card_info snd_ice1712_hoontech_cards[];
|
||||
extern const struct snd_ice1712_card_info snd_ice1712_hoontech_cards[];
|
||||
|
||||
|
||||
/* Hoontech SoundTrack Audio DSP 24 GPIO definitions */
|
||||
|
||||
@ -107,7 +107,7 @@ module_param_array(dxr_enable, int, NULL, 0444);
|
||||
MODULE_PARM_DESC(dxr_enable, "Enable DXR support for Terratec DMX6FIRE.");
|
||||
|
||||
|
||||
static struct pci_device_id snd_ice1712_ids[] = {
|
||||
static const struct pci_device_id snd_ice1712_ids[] = {
|
||||
{ PCI_VENDOR_ID_ICE, PCI_DEVICE_ID_ICE_1712, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* ICE1712 */
|
||||
{ 0, }
|
||||
};
|
||||
@ -287,7 +287,7 @@ static int snd_ice1712_digmix_route_ac97_put(struct snd_kcontrol *kcontrol, stru
|
||||
return val != nval;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_ice1712_mixer_digmix_route_ac97 __devinitdata = {
|
||||
static const struct snd_kcontrol_new snd_ice1712_mixer_digmix_route_ac97 __devinitdata = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "Digital Mixer To AC97",
|
||||
.info = snd_ice1712_digmix_route_ac97_info,
|
||||
@ -719,7 +719,7 @@ static snd_pcm_uframes_t snd_ice1712_capture_pointer(struct snd_pcm_substream *s
|
||||
return bytes_to_frames(substream->runtime, ptr);
|
||||
}
|
||||
|
||||
static struct snd_pcm_hardware snd_ice1712_playback =
|
||||
static const struct snd_pcm_hardware snd_ice1712_playback =
|
||||
{
|
||||
.info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
|
||||
SNDRV_PCM_INFO_BLOCK_TRANSFER |
|
||||
@ -739,7 +739,7 @@ static struct snd_pcm_hardware snd_ice1712_playback =
|
||||
.fifo_size = 0,
|
||||
};
|
||||
|
||||
static struct snd_pcm_hardware snd_ice1712_playback_ds =
|
||||
static const struct snd_pcm_hardware snd_ice1712_playback_ds =
|
||||
{
|
||||
.info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
|
||||
SNDRV_PCM_INFO_BLOCK_TRANSFER |
|
||||
@ -759,7 +759,7 @@ static struct snd_pcm_hardware snd_ice1712_playback_ds =
|
||||
.fifo_size = 0,
|
||||
};
|
||||
|
||||
static struct snd_pcm_hardware snd_ice1712_capture =
|
||||
static const struct snd_pcm_hardware snd_ice1712_capture =
|
||||
{
|
||||
.info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
|
||||
SNDRV_PCM_INFO_BLOCK_TRANSFER |
|
||||
@ -1133,7 +1133,7 @@ static snd_pcm_uframes_t snd_ice1712_capture_pro_pointer(struct snd_pcm_substrea
|
||||
return bytes_to_frames(substream->runtime, ptr);
|
||||
}
|
||||
|
||||
static struct snd_pcm_hardware snd_ice1712_playback_pro =
|
||||
static const struct snd_pcm_hardware snd_ice1712_playback_pro =
|
||||
{
|
||||
.info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
|
||||
SNDRV_PCM_INFO_BLOCK_TRANSFER |
|
||||
@ -1153,7 +1153,7 @@ static struct snd_pcm_hardware snd_ice1712_playback_pro =
|
||||
.fifo_size = 0,
|
||||
};
|
||||
|
||||
static struct snd_pcm_hardware snd_ice1712_capture_pro =
|
||||
static const struct snd_pcm_hardware snd_ice1712_capture_pro =
|
||||
{
|
||||
.info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
|
||||
SNDRV_PCM_INFO_BLOCK_TRANSFER |
|
||||
@ -1380,7 +1380,7 @@ static int snd_ice1712_pro_mixer_volume_put(struct snd_kcontrol *kcontrol, struc
|
||||
|
||||
static DECLARE_TLV_DB_SCALE(db_scale_playback, -14400, 150, 0);
|
||||
|
||||
static struct snd_kcontrol_new snd_ice1712_multi_playback_ctrls[] __devinitdata = {
|
||||
static const struct snd_kcontrol_new snd_ice1712_multi_playback_ctrls[] __devinitdata = {
|
||||
{
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "Multi Playback Switch",
|
||||
@ -1404,7 +1404,7 @@ static struct snd_kcontrol_new snd_ice1712_multi_playback_ctrls[] __devinitdata
|
||||
},
|
||||
};
|
||||
|
||||
static struct snd_kcontrol_new snd_ice1712_multi_capture_analog_switch __devinitdata = {
|
||||
static const struct snd_kcontrol_new snd_ice1712_multi_capture_analog_switch __devinitdata = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "H/W Multi Capture Switch",
|
||||
.info = snd_ice1712_pro_mixer_switch_info,
|
||||
@ -1413,7 +1413,7 @@ static struct snd_kcontrol_new snd_ice1712_multi_capture_analog_switch __devinit
|
||||
.private_value = 10,
|
||||
};
|
||||
|
||||
static struct snd_kcontrol_new snd_ice1712_multi_capture_spdif_switch __devinitdata = {
|
||||
static const struct snd_kcontrol_new snd_ice1712_multi_capture_spdif_switch __devinitdata = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = SNDRV_CTL_NAME_IEC958("Multi ",CAPTURE,SWITCH),
|
||||
.info = snd_ice1712_pro_mixer_switch_info,
|
||||
@ -1423,7 +1423,7 @@ static struct snd_kcontrol_new snd_ice1712_multi_capture_spdif_switch __devinitd
|
||||
.count = 2,
|
||||
};
|
||||
|
||||
static struct snd_kcontrol_new snd_ice1712_multi_capture_analog_volume __devinitdata = {
|
||||
static const struct snd_kcontrol_new snd_ice1712_multi_capture_analog_volume __devinitdata = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.access = (SNDRV_CTL_ELEM_ACCESS_READWRITE |
|
||||
SNDRV_CTL_ELEM_ACCESS_TLV_READ),
|
||||
@ -1435,7 +1435,7 @@ static struct snd_kcontrol_new snd_ice1712_multi_capture_analog_volume __devinit
|
||||
.tlv = { .p = db_scale_playback }
|
||||
};
|
||||
|
||||
static struct snd_kcontrol_new snd_ice1712_multi_capture_spdif_volume __devinitdata = {
|
||||
static const struct snd_kcontrol_new snd_ice1712_multi_capture_spdif_volume __devinitdata = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = SNDRV_CTL_NAME_IEC958("Multi ",CAPTURE,VOLUME),
|
||||
.info = snd_ice1712_pro_mixer_volume_info,
|
||||
@ -1627,7 +1627,7 @@ static int snd_ice1712_eeprom_get(struct snd_kcontrol *kcontrol,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_ice1712_eeprom __devinitdata = {
|
||||
static const struct snd_kcontrol_new snd_ice1712_eeprom __devinitdata = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_CARD,
|
||||
.name = "ICE1712 EEPROM",
|
||||
.access = SNDRV_CTL_ELEM_ACCESS_READ,
|
||||
@ -1663,7 +1663,7 @@ static int snd_ice1712_spdif_default_put(struct snd_kcontrol *kcontrol,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_ice1712_spdif_default __devinitdata =
|
||||
static const struct snd_kcontrol_new snd_ice1712_spdif_default __devinitdata =
|
||||
{
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_PCM,
|
||||
.name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),
|
||||
@ -1714,7 +1714,7 @@ static int snd_ice1712_spdif_maskp_get(struct snd_kcontrol *kcontrol,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_ice1712_spdif_maskc __devinitdata =
|
||||
static const struct snd_kcontrol_new snd_ice1712_spdif_maskc __devinitdata =
|
||||
{
|
||||
.access = SNDRV_CTL_ELEM_ACCESS_READ,
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_PCM,
|
||||
@ -1723,7 +1723,7 @@ static struct snd_kcontrol_new snd_ice1712_spdif_maskc __devinitdata =
|
||||
.get = snd_ice1712_spdif_maskc_get,
|
||||
};
|
||||
|
||||
static struct snd_kcontrol_new snd_ice1712_spdif_maskp __devinitdata =
|
||||
static const struct snd_kcontrol_new snd_ice1712_spdif_maskp __devinitdata =
|
||||
{
|
||||
.access = SNDRV_CTL_ELEM_ACCESS_READ,
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_PCM,
|
||||
@ -1750,7 +1750,7 @@ static int snd_ice1712_spdif_stream_put(struct snd_kcontrol *kcontrol,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_ice1712_spdif_stream __devinitdata =
|
||||
static const struct snd_kcontrol_new snd_ice1712_spdif_stream __devinitdata =
|
||||
{
|
||||
.access = (SNDRV_CTL_ELEM_ACCESS_READWRITE |
|
||||
SNDRV_CTL_ELEM_ACCESS_INACTIVE),
|
||||
@ -1811,7 +1811,7 @@ int snd_ice1712_gpio_put(struct snd_kcontrol *kcontrol,
|
||||
static int snd_ice1712_pro_internal_clock_info(struct snd_kcontrol *kcontrol,
|
||||
struct snd_ctl_elem_info *uinfo)
|
||||
{
|
||||
static char *texts[] = {
|
||||
static const char * const texts[] = {
|
||||
"8000", /* 0: 6 */
|
||||
"9600", /* 1: 3 */
|
||||
"11025", /* 2: 10 */
|
||||
@ -1840,7 +1840,7 @@ static int snd_ice1712_pro_internal_clock_get(struct snd_kcontrol *kcontrol,
|
||||
struct snd_ctl_elem_value *ucontrol)
|
||||
{
|
||||
struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);
|
||||
static unsigned char xlate[16] = {
|
||||
static const unsigned char xlate[16] = {
|
||||
9, 6, 3, 1, 7, 4, 0, 12, 8, 5, 2, 11, 255, 255, 255, 10
|
||||
};
|
||||
unsigned char val;
|
||||
@ -1864,7 +1864,7 @@ static int snd_ice1712_pro_internal_clock_put(struct snd_kcontrol *kcontrol,
|
||||
struct snd_ctl_elem_value *ucontrol)
|
||||
{
|
||||
struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);
|
||||
static unsigned int xrate[13] = {
|
||||
static const unsigned int xrate[13] = {
|
||||
8000, 9600, 11025, 12000, 16000, 22050, 24000,
|
||||
32000, 44100, 48000, 64000, 88200, 96000
|
||||
};
|
||||
@ -1891,7 +1891,7 @@ static int snd_ice1712_pro_internal_clock_put(struct snd_kcontrol *kcontrol,
|
||||
return change;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_ice1712_pro_internal_clock __devinitdata = {
|
||||
static const struct snd_kcontrol_new snd_ice1712_pro_internal_clock __devinitdata = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "Multi Track Internal Clock",
|
||||
.info = snd_ice1712_pro_internal_clock_info,
|
||||
@ -1902,7 +1902,7 @@ static struct snd_kcontrol_new snd_ice1712_pro_internal_clock __devinitdata = {
|
||||
static int snd_ice1712_pro_internal_clock_default_info(struct snd_kcontrol *kcontrol,
|
||||
struct snd_ctl_elem_info *uinfo)
|
||||
{
|
||||
static char *texts[] = {
|
||||
static const char * const texts[] = {
|
||||
"8000", /* 0: 6 */
|
||||
"9600", /* 1: 3 */
|
||||
"11025", /* 2: 10 */
|
||||
@ -1931,7 +1931,7 @@ static int snd_ice1712_pro_internal_clock_default_get(struct snd_kcontrol *kcont
|
||||
struct snd_ctl_elem_value *ucontrol)
|
||||
{
|
||||
int val;
|
||||
static unsigned int xrate[13] = {
|
||||
static const unsigned int xrate[13] = {
|
||||
8000, 9600, 11025, 12000, 16000, 22050, 24000,
|
||||
32000, 44100, 48000, 64000, 88200, 96000
|
||||
};
|
||||
@ -1948,7 +1948,7 @@ static int snd_ice1712_pro_internal_clock_default_get(struct snd_kcontrol *kcont
|
||||
static int snd_ice1712_pro_internal_clock_default_put(struct snd_kcontrol *kcontrol,
|
||||
struct snd_ctl_elem_value *ucontrol)
|
||||
{
|
||||
static unsigned int xrate[13] = {
|
||||
static const unsigned int xrate[13] = {
|
||||
8000, 9600, 11025, 12000, 16000, 22050, 24000,
|
||||
32000, 44100, 48000, 64000, 88200, 96000
|
||||
};
|
||||
@ -1962,7 +1962,7 @@ static int snd_ice1712_pro_internal_clock_default_put(struct snd_kcontrol *kcont
|
||||
return change;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_ice1712_pro_internal_clock_default __devinitdata = {
|
||||
static const struct snd_kcontrol_new snd_ice1712_pro_internal_clock_default __devinitdata = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "Multi Track Internal Clock Default",
|
||||
.info = snd_ice1712_pro_internal_clock_default_info,
|
||||
@ -2001,7 +2001,7 @@ static int snd_ice1712_pro_rate_locking_put(struct snd_kcontrol *kcontrol,
|
||||
return change;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_ice1712_pro_rate_locking __devinitdata = {
|
||||
static const struct snd_kcontrol_new snd_ice1712_pro_rate_locking __devinitdata = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "Multi Track Rate Locking",
|
||||
.info = snd_ice1712_pro_rate_locking_info,
|
||||
@ -2040,7 +2040,7 @@ static int snd_ice1712_pro_rate_reset_put(struct snd_kcontrol *kcontrol,
|
||||
return change;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_ice1712_pro_rate_reset __devinitdata = {
|
||||
static const struct snd_kcontrol_new snd_ice1712_pro_rate_reset __devinitdata = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "Multi Track Rate Reset",
|
||||
.info = snd_ice1712_pro_rate_reset_info,
|
||||
@ -2054,7 +2054,7 @@ static struct snd_kcontrol_new snd_ice1712_pro_rate_reset __devinitdata = {
|
||||
static int snd_ice1712_pro_route_info(struct snd_kcontrol *kcontrol,
|
||||
struct snd_ctl_elem_info *uinfo)
|
||||
{
|
||||
static char *texts[] = {
|
||||
static const char * const texts[] = {
|
||||
"PCM Out", /* 0 */
|
||||
"H/W In 0", "H/W In 1", "H/W In 2", "H/W In 3", /* 1-4 */
|
||||
"H/W In 4", "H/W In 5", "H/W In 6", "H/W In 7", /* 5-8 */
|
||||
@ -2207,7 +2207,7 @@ static int snd_ice1712_pro_route_spdif_put(struct snd_kcontrol *kcontrol,
|
||||
return change;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_ice1712_mixer_pro_analog_route __devinitdata = {
|
||||
static const struct snd_kcontrol_new snd_ice1712_mixer_pro_analog_route __devinitdata = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "H/W Playback Route",
|
||||
.info = snd_ice1712_pro_route_info,
|
||||
@ -2215,7 +2215,7 @@ static struct snd_kcontrol_new snd_ice1712_mixer_pro_analog_route __devinitdata
|
||||
.put = snd_ice1712_pro_route_analog_put,
|
||||
};
|
||||
|
||||
static struct snd_kcontrol_new snd_ice1712_mixer_pro_spdif_route __devinitdata = {
|
||||
static const struct snd_kcontrol_new snd_ice1712_mixer_pro_spdif_route __devinitdata = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Route",
|
||||
.info = snd_ice1712_pro_route_info,
|
||||
@ -2257,7 +2257,7 @@ static int snd_ice1712_pro_volume_rate_put(struct snd_kcontrol *kcontrol,
|
||||
return change;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_ice1712_mixer_pro_volume_rate __devinitdata = {
|
||||
static const struct snd_kcontrol_new snd_ice1712_mixer_pro_volume_rate __devinitdata = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "Multi Track Volume Rate",
|
||||
.info = snd_ice1712_pro_volume_rate_info,
|
||||
@ -2290,7 +2290,7 @@ static int snd_ice1712_pro_peak_get(struct snd_kcontrol *kcontrol,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_ice1712_mixer_pro_peak __devinitdata = {
|
||||
static const struct snd_kcontrol_new snd_ice1712_mixer_pro_peak __devinitdata = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "Multi Track Peak",
|
||||
.access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,
|
||||
@ -2305,7 +2305,7 @@ static struct snd_kcontrol_new snd_ice1712_mixer_pro_peak __devinitdata = {
|
||||
/*
|
||||
* list of available boards
|
||||
*/
|
||||
static struct snd_ice1712_card_info *card_tables[] __devinitdata = {
|
||||
static const struct snd_ice1712_card_info *card_tables[] __devinitdata = {
|
||||
snd_ice1712_hoontech_cards,
|
||||
snd_ice1712_delta_cards,
|
||||
snd_ice1712_ews_cards,
|
||||
@ -2329,7 +2329,7 @@ static int __devinit snd_ice1712_read_eeprom(struct snd_ice1712 *ice,
|
||||
{
|
||||
int dev = 0xa0; /* EEPROM device address */
|
||||
unsigned int i, size;
|
||||
struct snd_ice1712_card_info **tbl, *c;
|
||||
const struct snd_ice1712_card_info **tbl, *c;
|
||||
|
||||
if (! modelname || ! *modelname) {
|
||||
ice->eeprom.subvendor = 0;
|
||||
@ -2658,7 +2658,7 @@ static int __devinit snd_ice1712_create(struct snd_card *card,
|
||||
*
|
||||
*/
|
||||
|
||||
static struct snd_ice1712_card_info no_matched __devinitdata;
|
||||
static const struct snd_ice1712_card_info no_matched __devinitdata;
|
||||
|
||||
static int __devinit snd_ice1712_probe(struct pci_dev *pci,
|
||||
const struct pci_device_id *pci_id)
|
||||
@ -2667,7 +2667,7 @@ static int __devinit snd_ice1712_probe(struct pci_dev *pci,
|
||||
struct snd_card *card;
|
||||
struct snd_ice1712 *ice;
|
||||
int pcm_dev = 0, err;
|
||||
struct snd_ice1712_card_info **tbl, *c;
|
||||
const struct snd_ice1712_card_info **tbl, *c;
|
||||
|
||||
if (dev >= SNDRV_CARDS)
|
||||
return -ENODEV;
|
||||
|
||||
@ -514,8 +514,8 @@ struct snd_ice1712_card_info {
|
||||
unsigned int mpu401_2_info_flags;
|
||||
const char *mpu401_1_name;
|
||||
const char *mpu401_2_name;
|
||||
unsigned int eeprom_size;
|
||||
unsigned char *eeprom_data;
|
||||
const unsigned int eeprom_size;
|
||||
const unsigned char *eeprom_data;
|
||||
};
|
||||
|
||||
|
||||
|
||||
@ -87,7 +87,7 @@ MODULE_PARM_DESC(model, "Use the given board model.");
|
||||
|
||||
|
||||
/* Both VT1720 and VT1724 have the same PCI IDs */
|
||||
static struct pci_device_id snd_vt1724_ids[] = {
|
||||
static const struct pci_device_id snd_vt1724_ids[] = {
|
||||
{ PCI_VENDOR_ID_ICE, PCI_DEVICE_ID_VT1724, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
|
||||
{ 0, }
|
||||
};
|
||||
@ -342,7 +342,7 @@ static int snd_vt1724_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
|
||||
|
||||
what = 0;
|
||||
snd_pcm_group_for_each(pos, substream) {
|
||||
struct vt1724_pcm_reg *reg;
|
||||
const struct vt1724_pcm_reg *reg;
|
||||
s = snd_pcm_group_substream_entry(pos);
|
||||
reg = s->runtime->private_data;
|
||||
what |= reg->start;
|
||||
@ -606,7 +606,7 @@ static snd_pcm_uframes_t snd_vt1724_playback_pro_pointer(struct snd_pcm_substrea
|
||||
static int snd_vt1724_pcm_prepare(struct snd_pcm_substream *substream)
|
||||
{
|
||||
struct snd_ice1712 *ice = snd_pcm_substream_chip(substream);
|
||||
struct vt1724_pcm_reg *reg = substream->runtime->private_data;
|
||||
const struct vt1724_pcm_reg *reg = substream->runtime->private_data;
|
||||
|
||||
spin_lock_irq(&ice->reg_lock);
|
||||
outl(substream->runtime->dma_addr, ice->profi_port + reg->addr);
|
||||
@ -621,7 +621,7 @@ static int snd_vt1724_pcm_prepare(struct snd_pcm_substream *substream)
|
||||
static snd_pcm_uframes_t snd_vt1724_pcm_pointer(struct snd_pcm_substream *substream)
|
||||
{
|
||||
struct snd_ice1712 *ice = snd_pcm_substream_chip(substream);
|
||||
struct vt1724_pcm_reg *reg = substream->runtime->private_data;
|
||||
const struct vt1724_pcm_reg *reg = substream->runtime->private_data;
|
||||
size_t ptr;
|
||||
|
||||
if (!(inl(ICEMT1724(ice, DMA_CONTROL)) & reg->start))
|
||||
@ -647,21 +647,21 @@ static snd_pcm_uframes_t snd_vt1724_pcm_pointer(struct snd_pcm_substream *substr
|
||||
#endif
|
||||
}
|
||||
|
||||
static struct vt1724_pcm_reg vt1724_playback_pro_reg = {
|
||||
static const struct vt1724_pcm_reg vt1724_playback_pro_reg = {
|
||||
.addr = VT1724_MT_PLAYBACK_ADDR,
|
||||
.size = VT1724_MT_PLAYBACK_SIZE,
|
||||
.count = VT1724_MT_PLAYBACK_COUNT,
|
||||
.start = VT1724_PDMA0_START,
|
||||
};
|
||||
|
||||
static struct vt1724_pcm_reg vt1724_capture_pro_reg = {
|
||||
static const struct vt1724_pcm_reg vt1724_capture_pro_reg = {
|
||||
.addr = VT1724_MT_CAPTURE_ADDR,
|
||||
.size = VT1724_MT_CAPTURE_SIZE,
|
||||
.count = VT1724_MT_CAPTURE_COUNT,
|
||||
.start = VT1724_RDMA0_START,
|
||||
};
|
||||
|
||||
static struct snd_pcm_hardware snd_vt1724_playback_pro =
|
||||
static const struct snd_pcm_hardware snd_vt1724_playback_pro =
|
||||
{
|
||||
.info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
|
||||
SNDRV_PCM_INFO_BLOCK_TRANSFER |
|
||||
@ -680,7 +680,7 @@ static struct snd_pcm_hardware snd_vt1724_playback_pro =
|
||||
.periods_max = 1024,
|
||||
};
|
||||
|
||||
static struct snd_pcm_hardware snd_vt1724_spdif =
|
||||
static const struct snd_pcm_hardware snd_vt1724_spdif =
|
||||
{
|
||||
.info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
|
||||
SNDRV_PCM_INFO_BLOCK_TRANSFER |
|
||||
@ -702,7 +702,7 @@ static struct snd_pcm_hardware snd_vt1724_spdif =
|
||||
.periods_max = 1024,
|
||||
};
|
||||
|
||||
static struct snd_pcm_hardware snd_vt1724_2ch_stereo =
|
||||
static const struct snd_pcm_hardware snd_vt1724_2ch_stereo =
|
||||
{
|
||||
.info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
|
||||
SNDRV_PCM_INFO_BLOCK_TRANSFER |
|
||||
@ -774,7 +774,7 @@ static int snd_vt1724_playback_pro_open(struct snd_pcm_substream *substream)
|
||||
struct snd_ice1712 *ice = snd_pcm_substream_chip(substream);
|
||||
int chs;
|
||||
|
||||
runtime->private_data = &vt1724_playback_pro_reg;
|
||||
runtime->private_data = (void *)&vt1724_playback_pro_reg;
|
||||
ice->playback_pro_substream = substream;
|
||||
runtime->hw = snd_vt1724_playback_pro;
|
||||
snd_pcm_set_sync(substream);
|
||||
@ -803,7 +803,7 @@ static int snd_vt1724_capture_pro_open(struct snd_pcm_substream *substream)
|
||||
struct snd_ice1712 *ice = snd_pcm_substream_chip(substream);
|
||||
struct snd_pcm_runtime *runtime = substream->runtime;
|
||||
|
||||
runtime->private_data = &vt1724_capture_pro_reg;
|
||||
runtime->private_data = (void *)&vt1724_capture_pro_reg;
|
||||
ice->capture_pro_substream = substream;
|
||||
runtime->hw = snd_vt1724_2ch_stereo;
|
||||
snd_pcm_set_sync(substream);
|
||||
@ -889,14 +889,14 @@ static int __devinit snd_vt1724_pcm_profi(struct snd_ice1712 * ice, int device)
|
||||
* SPDIF PCM
|
||||
*/
|
||||
|
||||
static struct vt1724_pcm_reg vt1724_playback_spdif_reg = {
|
||||
static const struct vt1724_pcm_reg vt1724_playback_spdif_reg = {
|
||||
.addr = VT1724_MT_PDMA4_ADDR,
|
||||
.size = VT1724_MT_PDMA4_SIZE,
|
||||
.count = VT1724_MT_PDMA4_COUNT,
|
||||
.start = VT1724_PDMA4_START,
|
||||
};
|
||||
|
||||
static struct vt1724_pcm_reg vt1724_capture_spdif_reg = {
|
||||
static const struct vt1724_pcm_reg vt1724_capture_spdif_reg = {
|
||||
.addr = VT1724_MT_RDMA1_ADDR,
|
||||
.size = VT1724_MT_RDMA1_SIZE,
|
||||
.count = VT1724_MT_RDMA1_COUNT,
|
||||
@ -954,7 +954,7 @@ static int snd_vt1724_playback_spdif_open(struct snd_pcm_substream *substream)
|
||||
struct snd_ice1712 *ice = snd_pcm_substream_chip(substream);
|
||||
struct snd_pcm_runtime *runtime = substream->runtime;
|
||||
|
||||
runtime->private_data = &vt1724_playback_spdif_reg;
|
||||
runtime->private_data = (void *)&vt1724_playback_spdif_reg;
|
||||
ice->playback_con_substream = substream;
|
||||
if (ice->force_pdma4) {
|
||||
runtime->hw = snd_vt1724_2ch_stereo;
|
||||
@ -986,7 +986,7 @@ static int snd_vt1724_capture_spdif_open(struct snd_pcm_substream *substream)
|
||||
struct snd_ice1712 *ice = snd_pcm_substream_chip(substream);
|
||||
struct snd_pcm_runtime *runtime = substream->runtime;
|
||||
|
||||
runtime->private_data = &vt1724_capture_spdif_reg;
|
||||
runtime->private_data = (void *)&vt1724_capture_spdif_reg;
|
||||
ice->capture_con_substream = substream;
|
||||
if (ice->force_rdma1) {
|
||||
runtime->hw = snd_vt1724_2ch_stereo;
|
||||
@ -1091,7 +1091,7 @@ static int __devinit snd_vt1724_pcm_spdif(struct snd_ice1712 * ice, int device)
|
||||
* independent surround PCMs
|
||||
*/
|
||||
|
||||
static struct vt1724_pcm_reg vt1724_playback_dma_regs[3] = {
|
||||
static const struct vt1724_pcm_reg vt1724_playback_dma_regs[3] = {
|
||||
{
|
||||
.addr = VT1724_MT_PDMA1_ADDR,
|
||||
.size = VT1724_MT_PDMA1_SIZE,
|
||||
@ -1137,7 +1137,7 @@ static int snd_vt1724_playback_indep_open(struct snd_pcm_substream *substream)
|
||||
return -EBUSY; /* FIXME: should handle blocking mode properly */
|
||||
}
|
||||
mutex_unlock(&ice->open_mutex);
|
||||
runtime->private_data = &vt1724_playback_dma_regs[substream->number];
|
||||
runtime->private_data = (void *)&vt1724_playback_dma_regs[substream->number];
|
||||
ice->playback_con_substream_ds[substream->number] = substream;
|
||||
runtime->hw = snd_vt1724_2ch_stereo;
|
||||
snd_pcm_set_sync(substream);
|
||||
@ -1318,7 +1318,7 @@ static int snd_vt1724_eeprom_get(struct snd_kcontrol *kcontrol,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_vt1724_eeprom __devinitdata = {
|
||||
static const struct snd_kcontrol_new snd_vt1724_eeprom __devinitdata = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_CARD,
|
||||
.name = "ICE1724 EEPROM",
|
||||
.access = SNDRV_CTL_ELEM_ACCESS_READ,
|
||||
@ -1431,7 +1431,7 @@ static int snd_vt1724_spdif_default_put(struct snd_kcontrol *kcontrol,
|
||||
return (val != old);
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_vt1724_spdif_default __devinitdata =
|
||||
static const struct snd_kcontrol_new snd_vt1724_spdif_default __devinitdata =
|
||||
{
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_PCM,
|
||||
.name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),
|
||||
@ -1463,7 +1463,7 @@ static int snd_vt1724_spdif_maskp_get(struct snd_kcontrol *kcontrol,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_vt1724_spdif_maskc __devinitdata =
|
||||
static const struct snd_kcontrol_new snd_vt1724_spdif_maskc __devinitdata =
|
||||
{
|
||||
.access = SNDRV_CTL_ELEM_ACCESS_READ,
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_PCM,
|
||||
@ -1472,7 +1472,7 @@ static struct snd_kcontrol_new snd_vt1724_spdif_maskc __devinitdata =
|
||||
.get = snd_vt1724_spdif_maskc_get,
|
||||
};
|
||||
|
||||
static struct snd_kcontrol_new snd_vt1724_spdif_maskp __devinitdata =
|
||||
static const struct snd_kcontrol_new snd_vt1724_spdif_maskp __devinitdata =
|
||||
{
|
||||
.access = SNDRV_CTL_ELEM_ACCESS_READ,
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_PCM,
|
||||
@ -1517,7 +1517,7 @@ static int snd_vt1724_spdif_sw_put(struct snd_kcontrol *kcontrol,
|
||||
return old != val;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_vt1724_spdif_switch __devinitdata =
|
||||
static const struct snd_kcontrol_new snd_vt1724_spdif_switch __devinitdata =
|
||||
{
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
/* FIXME: the following conflict with IEC958 Playback Route */
|
||||
@ -1585,7 +1585,7 @@ int snd_ice1712_gpio_put(struct snd_kcontrol *kcontrol,
|
||||
static int snd_vt1724_pro_internal_clock_info(struct snd_kcontrol *kcontrol,
|
||||
struct snd_ctl_elem_info *uinfo)
|
||||
{
|
||||
static char *texts_1724[] = {
|
||||
static const char * const texts_1724[] = {
|
||||
"8000", /* 0: 6 */
|
||||
"9600", /* 1: 3 */
|
||||
"11025", /* 2: 10 */
|
||||
@ -1603,7 +1603,7 @@ static int snd_vt1724_pro_internal_clock_info(struct snd_kcontrol *kcontrol,
|
||||
"192000", /* 14: 14 */
|
||||
"IEC958 Input", /* 15: -- */
|
||||
};
|
||||
static char *texts_1720[] = {
|
||||
static const char * const texts_1720[] = {
|
||||
"8000", /* 0: 6 */
|
||||
"9600", /* 1: 3 */
|
||||
"11025", /* 2: 10 */
|
||||
@ -1636,7 +1636,7 @@ static int snd_vt1724_pro_internal_clock_get(struct snd_kcontrol *kcontrol,
|
||||
struct snd_ctl_elem_value *ucontrol)
|
||||
{
|
||||
struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);
|
||||
static unsigned char xlate[16] = {
|
||||
static const unsigned char xlate[16] = {
|
||||
9, 6, 3, 1, 7, 4, 0, 12, 8, 5, 2, 11, 13, 255, 14, 10
|
||||
};
|
||||
unsigned char val;
|
||||
@ -1695,7 +1695,7 @@ static int snd_vt1724_pro_internal_clock_put(struct snd_kcontrol *kcontrol,
|
||||
return change;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_vt1724_pro_internal_clock __devinitdata = {
|
||||
static const struct snd_kcontrol_new snd_vt1724_pro_internal_clock __devinitdata = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "Multi Track Internal Clock",
|
||||
.info = snd_vt1724_pro_internal_clock_info,
|
||||
@ -1734,7 +1734,7 @@ static int snd_vt1724_pro_rate_locking_put(struct snd_kcontrol *kcontrol,
|
||||
return change;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_vt1724_pro_rate_locking __devinitdata = {
|
||||
static const struct snd_kcontrol_new snd_vt1724_pro_rate_locking __devinitdata = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "Multi Track Rate Locking",
|
||||
.info = snd_vt1724_pro_rate_locking_info,
|
||||
@ -1773,7 +1773,7 @@ static int snd_vt1724_pro_rate_reset_put(struct snd_kcontrol *kcontrol,
|
||||
return change;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_vt1724_pro_rate_reset __devinitdata = {
|
||||
static const struct snd_kcontrol_new snd_vt1724_pro_rate_reset __devinitdata = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "Multi Track Rate Reset",
|
||||
.info = snd_vt1724_pro_rate_reset_info,
|
||||
@ -1817,7 +1817,7 @@ static int get_route_val(struct snd_ice1712 *ice, int shift)
|
||||
{
|
||||
unsigned long val;
|
||||
unsigned char eitem;
|
||||
static unsigned char xlate[8] = {
|
||||
static const unsigned char xlate[8] = {
|
||||
0, 255, 1, 2, 255, 255, 3, 4,
|
||||
};
|
||||
|
||||
@ -1836,7 +1836,7 @@ static int put_route_val(struct snd_ice1712 *ice, unsigned int val, int shift)
|
||||
{
|
||||
unsigned int old_val, nval;
|
||||
int change;
|
||||
static unsigned char xroute[8] = {
|
||||
static const unsigned char xroute[8] = {
|
||||
0, /* PCM */
|
||||
2, /* PSDIN0 Left */
|
||||
3, /* PSDIN0 Right */
|
||||
@ -1892,7 +1892,7 @@ static int snd_vt1724_pro_route_spdif_put(struct snd_kcontrol *kcontrol,
|
||||
digital_route_shift(idx));
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_vt1724_mixer_pro_analog_route __devinitdata = {
|
||||
static const struct snd_kcontrol_new snd_vt1724_mixer_pro_analog_route __devinitdata = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "H/W Playback Route",
|
||||
.info = snd_vt1724_pro_route_info,
|
||||
@ -1900,7 +1900,7 @@ static struct snd_kcontrol_new snd_vt1724_mixer_pro_analog_route __devinitdata =
|
||||
.put = snd_vt1724_pro_route_analog_put,
|
||||
};
|
||||
|
||||
static struct snd_kcontrol_new snd_vt1724_mixer_pro_spdif_route __devinitdata = {
|
||||
static const struct snd_kcontrol_new snd_vt1724_mixer_pro_spdif_route __devinitdata = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Route",
|
||||
.info = snd_vt1724_pro_route_info,
|
||||
@ -1936,7 +1936,7 @@ static int snd_vt1724_pro_peak_get(struct snd_kcontrol *kcontrol,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_vt1724_mixer_pro_peak __devinitdata = {
|
||||
static const struct snd_kcontrol_new snd_vt1724_mixer_pro_peak __devinitdata = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "Multi Track Peak",
|
||||
.access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,
|
||||
@ -1948,9 +1948,9 @@ static struct snd_kcontrol_new snd_vt1724_mixer_pro_peak __devinitdata = {
|
||||
*
|
||||
*/
|
||||
|
||||
static struct snd_ice1712_card_info no_matched __devinitdata;
|
||||
static const struct snd_ice1712_card_info no_matched __devinitdata;
|
||||
|
||||
static struct snd_ice1712_card_info *card_tables[] __devinitdata = {
|
||||
static const struct snd_ice1712_card_info *card_tables[] __devinitdata = {
|
||||
snd_vt1724_revo_cards,
|
||||
snd_vt1724_amp_cards,
|
||||
snd_vt1724_aureon_cards,
|
||||
@ -2009,7 +2009,7 @@ static int __devinit snd_vt1724_read_eeprom(struct snd_ice1712 *ice,
|
||||
{
|
||||
const int dev = 0xa0; /* EEPROM device address */
|
||||
unsigned int i, size;
|
||||
struct snd_ice1712_card_info **tbl, *c;
|
||||
const struct snd_ice1712_card_info **tbl, *c;
|
||||
|
||||
if (! modelname || ! *modelname) {
|
||||
ice->eeprom.subvendor = 0;
|
||||
@ -2308,7 +2308,7 @@ static int __devinit snd_vt1724_probe(struct pci_dev *pci,
|
||||
struct snd_card *card;
|
||||
struct snd_ice1712 *ice;
|
||||
int pcm_dev = 0, err;
|
||||
struct snd_ice1712_card_info **tbl, *c;
|
||||
const struct snd_ice1712_card_info **tbl, *c;
|
||||
|
||||
if (dev >= SNDRV_CARDS)
|
||||
return -ENODEV;
|
||||
|
||||
@ -125,7 +125,7 @@ static void juli_akm_set_rate_val(struct snd_akm4xxx *ak, unsigned int rate)
|
||||
snd_akm4xxx_reset(ak, 0);
|
||||
}
|
||||
|
||||
static struct snd_akm4xxx akm_juli_dac __devinitdata = {
|
||||
static const struct snd_akm4xxx akm_juli_dac __devinitdata = {
|
||||
.type = SND_AK4358,
|
||||
.num_dacs = 2,
|
||||
.ops = {
|
||||
@ -206,7 +206,7 @@ static int __devinit juli_init(struct snd_ice1712 *ice)
|
||||
* hence the driver needs to sets up it properly.
|
||||
*/
|
||||
|
||||
static unsigned char juli_eeprom[] __devinitdata = {
|
||||
static const unsigned char juli_eeprom[] __devinitdata = {
|
||||
[ICE_EEP2_SYSCONF] = 0x20, /* clock 512, mpu401, 1xADC, 1xDACs */
|
||||
[ICE_EEP2_ACLINK] = 0x80, /* I2S */
|
||||
[ICE_EEP2_I2S] = 0xf8, /* vol, 96k, 24bit, 192k */
|
||||
@ -223,7 +223,7 @@ static unsigned char juli_eeprom[] __devinitdata = {
|
||||
};
|
||||
|
||||
/* entry point */
|
||||
struct snd_ice1712_card_info snd_vt1724_juli_cards[] __devinitdata = {
|
||||
const struct snd_ice1712_card_info snd_vt1724_juli_cards[] __devinitdata = {
|
||||
{
|
||||
.subvendor = VT1724_SUBDEVICE_JULI,
|
||||
.name = "ESI Juli@",
|
||||
|
||||
@ -5,6 +5,6 @@
|
||||
|
||||
#define VT1724_SUBDEVICE_JULI 0x31305345 /* Juli@ */
|
||||
|
||||
extern struct snd_ice1712_card_info snd_vt1724_juli_cards[];
|
||||
extern const struct snd_ice1712_card_info snd_vt1724_juli_cards[];
|
||||
|
||||
#endif /* __SOUND_JULI_H */
|
||||
|
||||
@ -71,7 +71,7 @@
|
||||
* Logarithmic volume values for WM8770
|
||||
* Computed as 20 * Log10(255 / x)
|
||||
*/
|
||||
static unsigned char wm_vol[256] = {
|
||||
static const unsigned char wm_vol[256] = {
|
||||
127, 48, 42, 39, 36, 34, 33, 31, 30, 29, 28, 27, 27, 26, 25, 25, 24, 24, 23,
|
||||
23, 22, 22, 21, 21, 21, 20, 20, 20, 19, 19, 19, 18, 18, 18, 18, 17, 17, 17,
|
||||
17, 16, 16, 16, 16, 15, 15, 15, 15, 15, 15, 14, 14, 14, 14, 14, 13, 13, 13,
|
||||
@ -89,13 +89,13 @@ static unsigned char wm_vol[256] = {
|
||||
#define WM_VOL_MAX (sizeof(wm_vol) - 1)
|
||||
#define WM_VOL_MUTE 0x8000
|
||||
|
||||
static struct snd_akm4xxx akm_phase22 __devinitdata = {
|
||||
static const struct snd_akm4xxx akm_phase22 __devinitdata = {
|
||||
.type = SND_AK4524,
|
||||
.num_dacs = 2,
|
||||
.num_adcs = 2,
|
||||
};
|
||||
|
||||
static struct snd_ak4xxx_private akm_phase22_priv __devinitdata = {
|
||||
static const struct snd_ak4xxx_private akm_phase22_priv __devinitdata = {
|
||||
.caddr = 2,
|
||||
.cif = 1,
|
||||
.data_mask = 1 << 4,
|
||||
@ -152,7 +152,7 @@ static int __devinit phase22_add_controls(struct snd_ice1712 *ice)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static unsigned char phase22_eeprom[] __devinitdata = {
|
||||
static const unsigned char phase22_eeprom[] __devinitdata = {
|
||||
[ICE_EEP2_SYSCONF] = 0x00, /* 1xADC, 1xDACs */
|
||||
[ICE_EEP2_ACLINK] = 0x80, /* I2S */
|
||||
[ICE_EEP2_I2S] = 0xf8, /* vol, 96k, 24bit */
|
||||
@ -168,7 +168,7 @@ static unsigned char phase22_eeprom[] __devinitdata = {
|
||||
[ICE_EEP2_GPIO_STATE2] = 0x00,
|
||||
};
|
||||
|
||||
static unsigned char phase28_eeprom[] __devinitdata = {
|
||||
static const unsigned char phase28_eeprom[] __devinitdata = {
|
||||
[ICE_EEP2_SYSCONF] = 0x0b, /* clock 512, spdif-in/ADC, 4DACs */
|
||||
[ICE_EEP2_ACLINK] = 0x80, /* I2S */
|
||||
[ICE_EEP2_I2S] = 0xfc, /* vol, 96k, 24bit, 192k */
|
||||
@ -343,7 +343,7 @@ static int wm_master_vol_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_
|
||||
|
||||
static int __devinit phase28_init(struct snd_ice1712 *ice)
|
||||
{
|
||||
static unsigned short wm_inits_phase28[] = {
|
||||
static const unsigned short wm_inits_phase28[] = {
|
||||
/* These come first to reduce init pop noise */
|
||||
0x1b, 0x044, /* ADC Mux (AC'97 source) */
|
||||
0x1c, 0x00B, /* Out Mux1 (VOUT1 = DAC+AUX, VOUT2 = DAC) */
|
||||
@ -382,7 +382,7 @@ static int __devinit phase28_init(struct snd_ice1712 *ice)
|
||||
|
||||
unsigned int tmp;
|
||||
struct snd_akm4xxx *ak;
|
||||
unsigned short *p;
|
||||
const unsigned short *p;
|
||||
int i;
|
||||
|
||||
ice->num_total_dacs = 8;
|
||||
@ -700,7 +700,7 @@ static int phase28_oversampling_put(struct snd_kcontrol *kcontrol, struct snd_ct
|
||||
static DECLARE_TLV_DB_SCALE(db_scale_wm_dac, -12700, 100, 1);
|
||||
static DECLARE_TLV_DB_SCALE(db_scale_wm_pcm, -6400, 50, 1);
|
||||
|
||||
static struct snd_kcontrol_new phase28_dac_controls[] __devinitdata = {
|
||||
static const struct snd_kcontrol_new phase28_dac_controls[] __devinitdata = {
|
||||
{
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "Master Playback Switch",
|
||||
@ -815,7 +815,7 @@ static struct snd_kcontrol_new phase28_dac_controls[] __devinitdata = {
|
||||
}
|
||||
};
|
||||
|
||||
static struct snd_kcontrol_new wm_controls[] __devinitdata = {
|
||||
static const struct snd_kcontrol_new wm_controls[] __devinitdata = {
|
||||
{
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "PCM Playback Switch",
|
||||
@ -870,7 +870,7 @@ static int __devinit phase28_add_controls(struct snd_ice1712 *ice)
|
||||
return 0;
|
||||
}
|
||||
|
||||
struct snd_ice1712_card_info snd_vt1724_phase_cards[] __devinitdata = {
|
||||
const struct snd_ice1712_card_info snd_vt1724_phase_cards[] __devinitdata = {
|
||||
{
|
||||
.subvendor = VT1724_SUBDEVICE_PHASE22,
|
||||
.name = "Terratec PHASE 22",
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
#define VT1724_SUBDEVICE_PHASE28 0x3b154911
|
||||
|
||||
/* entry point */
|
||||
extern struct snd_ice1712_card_info snd_vt1724_phase_cards[];
|
||||
extern const struct snd_ice1712_card_info snd_vt1724_phase_cards[];
|
||||
|
||||
/* PHASE28 GPIO bits */
|
||||
#define PHASE28_SPI_MISO (1 << 21)
|
||||
|
||||
@ -434,7 +434,7 @@ static unsigned int spi_read(struct snd_ice1712 *ice, unsigned int dev, unsigned
|
||||
*/
|
||||
static int cs_source_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
|
||||
{
|
||||
static char *texts[] = {
|
||||
static const char * const texts[] = {
|
||||
"Coax", /* RXP0 */
|
||||
"Optical", /* RXP1 */
|
||||
"CD", /* RXP2 */
|
||||
@ -571,7 +571,7 @@ static DECLARE_TLV_DB_SCALE(db_scale_volume, -6400, 50, 1);
|
||||
* mixers
|
||||
*/
|
||||
|
||||
static struct snd_kcontrol_new pontis_controls[] __devinitdata = {
|
||||
static const struct snd_kcontrol_new pontis_controls[] __devinitdata = {
|
||||
{
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.access = (SNDRV_CTL_ELEM_ACCESS_READWRITE |
|
||||
@ -741,7 +741,7 @@ static int __devinit pontis_add_controls(struct snd_ice1712 *ice)
|
||||
*/
|
||||
static int __devinit pontis_init(struct snd_ice1712 *ice)
|
||||
{
|
||||
static unsigned short wm_inits[] = {
|
||||
static const unsigned short wm_inits[] = {
|
||||
/* These come first to reduce init pop noise */
|
||||
WM_ADC_MUX, 0x00c0, /* ADC mute */
|
||||
WM_DAC_MUTE, 0x0001, /* DAC softmute */
|
||||
@ -750,7 +750,7 @@ static int __devinit pontis_init(struct snd_ice1712 *ice)
|
||||
WM_POWERDOWN, 0x0008, /* All power-up except HP */
|
||||
WM_RESET, 0x0000, /* reset */
|
||||
};
|
||||
static unsigned short wm_inits2[] = {
|
||||
static const unsigned short wm_inits2[] = {
|
||||
WM_MASTER_CTRL, 0x0022, /* 256fs, slave mode */
|
||||
WM_DAC_INT, 0x0022, /* I2S, normal polarity, 24bit */
|
||||
WM_ADC_INT, 0x0022, /* I2S, normal polarity, 24bit */
|
||||
@ -776,7 +776,7 @@ static int __devinit pontis_init(struct snd_ice1712 *ice)
|
||||
WM_DAC_MUTE, 0x0000, /* DAC unmute */
|
||||
WM_ADC_MUX, 0x0003, /* ADC unmute, both CD/Line On */
|
||||
};
|
||||
static unsigned char cs_inits[] = {
|
||||
static const unsigned char cs_inits[] = {
|
||||
0x04, 0x80, /* RUN, RXP0 */
|
||||
0x05, 0x05, /* slave, 24bit */
|
||||
0x01, 0x00,
|
||||
@ -826,7 +826,7 @@ static int __devinit pontis_init(struct snd_ice1712 *ice)
|
||||
* hence the driver needs to sets up it properly.
|
||||
*/
|
||||
|
||||
static unsigned char pontis_eeprom[] __devinitdata = {
|
||||
static const unsigned char pontis_eeprom[] __devinitdata = {
|
||||
[ICE_EEP2_SYSCONF] = 0x08, /* clock 256, mpu401, spdif-in/ADC, 1DAC */
|
||||
[ICE_EEP2_ACLINK] = 0x80, /* I2S */
|
||||
[ICE_EEP2_I2S] = 0xf8, /* vol, 96k, 24bit, 192k */
|
||||
@ -843,7 +843,7 @@ static unsigned char pontis_eeprom[] __devinitdata = {
|
||||
};
|
||||
|
||||
/* entry point */
|
||||
struct snd_ice1712_card_info snd_vt1720_pontis_cards[] __devinitdata = {
|
||||
const struct snd_ice1712_card_info snd_vt1720_pontis_cards[] __devinitdata = {
|
||||
{
|
||||
.subvendor = VT1720_SUBDEVICE_PONTIS_MS300,
|
||||
.name = "Pontis MS300",
|
||||
|
||||
@ -28,6 +28,6 @@
|
||||
|
||||
#define VT1720_SUBDEVICE_PONTIS_MS300 0x00020002 /* a dummy id for MS300 */
|
||||
|
||||
extern struct snd_ice1712_card_info snd_vt1720_pontis_cards[];
|
||||
extern const struct snd_ice1712_card_info snd_vt1720_pontis_cards[];
|
||||
|
||||
#endif /* __SOUND_PONTIS_H */
|
||||
|
||||
@ -364,7 +364,7 @@ static DECLARE_TLV_DB_SCALE(db_scale_adc, 0, 150, 0);
|
||||
* mixers
|
||||
*/
|
||||
|
||||
static struct snd_kcontrol_new stac_controls[] __devinitdata = {
|
||||
static const struct snd_kcontrol_new stac_controls[] __devinitdata = {
|
||||
{
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "Master Playback Switch",
|
||||
@ -475,7 +475,7 @@ static int __devinit prodigy192_add_controls(struct snd_ice1712 *ice)
|
||||
*/
|
||||
static int __devinit prodigy192_init(struct snd_ice1712 *ice)
|
||||
{
|
||||
static unsigned short stac_inits_prodigy[] = {
|
||||
static const unsigned short stac_inits_prodigy[] = {
|
||||
STAC946X_RESET, 0,
|
||||
/* STAC946X_MASTER_VOLUME, 0,
|
||||
STAC946X_LF_VOLUME, 0,
|
||||
@ -486,7 +486,7 @@ static int __devinit prodigy192_init(struct snd_ice1712 *ice)
|
||||
STAC946X_LFE_VOLUME, 0,*/
|
||||
(unsigned short)-1
|
||||
};
|
||||
unsigned short *p;
|
||||
const unsigned short *p;
|
||||
|
||||
/* prodigy 192 */
|
||||
ice->num_total_dacs = 6;
|
||||
@ -506,7 +506,7 @@ static int __devinit prodigy192_init(struct snd_ice1712 *ice)
|
||||
* hence the driver needs to sets up it properly.
|
||||
*/
|
||||
|
||||
static unsigned char prodigy71_eeprom[] __devinitdata = {
|
||||
static const unsigned char prodigy71_eeprom[] __devinitdata = {
|
||||
[ICE_EEP2_SYSCONF] = 0x2b, /* clock 512, mpu401, spdif-in/ADC, 4DACs */
|
||||
[ICE_EEP2_ACLINK] = 0x80, /* I2S */
|
||||
[ICE_EEP2_I2S] = 0xf8, /* vol, 96k, 24bit, 192k */
|
||||
@ -524,7 +524,7 @@ static unsigned char prodigy71_eeprom[] __devinitdata = {
|
||||
|
||||
|
||||
/* entry point */
|
||||
struct snd_ice1712_card_info snd_vt1724_prodigy192_cards[] __devinitdata = {
|
||||
const struct snd_ice1712_card_info snd_vt1724_prodigy192_cards[] __devinitdata = {
|
||||
{
|
||||
.subvendor = VT1724_SUBDEVICE_PRODIGY192VE,
|
||||
.name = "Audiotrak Prodigy 192",
|
||||
|
||||
@ -6,6 +6,6 @@
|
||||
|
||||
#define VT1724_SUBDEVICE_PRODIGY192VE 0x34495345 /* PRODIGY 192 VE */
|
||||
|
||||
extern struct snd_ice1712_card_info snd_vt1724_prodigy192_cards[];
|
||||
extern const struct snd_ice1712_card_info snd_vt1724_prodigy192_cards[];
|
||||
|
||||
#endif /* __SOUND_PRODIGY192_H */
|
||||
|
||||
@ -228,7 +228,7 @@ static struct snd_akm4xxx akm_revo_front __devinitdata = {
|
||||
.dac_info = revo71_front,
|
||||
};
|
||||
|
||||
static struct snd_ak4xxx_private akm_revo_front_priv __devinitdata = {
|
||||
static const struct snd_ak4xxx_private akm_revo_front_priv __devinitdata = {
|
||||
.caddr = 1,
|
||||
.cif = 0,
|
||||
.data_mask = VT1724_REVO_CDOUT,
|
||||
@ -240,7 +240,7 @@ static struct snd_ak4xxx_private akm_revo_front_priv __devinitdata = {
|
||||
.mask_flags = 0,
|
||||
};
|
||||
|
||||
static struct snd_akm4xxx akm_revo_surround __devinitdata = {
|
||||
static const struct snd_akm4xxx akm_revo_surround __devinitdata = {
|
||||
.type = SND_AK4355,
|
||||
.idx_offset = 1,
|
||||
.num_dacs = 6,
|
||||
@ -250,7 +250,7 @@ static struct snd_akm4xxx akm_revo_surround __devinitdata = {
|
||||
.dac_info = revo71_surround,
|
||||
};
|
||||
|
||||
static struct snd_ak4xxx_private akm_revo_surround_priv __devinitdata = {
|
||||
static const struct snd_ak4xxx_private akm_revo_surround_priv __devinitdata = {
|
||||
.caddr = 3,
|
||||
.cif = 0,
|
||||
.data_mask = VT1724_REVO_CDOUT,
|
||||
@ -262,7 +262,7 @@ static struct snd_ak4xxx_private akm_revo_surround_priv __devinitdata = {
|
||||
.mask_flags = 0,
|
||||
};
|
||||
|
||||
static struct snd_akm4xxx akm_revo51 __devinitdata = {
|
||||
static const struct snd_akm4xxx akm_revo51 __devinitdata = {
|
||||
.type = SND_AK4358,
|
||||
.num_dacs = 6,
|
||||
.ops = {
|
||||
@ -271,7 +271,7 @@ static struct snd_akm4xxx akm_revo51 __devinitdata = {
|
||||
.dac_info = revo51_dac,
|
||||
};
|
||||
|
||||
static struct snd_ak4xxx_private akm_revo51_priv __devinitdata = {
|
||||
static const struct snd_ak4xxx_private akm_revo51_priv __devinitdata = {
|
||||
.caddr = 2,
|
||||
.cif = 0,
|
||||
.data_mask = VT1724_REVO_CDOUT,
|
||||
@ -283,13 +283,13 @@ static struct snd_ak4xxx_private akm_revo51_priv __devinitdata = {
|
||||
.mask_flags = 0,
|
||||
};
|
||||
|
||||
static struct snd_akm4xxx akm_revo51_adc __devinitdata = {
|
||||
static const struct snd_akm4xxx akm_revo51_adc __devinitdata = {
|
||||
.type = SND_AK5365,
|
||||
.num_adcs = 2,
|
||||
.adc_info = revo51_adc,
|
||||
};
|
||||
|
||||
static struct snd_ak4xxx_private akm_revo51_adc_priv __devinitdata = {
|
||||
static const struct snd_ak4xxx_private akm_revo51_adc_priv __devinitdata = {
|
||||
.caddr = 2,
|
||||
.cif = 0,
|
||||
.data_mask = VT1724_REVO_CDOUT,
|
||||
@ -333,7 +333,7 @@ static struct snd_akm4xxx akm_ap192 __devinitdata = {
|
||||
.dac_info = ap192_dac,
|
||||
};
|
||||
|
||||
static struct snd_ak4xxx_private akm_ap192_priv __devinitdata = {
|
||||
static const struct snd_ak4xxx_private akm_ap192_priv __devinitdata = {
|
||||
.caddr = 2,
|
||||
.cif = 0,
|
||||
.data_mask = VT1724_REVO_CDOUT,
|
||||
@ -456,7 +456,7 @@ static unsigned char ap192_ak4114_read(void *private_data, unsigned char addr)
|
||||
|
||||
static int ap192_ak4114_init(struct snd_ice1712 *ice)
|
||||
{
|
||||
static unsigned char ak4114_init_vals[] = {
|
||||
static const unsigned char ak4114_init_vals[] = {
|
||||
AK4114_RST | AK4114_PWN | AK4114_OCKS0 | AK4114_OCKS1,
|
||||
AK4114_DIF_I24I2S,
|
||||
AK4114_TX1E,
|
||||
@ -464,7 +464,7 @@ static int ap192_ak4114_init(struct snd_ice1712 *ice)
|
||||
0,
|
||||
0
|
||||
};
|
||||
static unsigned char ak4114_init_txcsb[] = {
|
||||
static const unsigned char ak4114_init_txcsb[] = {
|
||||
0x41, 0x02, 0x2c, 0x00, 0x00
|
||||
};
|
||||
struct ak4114 *ak;
|
||||
@ -582,7 +582,7 @@ static int __devinit revo_add_controls(struct snd_ice1712 *ice)
|
||||
}
|
||||
|
||||
/* entry point */
|
||||
struct snd_ice1712_card_info snd_vt1724_revo_cards[] __devinitdata = {
|
||||
const struct snd_ice1712_card_info snd_vt1724_revo_cards[] __devinitdata = {
|
||||
{
|
||||
.subvendor = VT1724_SUBDEVICE_REVOLUTION71,
|
||||
.name = "M Audio Revolution-7.1",
|
||||
|
||||
@ -34,7 +34,7 @@
|
||||
#define VT1724_SUBDEVICE_AUDIOPHILE192 0x12143236
|
||||
|
||||
/* entry point */
|
||||
extern struct snd_ice1712_card_info snd_vt1724_revo_cards[];
|
||||
extern const struct snd_ice1712_card_info snd_vt1724_revo_cards[];
|
||||
|
||||
|
||||
/*
|
||||
|
||||
@ -56,7 +56,7 @@ static int __devinit k8x800_add_controls(struct snd_ice1712 *ice)
|
||||
|
||||
/* EEPROM image */
|
||||
|
||||
static unsigned char k8x800_eeprom[] __devinitdata = {
|
||||
static const unsigned char k8x800_eeprom[] __devinitdata = {
|
||||
[ICE_EEP2_SYSCONF] = 0x01, /* clock 256, 1ADC, 2DACs */
|
||||
[ICE_EEP2_ACLINK] = 0x02, /* ACLINK, packed */
|
||||
[ICE_EEP2_I2S] = 0x00, /* - */
|
||||
@ -72,7 +72,7 @@ static unsigned char k8x800_eeprom[] __devinitdata = {
|
||||
[ICE_EEP2_GPIO_STATE2] = 0x00, /* - */
|
||||
};
|
||||
|
||||
static unsigned char sn25p_eeprom[] __devinitdata = {
|
||||
static const unsigned char sn25p_eeprom[] __devinitdata = {
|
||||
[ICE_EEP2_SYSCONF] = 0x01, /* clock 256, 1ADC, 2DACs */
|
||||
[ICE_EEP2_ACLINK] = 0x02, /* ACLINK, packed */
|
||||
[ICE_EEP2_I2S] = 0x00, /* - */
|
||||
@ -90,7 +90,7 @@ static unsigned char sn25p_eeprom[] __devinitdata = {
|
||||
|
||||
|
||||
/* entry point */
|
||||
struct snd_ice1712_card_info snd_vt1720_mobo_cards[] __devinitdata = {
|
||||
const struct snd_ice1712_card_info snd_vt1720_mobo_cards[] __devinitdata = {
|
||||
{
|
||||
.subvendor = VT1720_SUBDEVICE_K8X800,
|
||||
.name = "Albatron K8X800 Pro II",
|
||||
|
||||
@ -36,6 +36,6 @@
|
||||
#define VT1720_SUBDEVICE_9CJS 0x0f272327
|
||||
#define VT1720_SUBDEVICE_SN25P 0x97123650
|
||||
|
||||
extern struct snd_ice1712_card_info snd_vt1720_mobo_cards[];
|
||||
extern const struct snd_ice1712_card_info snd_vt1720_mobo_cards[];
|
||||
|
||||
#endif /* __SOUND_VT1720_MOBO_H */
|
||||
|
||||
@ -409,7 +409,7 @@ static int stac9460_mic_sw_put(struct snd_kcontrol *kcontrol,
|
||||
/*
|
||||
* Control tabs
|
||||
*/
|
||||
static struct snd_kcontrol_new stac9640_controls[] __devinitdata = {
|
||||
static const struct snd_kcontrol_new stac9640_controls[] __devinitdata = {
|
||||
{
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "Master Playback Switch",
|
||||
|
||||
Loading…
Reference in New Issue
Block a user