Changeset 479 for GPL/trunk/alsa-kernel/pci
- Timestamp:
- May 1, 2010, 9:49:10 PM (15 years ago)
- Location:
- GPL/trunk/alsa-kernel/pci
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
GPL/trunk/alsa-kernel/pci/cmipci.c
r464 r479 17 17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 18 18 */ 19 19 20 20 /* Does not work. Warning may block system in capture mode */ 21 21 /* #define USE_VAR48KRATE */ … … 1300 1300 substream->runtime->format == SNDRV_PCM_FORMAT_S16_LE && 1301 1301 substream->runtime->channels == 2); 1302 if (do_spdif && cm->can_ac3_hw) 1302 if (do_spdif && cm->can_ac3_hw) 1303 1303 do_ac3 = cm->dig_pcm_status & IEC958_AES0_NONAUDIO; 1304 1304 if ((err = setup_spdif_playback(cm, substream, do_spdif, do_ac3)) < 0) … … 1313 1313 int err, do_ac3; 1314 1314 1315 if (cm->can_ac3_hw) 1315 if (cm->can_ac3_hw) 1316 1316 do_ac3 = cm->dig_pcm_status & IEC958_AES0_NONAUDIO; 1317 1317 else … … 2036 2036 return 0; 2037 2037 } 2038 2038 2039 2039 static int snd_cmipci_get_volume(struct snd_kcontrol *kcontrol, 2040 2040 struct snd_ctl_elem_value *ucontrol) … … 2118 2118 return 0; 2119 2119 } 2120 2120 2121 2121 static int snd_cmipci_get_input_sw(struct snd_kcontrol *kcontrol, 2122 2122 struct snd_ctl_elem_value *ucontrol) … … 2386 2386 else 2387 2387 val = snd_cmipci_read(cm, args->reg); 2388 change = (val & args->mask) != (ucontrol->value.integer.value[0] ? 2388 change = (val & args->mask) != (ucontrol->value.integer.value[0] ? 2389 2389 args->mask_on : (args->mask & ~args->mask_on)); 2390 2390 if (change) { … … 2589 2589 /* same bit as spdi_phase */ 2590 2590 spin_lock_irq(&cm->reg_lock); 2591 ucontrol->value.enumerated.item[0] = 2591 ucontrol->value.enumerated.item[0] = 2592 2592 (snd_cmipci_read_b(cm, CM_REG_MISC) & CM_SPDIF_INVERSE) ? 1 : 0; 2593 2593 spin_unlock_irq(&cm->reg_lock); … … 2783 2783 2784 2784 #ifdef CONFIG_PROC_FS 2785 static void snd_cmipci_proc_read(struct snd_info_entry *entry, 2785 static void snd_cmipci_proc_read(struct snd_info_entry *entry, 2786 2786 struct snd_info_buffer *buffer) 2787 2787 { … … 3132 3132 case PCI_DEVICE_ID_CMEDIA_CM8738: 3133 3133 case PCI_DEVICE_ID_CMEDIA_CM8738B: 3134 if (!pci_dev_present(intel_82437vx)) 3134 if (!pci_dev_present(intel_82437vx)) 3135 3135 snd_cmipci_set_bit(cm, CM_REG_MISC_CTRL, CM_TXVX); 3136 3136 break; -
GPL/trunk/alsa-kernel/pci/emu10k1/emufx.c
r426 r479 40 40 #include <sound/tlv.h> 41 41 #include <sound/emu10k1.h> 42 #include <proto.h> 42 43 43 44 #if 0 /* for testing purposes - digital out -> capture */ … … 53 54 /* 54 55 * Tables 55 */ 56 */ 56 57 57 58 static char *fxbuses[16] = { … … 304 305 /* 305 306 */ 306 307 307 308 static inline mm_segment_t snd_enter_user(void) 308 309 { … … 1256 1257 snd_emu10k1_init_stereo_control(&controls[nctl++], "Synth Capture Volume", gpr, 0); 1257 1258 gpr += 2; 1258 1259 1259 1260 /* 1260 1261 * inputs … … 1332 1333 gpr, 0); 1333 1334 gpr += 2; 1334 1335 1335 1336 /* Philips ADC Playback Volume */ 1336 1337 A_ADD_VOLUME_IN(stereo_mix, gpr, A_EXTIN_ADC_L); … … 1530 1531 } 1531 1532 1532 /* IEC958 Optical Raw Playback Switch */ 1533 /* IEC958 Optical Raw Playback Switch */ 1533 1534 gpr_map[gpr++] = 0; 1534 1535 gpr_map[gpr++] = 0x1008; … … 1570 1571 snd_printk(KERN_INFO "EMU2 inputs on\n"); 1571 1572 for (z = 0; z < 0x10; z++) { 1572 snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &ptr, tmp, 1573 snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &ptr, tmp, 1573 1574 bit_shifter16, 1574 1575 A3_EMU32IN(z), … … 2295 2296 * and EXTOUT_ALFE, so we can't connect inputs to them for multitrack recording. 2296 2297 * 2297 * Since only 14 of the 16 EXTINs are used, this is not a big problem. 2298 * We route AC97L and R to FX capture 14 and 15, SPDIF CD in to FX capture 2299 * 0 and 3, then the rest of the EXTINs to the corresponding FX capture 2300 * channel. Multitrack recorders will still see the center/lfe output signal 2298 * Since only 14 of the 16 EXTINs are used, this is not a big problem. 2299 * We route AC97L and R to FX capture 14 and 15, SPDIF CD in to FX capture 2300 * 0 and 3, then the rest of the EXTINs to the corresponding FX capture 2301 * channel. Multitrack recorders will still see the center/lfe output signal 2301 2302 * on the second and third channels. 2302 2303 */ … … 2311 2312 OP(icode, &ptr, iACC3, FXBUS2(z), C_00000000, C_00000000, EXTIN(z)); 2312 2313 } 2313 2314 2314 2315 2315 2316 if (gpr > tmp) { -
GPL/trunk/alsa-kernel/pci/emu10k1/io.c
r426 r479 102 102 EXPORT_SYMBOL(snd_emu10k1_ptr_write); 103 103 104 unsigned int snd_emu10k1_ptr20_read(struct snd_emu10k1 * emu, 105 unsigned int reg, 104 unsigned int snd_emu10k1_ptr20_read(struct snd_emu10k1 * emu, 105 unsigned int reg, 106 106 unsigned int chn) 107 107 { 108 108 unsigned long flags; 109 109 unsigned int regptr, val; 110 110 111 111 regptr = (reg << 16) | chn; 112 112 … … 118 118 } 119 119 120 void snd_emu10k1_ptr20_write(struct snd_emu10k1 *emu, 121 unsigned int reg, 122 unsigned int chn, 120 void snd_emu10k1_ptr20_write(struct snd_emu10k1 *emu, 121 unsigned int reg, 122 unsigned int chn, 123 123 unsigned int data) 124 124 { … … 245 245 err = -EINVAL; 246 246 } 247 247 248 248 spin_unlock(&emu->i2c_lock); 249 249 return err; … … 257 257 return 1; 258 258 reg += 0x40; /* 0x40 upwards are registers. */ 259 if (value < 0 || value> 0x3f) /* 0 to 0x3f are values */259 if (value > 0x3f) /* 0 to 0x3f are values */ 260 260 return 1; 261 261 spin_lock_irqsave(&emu->emu_lock, flags); -
GPL/trunk/alsa-kernel/pci/hda/hda_codec.c
r464 r479 432 432 * process queued unsolicited events 433 433 */ 434 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) 434 435 static void process_unsol_events(struct work_struct *work) 435 436 { … … 453 454 } 454 455 } 456 #endif 455 457 456 458 /* … … 615 617 return NULL; /* use the generic parser */ 616 618 619 #ifndef TARGET_OS2 617 620 again: 621 #endif 618 622 mutex_lock(&preset_mutex); 619 623 list_for_each_entry(tbl, &hda_preset_tables, list, struct hda_codec_preset_list) { … … 2501 2505 if (err < 0) { 2502 2506 printk(KERN_ERR "hda_codec: cannot build controls" 2503 "for #%d (error %d)\n", codec->addr, err); 2507 "for #%d (error %d)\n", codec->addr, err); 2504 2508 err = snd_hda_codec_reset(codec); 2505 2509 if (err < 0) { … … 2963 2967 if (err < 0) { 2964 2968 printk(KERN_ERR "hda_codec: cannot build PCMs" 2965 "for #%d (error %d)\n", codec->addr, err); 2969 "for #%d (error %d)\n", codec->addr, err); 2966 2970 err = snd_hda_codec_reset(codec); 2967 2971 if (err < 0) { … … 3400 3404 /* turn off SPDIF once; otherwise the IEC958 bits won't be updated */ 3401 3405 if (codec->spdif_status_reset && (codec->spdif_ctls & AC_DIG1_ENABLE)) 3402 set_dig_out_convert(codec, nid, 3406 set_dig_out_convert(codec, nid, 3403 3407 codec->spdif_ctls & ~AC_DIG1_ENABLE & 0xff, 3404 3408 -1); … … 3660 3664 * output, i.e. to line_out_pins[0]. So, line_outs is always positive 3661 3665 * if any analog output exists. 3662 * 3666 * 3663 3667 * The analog input pins are assigned to input_pins array. 3664 3668 * The digital input/output pins are assigned to dig_in_pin and dig_out_pin,
Note:
See TracChangeset
for help on using the changeset viewer.