mirror of
				https://github.com/alsa-project/alsa-lib.git
				synced 2025-11-03 09:01:52 -05:00 
			
		
		
		
	Corrected configuration for CMI8338/8738.
- CMI8738 is aliased to CMI8338. - New config file for multi channel cards with -MCx suffix
This commit is contained in:
		
							parent
							
								
									a4fe7862bd
								
							
						
					
					
						commit
						960a43503d
					
				
					 4 changed files with 24 additions and 53 deletions
				
			
		| 
						 | 
				
			
			@ -1,7 +1,9 @@
 | 
			
		|||
#
 | 
			
		||||
# Configuration for the CMI8338 chip
 | 
			
		||||
# Configuration for the CMI8338/8738 chip (w/o multi-channel support)
 | 
			
		||||
#
 | 
			
		||||
 | 
			
		||||
<confdir:pcm/front.conf>
 | 
			
		||||
 | 
			
		||||
CMI8338.pcm.front.0 {
 | 
			
		||||
	@args [ CARD ]
 | 
			
		||||
	@args.CARD {
 | 
			
		||||
| 
						 | 
				
			
			@ -12,6 +14,8 @@ CMI8338.pcm.front.0 {
 | 
			
		|||
	device 0
 | 
			
		||||
}	
 | 
			
		||||
 | 
			
		||||
<confdir:pcm/rear.conf>
 | 
			
		||||
 | 
			
		||||
# 2nd DAC
 | 
			
		||||
# FIXME: we need a volume attenuator for rear channel.
 | 
			
		||||
CMI8338.pcm.rear.0 {
 | 
			
		||||
| 
						 | 
				
			
			@ -24,6 +28,8 @@ CMI8338.pcm.rear.0 {
 | 
			
		|||
	device 1
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
<confdir:pcm/surround40.conf>
 | 
			
		||||
 | 
			
		||||
# for the old CM8738 with 2nd DAC for rear
 | 
			
		||||
CMI8338.pcm.surround40.0 {
 | 
			
		||||
	@args [ CARD ]
 | 
			
		||||
| 
						 | 
				
			
			@ -60,6 +66,7 @@ CMI8338.pcm.surround40.0 {
 | 
			
		|||
	]
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
<confdir:pcm/iec958.conf>
 | 
			
		||||
 | 
			
		||||
CMI8338.pcm.iec958.0 {
 | 
			
		||||
	@args [ CARD DEV AES0 AES1 AES2 AES3 ]
 | 
			
		||||
| 
						 | 
				
			
			@ -82,18 +89,18 @@ CMI8338.pcm.iec958.0 {
 | 
			
		|||
		type integer
 | 
			
		||||
	}
 | 
			
		||||
	type hooks
 | 
			
		||||
	slave.pcm {
 | 
			
		||||
		type hw
 | 
			
		||||
		card $CARD
 | 
			
		||||
		device 2
 | 
			
		||||
	}
 | 
			
		||||
	hooks.0 {
 | 
			
		||||
		type ctl_elems
 | 
			
		||||
		hook_args [
 | 
			
		||||
			{
 | 
			
		||||
				name "IEC958 Enable"
 | 
			
		||||
				value 1
 | 
			
		||||
				lock true
 | 
			
		||||
				preserve true
 | 
			
		||||
			}
 | 
			
		||||
			{
 | 
			
		||||
				interface PCM
 | 
			
		||||
				name "IEC958 Playback PCM Stream"
 | 
			
		||||
				device 2
 | 
			
		||||
				lock true
 | 
			
		||||
				preserve true
 | 
			
		||||
				value [ $AES0 $AES1 $AES2 $AES3 ]
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,10 +1,10 @@
 | 
			
		|||
#
 | 
			
		||||
# Configuration for the CMIPCI chip
 | 
			
		||||
# Configuration for the CMI8738 chip with 4/6 multi-channel support
 | 
			
		||||
#
 | 
			
		||||
 | 
			
		||||
<confdir:pcm/front.conf>
 | 
			
		||||
 | 
			
		||||
CMI8738.pcm.front.0 {
 | 
			
		||||
CMI8738-MC6.pcm.front.0 {
 | 
			
		||||
	@args [ CARD ]
 | 
			
		||||
	@args.CARD {
 | 
			
		||||
		type string
 | 
			
		||||
| 
						 | 
				
			
			@ -18,7 +18,7 @@ CMI8738.pcm.front.0 {
 | 
			
		|||
 | 
			
		||||
# 2nd DAC
 | 
			
		||||
# FIXME: we need a volume attenuator for rear channel.
 | 
			
		||||
CMI8738.pcm.rear.0 {
 | 
			
		||||
CMI8738-MC6.pcm.rear.0 {
 | 
			
		||||
	@args [ CARD ]
 | 
			
		||||
	@args.CARD {
 | 
			
		||||
		type string
 | 
			
		||||
| 
						 | 
				
			
			@ -30,53 +30,15 @@ CMI8738.pcm.rear.0 {
 | 
			
		|||
 | 
			
		||||
<confdir:pcm/surround40.conf>
 | 
			
		||||
 | 
			
		||||
# for the old CM8738 with 2nd DAC for rear
 | 
			
		||||
CMI8738.pcm.surround40.0 {
 | 
			
		||||
	@args [ CARD ]
 | 
			
		||||
	@args.CARD {
 | 
			
		||||
		type string
 | 
			
		||||
	}
 | 
			
		||||
	type multi
 | 
			
		||||
	master 1
 | 
			
		||||
	slaves [
 | 
			
		||||
		{
 | 
			
		||||
			pcm {
 | 
			
		||||
				@func concat
 | 
			
		||||
				strings [
 | 
			
		||||
					"cards.CMI8738.pcm.front.0:CARD=" $CARD
 | 
			
		||||
				]
 | 
			
		||||
			}
 | 
			
		||||
			channels 2
 | 
			
		||||
		}
 | 
			
		||||
		{
 | 
			
		||||
			pcm {
 | 
			
		||||
				@func concat
 | 
			
		||||
				strings [
 | 
			
		||||
					"cards.CMI8738.pcm.rear.0:CARD=" $CARD
 | 
			
		||||
				]
 | 
			
		||||
			}
 | 
			
		||||
			channels 2
 | 
			
		||||
		}
 | 
			
		||||
	]
 | 
			
		||||
	bindings [
 | 
			
		||||
		{ slave 0 channel 0 }
 | 
			
		||||
		{ slave 0 channel 1 }
 | 
			
		||||
		{ slave 1 channel 0 }
 | 
			
		||||
		{ slave 1 channel 1 }
 | 
			
		||||
	]
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
# for the recent CM8738 chips
 | 
			
		||||
# cards.CMI8738.pcm.surround40.0 "cards.CMI8738.pcm.front.0"
 | 
			
		||||
 | 
			
		||||
CMI8738-MC6.pcm.surround40.0 "cards.CMI8738-MC6.pcm.front.0"
 | 
			
		||||
 | 
			
		||||
<confdir:pcm/surround51.conf>
 | 
			
		||||
 | 
			
		||||
CMI8738.pcm.surround51.0 "cards.CMI8738.pcm.front.0"
 | 
			
		||||
CMI8738-MC6.pcm.surround51.0 "cards.CMI8738-MC6.pcm.front.0"
 | 
			
		||||
 | 
			
		||||
<confdir:pcm/iec958.conf>
 | 
			
		||||
 | 
			
		||||
CMI8738.pcm.iec958.0 {
 | 
			
		||||
CMI8738-MC6.pcm.iec958.0 {
 | 
			
		||||
	@args [ CARD DEV AES0 AES1 AES2 AES3 ]
 | 
			
		||||
	@args.CARD {
 | 
			
		||||
		type string
 | 
			
		||||
| 
						 | 
				
			
			@ -1,6 +1,6 @@
 | 
			
		|||
alsadir = $(datadir)/alsa/cards
 | 
			
		||||
cfg_files = aliases.conf SI7018.conf EMU10K1.conf TRID4DWAVENX.conf ENS1370.conf \
 | 
			
		||||
	    ICH.conf YMF744.conf FM801.conf ICE1712.conf CMI8338.conf CMI8x78.conf
 | 
			
		||||
	    ICH.conf YMF744.conf FM801.conf ICE1712.conf CMI8338.conf CMI8738-MC6.conf
 | 
			
		||||
 | 
			
		||||
EXTRA_DIST = $(cfg_files)
 | 
			
		||||
alsa_DATA = $(cfg_files)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -7,5 +7,7 @@ YMF724F cards.YMF744
 | 
			
		|||
YMF740 cards.YMF744
 | 
			
		||||
YMF740C cards.YMF744
 | 
			
		||||
YMF754 cards.YMF744
 | 
			
		||||
CMI8378 cards.CMI8338
 | 
			
		||||
CMIPCI cards.CMI8338
 | 
			
		||||
CMI8738 cards.CMI8338
 | 
			
		||||
CMI8738-MC4 cards.CMI8738-MC6
 | 
			
		||||
'E-mu APS' cards.EMU10K1
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue