mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-12-16 08:56:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added missing iec958.conf.

Browse source 
Added defaults for iec958.
Fixed slave type in IEC1712.conf.
Corrected config file for CMI8738.
This commit is contained in:
Takashi Iwai 2001-06-22 09:01:22 +00:00
parent be8e3bb72d
commit 828562a5ee
4 changed files with 103 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/conf/alsa.conf
View file

@ -49,6 +49,8 @@ defaults.pcm.surround40.card defaults.pcm.card
defaults.pcm.surround40.device defaults.pcm.device defaults.pcm.surround40.device defaults.pcm.device
defaults.pcm.surround51.card defaults.pcm.card defaults.pcm.surround51.card defaults.pcm.card
defaults.pcm.surround51.device defaults.pcm.device defaults.pcm.surround51.device defaults.pcm.device
defaults.pcm.iec958.card defaults.pcm.card
defaults.pcm.iec958.device defaults.pcm.device
defaults.rawmidi.card 0 defaults.rawmidi.card 0
defaults.rawmidi.device 0 defaults.rawmidi.device 0
defaults.rawmidi.subdevice -1 defaults.rawmidi.subdevice -1
@ -243,6 +245,8 @@ pcm.rear cards.pcm.rear
pcm.center_lfe cards.pcm.center_lfe pcm.center_lfe cards.pcm.center_lfe
pcm.surround40 cards.pcm.surround40 pcm.surround40 cards.pcm.surround40
pcm.surround51 cards.pcm.surround51 pcm.surround51 cards.pcm.surround51
pcm.iec958 cards.pcm.iec958
pcm.spdif cards.pcm.iec958
# #
# Control interface # Control interface

41
src/conf/cards/CMIPCI.conf → src/conf/cards/CMI8738.conf
View file

@ -2,7 +2,9 @@
# Configuration for the CMIPCI chip # Configuration for the CMIPCI chip
# #
CMIPCI.pcm.front.0 { <confdir:pcm/front.conf>
CMI8738.pcm.front.0 {
@args [ CARD ] @args [ CARD ]
@args.CARD { @args.CARD {
type string type string
@ -12,9 +14,11 @@ CMIPCI.pcm.front.0 {
device 0 device 0
} }
<confdir:pcm/rear.conf>
# 2nd DAC # 2nd DAC
# FIXME: we need a volume attenuator for rear channel. # FIXME: we need a volume attenuator for rear channel.
CMIPCI.pcm.rear.0 { CMI8738.pcm.rear.0 {
@args [ CARD ] @args [ CARD ]
@args.CARD { @args.CARD {
type string type string
@ -24,12 +28,10 @@ CMIPCI.pcm.rear.0 {
device 1 device 1
} }
# for the recent CM8738 chips <confdir:pcm/surround40.conf>
# cards.CMIPCI.pcm.surround40.0 "cards.CMIPCI.pcm.front.0"
CMIPCI.pcm.surround51.0 "cards.CMIPCI.pcm.front.0"
# for the old CM8738 with 2nd DAC for rear # for the old CM8738 with 2nd DAC for rear
CMIPCI.pcm.surround40.0 { CMI8738.pcm.surround40.0 {
@args [ CARD ] @args [ CARD ]
@args.CARD { @args.CARD {
type string type string
@ -41,7 +43,7 @@ CMIPCI.pcm.surround40.0 {
pcm { pcm {
@func concat @func concat
strings [ strings [
"cards.CMIPCI.pcm.front.0:CARD=" $CARD "cards.CMI8738.pcm.front.0:CARD=" $CARD
] ]
} }
channels 2 channels 2
@ -50,7 +52,7 @@ CMIPCI.pcm.surround40.0 {
pcm { pcm {
@func concat @func concat
strings [ strings [
"cards.CMIPCI.pcm.rear.0:CARD=" $CARD "cards.CMI8738.pcm.rear.0:CARD=" $CARD
] ]
} }
channels 2 channels 2
@ -64,8 +66,17 @@ CMIPCI.pcm.surround40.0 {
] ]
} }
# for the recent CM8738 chips
# cards.CMI8738.pcm.surround40.0 "cards.CMI8738.pcm.front.0"
CMIPCI.pcm.iec958.0 {
<confdir:pcm/surround51.conf>
CMI8738.pcm.surround51.0 "cards.CMI8738.pcm.front.0"
<confdir:pcm/iec958.conf>
CMI8738.pcm.iec958.0 {
@args [ CARD DEV AES0 AES1 AES2 AES3 ] @args [ CARD DEV AES0 AES1 AES2 AES3 ]
@args.CARD { @args.CARD {
type string type string
@ -86,18 +97,18 @@ CMIPCI.pcm.iec958.0 {
type integer type integer
} }
type hooks type hooks
slave.pcm {
type hw
card $CARD
device 2
}
hooks.0 { hooks.0 {
type ctl_elems type ctl_elems
hook_args [ hook_args [
{
name "IEC958 Enable"
value 1
lock true
preserve true
}
{ {
interface PCM interface PCM
name "IEC958 Playback PCM Stream" name "IEC958 Playback PCM Stream"
device 2
lock true lock true
preserve true preserve true
value [ $AES0 $AES1 $AES2 $AES3 ] value [ $AES0 $AES1 $AES2 $AES3 ]

2
src/conf/cards/ICE1712.conf
View file

@ -80,7 +80,7 @@ ICE1712.pcm.iec958.0 {
} }
type hooks type hooks
slave.pcm { slave.pcm {
type plug type route
ttable.0.8 1 ttable.0.8 1
ttable.1.9 1 ttable.1.9 1
card $CARD card $CARD

72
src/conf/pcm/iec958.conf Normal file
View file

@ -0,0 +1,72 @@
#
# Hardware output from iec958
#
pcm.!iec958 {
@args [ CARD DEV AES0 AES1 AES2 AES3 ]
@args.CARD {
type string
default {
@func getenv
vars [
ALSA_IEC958_CARD
ALSA_PCM_CARD
ALSA_CARD
]
default {
@func refer
name defaults.pcm.iec958.card
}
}
}
@args.DEV {
type integer
default {
@func igetenv
vars [
ALSA_IEC958_DEVICE
]
default {
@func refer
name defaults.pcm.iec958.device
}
}
}
@args.AES0 {
type integer
# consumer, not-copyright, emphasis-none, mode=0
default 0x04
}
@args.AES1 {
type integer
# original, PCM coder
default 0x82
}
@args.AES2 {
type integer
# source and channel
default 0x00
}
@args.AES3 {
type integer
# fs=48000Hz, clock accuracy=1000ppm
default 0x02
}
@func refer
name {
@func concat
strings [
"cards."
{
@func card_strtype
card $CARD
}
".pcm.iec958." $DEV ":"
"CARD=" $CARD ","
"AES0=" $AES0 ","
"AES1=" $AES1 ","
"AES2=" $AES2 ","
"AES3=" $AES3
]
}
}