From a3ddab1580c7153fd8a721f9b6b49c406ce841b5 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Thu, 25 Sep 2003 19:29:31 +0200 Subject: [PATCH] ALSA CVS update D:2003/09/23 15:31:44 C:Intel8x0 driver,VIA82xx driver,AC97 Codec Core,CS46xx driver A:Takashi Iwai F:pci/intel8x0.c:1.91->1.92 F:pci/via82xx.c:1.51->1.52 F:pci/ac97/ac97_patch.c:1.22->1.23 F:pci/cs46xx/cs46xx_lib.c:1.63->1.64 F:pci/cs46xx/dsp_spos.c:1.21->1.22 L:added ac97 quirks: L: L:- Dell Precision 530 and Dimension 8300 (by Simon Munton ) L:- HP onboard --- sound/pci/ac97/ac97_patch.c | 2 +- sound/pci/cs46xx/cs46xx_lib.c | 12 ++++++------ sound/pci/cs46xx/dsp_spos.c | 6 +++--- sound/pci/intel8x0.c | 18 ++++++++++++++++++ sound/pci/via82xx.c | 1 + 5 files changed, 29 insertions(+), 10 deletions(-) diff --git a/sound/pci/ac97/ac97_patch.c b/sound/pci/ac97/ac97_patch.c index 839648833cb01..af81810afc6cc 100644 --- a/sound/pci/ac97/ac97_patch.c +++ b/sound/pci/ac97/ac97_patch.c @@ -897,7 +897,7 @@ static struct snd_ac97_build_ops patch_alc650_ops = { int patch_alc650(ac97_t * ac97) { - unsigned short val, reg; + unsigned short val; int spdif = 0; ac97->build_ops = &patch_alc650_ops; diff --git a/sound/pci/cs46xx/cs46xx_lib.c b/sound/pci/cs46xx/cs46xx_lib.c index f48464c28de3a..db0a73f95621d 100644 --- a/sound/pci/cs46xx/cs46xx_lib.c +++ b/sound/pci/cs46xx/cs46xx_lib.c @@ -2111,9 +2111,9 @@ static int snd_cs46xx_spdif_default_put(snd_kcontrol_t * kcontrol, int change; down (&chip->spos_mutex); - val = _wrap_all_bits(((u32)ucontrol->value.iec958.status[0] << 24)) | - _wrap_all_bits(((u32)ucontrol->value.iec958.status[2] << 16)) | - _wrap_all_bits( (u32)ucontrol->value.iec958.status[3]) | + val = ((unsigned int)_wrap_all_bits(ucontrol->value.iec958.status[0]) << 24) | + ((unsigned int)_wrap_all_bits(ucontrol->value.iec958.status[2]) << 16) | + ((unsigned int)_wrap_all_bits(ucontrol->value.iec958.status[3])) | /* left and right validity bit */ (1 << 13) | (1 << 12); @@ -2164,9 +2164,9 @@ static int snd_cs46xx_spdif_stream_put(snd_kcontrol_t * kcontrol, int change; down (&chip->spos_mutex); - val = _wrap_all_bits(((u32)ucontrol->value.iec958.status[0] << 24)) | - _wrap_all_bits(((u32)ucontrol->value.iec958.status[1] << 16)) | - _wrap_all_bits( (u32)ucontrol->value.iec958.status[3]) | + val = ((unsigned int)_wrap_all_bits(ucontrol->value.iec958.status[0]) << 24) | + ((unsigned int)_wrap_all_bits(ucontrol->value.iec958.status[1]) << 16) | + ((unsigned int)_wrap_all_bits(ucontrol->value.iec958.status[3])) | /* left and right validity bit */ (1 << 13) | (1 << 12); diff --git a/sound/pci/cs46xx/dsp_spos.c b/sound/pci/cs46xx/dsp_spos.c index d58e6eeb10687..e2092c13bc7ac 100644 --- a/sound/pci/cs46xx/dsp_spos.c +++ b/sound/pci/cs46xx/dsp_spos.c @@ -267,9 +267,9 @@ dsp_spos_instance_t * cs46xx_dsp_spos_create (cs46xx_t * chip) default channel status */ ins->spdif_csuv_default = ins->spdif_csuv_stream = - /* byte 0 */ (_wrap_all_bits( (SNDRV_PCM_DEFAULT_CON_SPDIF & 0xff)) << 24) | - /* byte 1 */ (_wrap_all_bits( ((SNDRV_PCM_DEFAULT_CON_SPDIF >> 16) & 0xff)) << 16) | - /* byte 3 */ _wrap_all_bits( (SNDRV_PCM_DEFAULT_CON_SPDIF >> 24) & 0xff) | + /* byte 0 */ ((unsigned int)_wrap_all_bits( (SNDRV_PCM_DEFAULT_CON_SPDIF & 0xff)) << 24) | + /* byte 1 */ ((unsigned int)_wrap_all_bits( ((SNDRV_PCM_DEFAULT_CON_SPDIF >> 8) & 0xff)) << 16) | + /* byte 3 */ (unsigned int)_wrap_all_bits( (SNDRV_PCM_DEFAULT_CON_SPDIF >> 24) & 0xff) | /* left and right validity bits */ (1 << 13) | (1 << 12); return ins; diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c index 0a4033b94e696..e0226de635d16 100644 --- a/sound/pci/intel8x0.c +++ b/sound/pci/intel8x0.c @@ -1578,12 +1578,24 @@ static struct _ac97_rate_regs ali_ac97_rate_regs[] __devinitdata = { }; static struct ac97_quirk ac97_quirks[] __devinitdata = { + { + .vendor = 0x1028, + .device = 0x00d8, + .name = "Dell Precision 530", + .type = AC97_TUNE_HP_ONLY + }, { .vendor = 0x1028, .device = 0x0126, .name = "Dell Optiplex GX260", .type = AC97_TUNE_HP_ONLY }, + { + .vendor = 0x1028, + .device = 0x0157, + .name = "Dell Dimension 8300", + .type = AC97_TUNE_SWAP_SURROUND + }, { .vendor = 0x1043, .device =0x80b0, @@ -1670,6 +1682,12 @@ static struct ac97_quirk ac97_quirks[] __devinitdata = { .name = "Intel ICH5/AD1985 (discrete)", .type = AC97_TUNE_HP_ONLY }, + { + .vendor = 0x103c, + .device = 0x00c3, + .name = "Hewlett-Packard onboard", + .type = AC97_TUNE_HP_ONLY + }, { } /* terminator */ }; diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c index 98e040a4b505d..13f4ee0a68b8f 100644 --- a/sound/pci/via82xx.c +++ b/sound/pci/via82xx.c @@ -1968,6 +1968,7 @@ static int __devinit check_dxs_list(struct pci_dev *pci) { static struct dxs_whitelist whitelist[] = { { .vendor = 0x1019, .device = 0x0996, .action = VIA_DXS_48K }, + { .vendor = 0x1297, .device = 0xc160, .action = VIA_DXS_ENABLE }, /* Shuttle SK41G */ { } /* terminator */ }; struct dxs_whitelist *w; -- 2.53.0