Commit e618a560 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/ctxfi' into for-linus 

* topic/ctxfi: (35 commits)
  ALSA: ctxfi - Clear PCM resources at hw_params and hw_free
  ALSA: ctxfi - Check the presence of SRC instance in PCM pointer callbacks
  ALSA: ctxfi - Add missing start check in atc_pcm_playback_start()
  ALSA: ctxfi - Add use_system_timer module option
  ALSA: ctxfi - Fix wrong model id for UAA
  ALSA: ctxfi - Clean up probe routines
  ALSA: ctxfi - Fix / clean up hw20k2 chip code
  ALSA: ctxfi - Fix possible buffer pointer overrun
  ALSA: ctxfi - Remove useless initializations and cast
  ALSA: ctxfi - Fix DMA mask for emu20k2 chip
  ALSA: ctxfi - Make volume controls more intuitive
  ALSA: ctxfi - Optimize the native timer handling using wc counter
  ALSA: ctxfi - Add missing inclusion of linux/math64.h
  ALSA: ctxfi - Set device 0 for mixer control elements
  ALSA: ctxfi - Clean up / optimize
  ALSA: ctxfi - Set periods_min to 2
  ALSA: ctxfi - Use native timer interrupt on emu20k1
  ALSA: ctxfi - Fix previous fix for 64bit DMA
  ALSA: ctxfi - Fix endian-dependent codes
  ALSA: ctxfi - Allow 64bit DMA
  ...
parents d3e37436 a5990dc5

Documentation/sound/alsa/ALSA-Configuration.txt

+19 −0
Original line number Diff line number Diff line
@@ -460,6 +460,25 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 


    The power-management is supported.



  Module snd-ctxfi

  ----------------



    Module for Creative Sound Blaster X-Fi boards (20k1 / 20k2 chips)

	* Creative Sound Blaster X-Fi Titanium Fatal1ty Champion Series

	* Creative Sound Blaster X-Fi Titanium Fatal1ty Professional Series

	* Creative Sound Blaster X-Fi Titanium Professional Audio

	* Creative Sound Blaster X-Fi Titanium

	* Creative Sound Blaster X-Fi Elite Pro

	* Creative Sound Blaster X-Fi Platinum

	* Creative Sound Blaster X-Fi Fatal1ty

	* Creative Sound Blaster X-Fi XtremeGamer

	* Creative Sound Blaster X-Fi XtremeMusic



    reference_rate	- reference sample rate, 44100 or 48000 (default)

    multiple		- multiple to ref. sample rate, 1 or 2 (default)



    This module supports multiple cards.



  Module snd-darla20

  ------------------

include/linux/pci_ids.h

+7 −0
Original line number Diff line number Diff line
@@ -1314,6 +1314,13 @@ 


#define PCI_VENDOR_ID_CREATIVE		0x1102 /* duplicate: ECTIVA */

#define PCI_DEVICE_ID_CREATIVE_EMU10K1	0x0002

#define PCI_DEVICE_ID_CREATIVE_20K1	0x0005

#define PCI_DEVICE_ID_CREATIVE_20K2	0x000b

#define PCI_SUBDEVICE_ID_CREATIVE_SB0760	0x0024

#define PCI_SUBDEVICE_ID_CREATIVE_SB08801	0x0041

#define PCI_SUBDEVICE_ID_CREATIVE_SB08802	0x0042

#define PCI_SUBDEVICE_ID_CREATIVE_SB08803	0x0043

#define PCI_SUBDEVICE_ID_CREATIVE_HENDRIX	0x6000



#define PCI_VENDOR_ID_ECTIVA		0x1102 /* duplicate: CREATIVE */

#define PCI_DEVICE_ID_ECTIVA_EV1938	0x8938

sound/pci/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -275,6 +275,16 @@ config SND_CS5535AUDIO 
	  To compile this driver as a module, choose M here: the module

	  will be called snd-cs5535audio.



config SND_CTXFI

	tristate "Creative Sound Blaster X-Fi"

	select SND_PCM

	help

	  If you want to use soundcards based on Creative Sound Blastr X-Fi

	  boards with 20k1 or 20k2 chips, say Y here.



	  To compile this driver as a module, choose M here: the module

	  will be called snd-ctxfi.



config SND_DARLA20

	tristate "(Echoaudio) Darla20"

	select FW_LOADER

sound/pci/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ obj-$(CONFIG_SND) += \ 
	ali5451/ \

	au88x0/ \

	aw2/ \

	ctxfi/ \

	ca0106/ \

	cs46xx/ \

	cs5535audio/ \

sound/pci/ctxfi/Makefile

0 → 100644
+5 −0
Original line number Diff line number Diff line 
snd-ctxfi-objs := xfi.o ctatc.o ctvmem.o ctpcm.o ctmixer.o ctresource.o \

	ctsrc.o ctamixer.o ctdaio.o ctimap.o cthardware.o cttimer.o \

	cthw20k2.o cthw20k1.o



obj-$(CONFIG_SND_CTXFI) += snd-ctxfi.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE