mirror of
https://github.com/alsa-project/alsa-lib.git
synced 2025-11-06 13:29:59 -05:00
Reorganized configuration files (card->type removal).
This commit is contained in:
Jaroslav Kysela
parent
828562a5ee
commit
25947ba008
15 changed files with 136 additions and 1125 deletions
|
|
@ -1,6 +1,6 @@
|
|||
SUBDIRS=cards pcm
|
||||
|
||||
cfg_files = alsa.conf cards.conf
|
||||
cfg_files = alsa.conf
|
||||
|
||||
EXTRA_DIST = $(cfg_files)
|
||||
|
||||
|
|
|
|||
|
|
@ -18,6 +18,18 @@
|
|||
# load card-specific configuration files (on request)
|
||||
|
||||
cards.@hooks [
|
||||
{
|
||||
func load
|
||||
files [
|
||||
{
|
||||
@func concat
|
||||
strings [
|
||||
{ @func datadir }
|
||||
"/cards/aliases.conf"
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
{
|
||||
func load_for_all_cards
|
||||
files [
|
||||
|
|
|
|||
|
|
@ -1,76 +0,0 @@
|
|||
#
|
||||
# Card ID translation table from string to numeric.
|
||||
#
|
||||
|
||||
card.GUS_CLASSIC = 0; # GUS Classic
|
||||
card.GUS_EXTREME = 1; # GUS Extreme
|
||||
card.GUS_ACE = 2; # GUS ACE
|
||||
card.GUS_MAX = 3; # GUS MAX
|
||||
card.AMD_INTERWAVE = 4; # AMD InterWave
|
||||
card.SB_10 = 5; # SoundBlaster v1.0
|
||||
card.SB_20 = 6; # SoundBlaster v2.0
|
||||
card.SB_PRO = 7; # SoundBlaster Pro
|
||||
card.SB_16 = 8; # SoundBlaster 16
|
||||
card.SB_AWE = 9; # SoundBlaster AWE
|
||||
card.ESS_ES1688 = 10; # ESS AudioDrive ESx688
|
||||
card.OPL3_SA2 = 11; # Yamaha OPL3 SA2/SA3
|
||||
card.MOZART = 12; # OAK Mozart
|
||||
card.S3_SONICVIBES = 13; # S3 SonicVibes
|
||||
card.ENS1370 = 14; # Ensoniq ES1370
|
||||
card.ENS1371 = 15; # Ensoniq ES1371
|
||||
card.CS4232 = 16; # CS4232/CS4232A
|
||||
card.CS4236 = 17; # CS4235/CS4236B/CS4237B/CS4238B/CS4239
|
||||
card.AMD_INTERWAVE_STB = 18; # AMD InterWave + TEA6330T
|
||||
card.ESS_ES1938 = 19; # ESS Solo-1 ES1938
|
||||
card.ESS_ES18XX = 20; # ESS AudioDrive ES18XX
|
||||
card.CS4231 = 21; # CS4231
|
||||
card.OPTI92X = 22; # OPTi 92x chipset
|
||||
card.SERIAL = 23; # Serial MIDI driver
|
||||
card.AD1848 = 24; # Generic AD1848 driver
|
||||
card.TRID4DWAVEDX = 25; # Trident 4DWave DX
|
||||
card.TRID4DWAVENX = 26; # Trident 4DWave NX
|
||||
card.SGALAXY = 27; # Aztech Sound Galaxy
|
||||
card.CS46XX = 28; # Sound Fusion CS4610/12/15
|
||||
card.WAVEFRONT = 29; # TB WaveFront generic
|
||||
card.TROPEZ = 30; # TB Tropez
|
||||
card.TROPEZPLUS = 31; # TB Tropez+
|
||||
card.MAUI = 32; # TB Maui
|
||||
card.CMI8330 = 33; # C-Media CMI8330
|
||||
card.DUMMY = 34; # dummy soundcard
|
||||
card.ALS100 = 35; # Avance Logic ALS100
|
||||
card.SHARE = 36; # share soundcard
|
||||
card.SI_7018 = 37; # SiS 7018
|
||||
card.OPTI93X = 38; # OPTi 93x chipset
|
||||
card.MTPAV = 39; # MOTU MidiTimePiece AV multiport MIDI
|
||||
card.VIRMIDI = 40; # Virtual MIDI
|
||||
card.EMU10K1 = 41; # EMU10K1
|
||||
card.HAMMERFALL = 42; # RME Digi9652
|
||||
card.HAMMERFALL_LIGHT = 43; # RME Digi9652, but no expansion card
|
||||
card.ICE1712 = 44; # ICE1712
|
||||
card.CMI8338 = 45; # C-Media CMI8338
|
||||
card.CMI8738 = 46; # C-Media CMI8738
|
||||
card.AD1816A = 47; # ADI SoundPort AD1816A
|
||||
card.INTEL8X0 = 48; # Intel 810/820/830/840/MX440
|
||||
card.ESS_ESOLDM1 = 49; # Maestro 1
|
||||
card.ESS_ES1968 = 50; # Maestro 2
|
||||
card.ESS_ES1978 = 51; # Maestro 2E
|
||||
card.DIGI96 = 52; # RME Digi96
|
||||
card.VIA82C686A = 53; # VIA 82C686A
|
||||
card.FM801 = 54; # FM801
|
||||
card.AZT2320 = 55; # AZT2320
|
||||
card.PRODIF_PLUS = 56; # Marian/Sek'D Prodif Plus
|
||||
card.YMFPCI = 57; # YMF724/740/744/754
|
||||
card.CS4281 = 58; # CS4281
|
||||
card.MPU401_UART = 59; # MPU-401 UART
|
||||
card.ALS4000 = 60; # Avance Logic ALS4000
|
||||
card.ALLEGRO_1 = 61; # ESS Allegro-1
|
||||
card.ALLEGRO = 62; # ESS Allegro
|
||||
card.MAESTRO3 = 63; # ESS Maestro3
|
||||
card.AWACS = 64; # PMac AWACS
|
||||
card.NM256AV = 65; # NM256AV
|
||||
card.NM256ZX = 66; # NM256ZX
|
||||
card.VIA8233 = 67; # VIA VT8233
|
||||
card.PMAC_AWACS = 68; # PMac AWACS
|
||||
card.PMAC_BURGUNDY = 69; # PMac Burgundy
|
||||
card.PMAC_DACA = 70; # PMac DACA
|
||||
card.ALI5451 = 71; # ALi PCI Audio M5451
|
||||
103
src/conf/cards/CMI8338.conf
Normal file
103
src/conf/cards/CMI8338.conf
Normal file
|
|
@ -0,0 +1,103 @@
|
|||
#
|
||||
# Configuration for the CMI8338 chip
|
||||
#
|
||||
|
||||
CMI8338.pcm.front.0 {
|
||||
@args [ CARD ]
|
||||
@args.CARD {
|
||||
type string
|
||||
}
|
||||
type hw
|
||||
card $CARD
|
||||
device 0
|
||||
}
|
||||
|
||||
# 2nd DAC
|
||||
# FIXME: we need a volume attenuator for rear channel.
|
||||
CMI8338.pcm.rear.0 {
|
||||
@args [ CARD ]
|
||||
@args.CARD {
|
||||
type string
|
||||
}
|
||||
type hw
|
||||
card $CARD
|
||||
device 1
|
||||
}
|
||||
|
||||
# for the old CM8738 with 2nd DAC for rear
|
||||
CMI8338.pcm.surround40.0 {
|
||||
@args [ CARD ]
|
||||
@args.CARD {
|
||||
type string
|
||||
}
|
||||
type multi
|
||||
master 1
|
||||
slaves [
|
||||
{
|
||||
pcm {
|
||||
@func concat
|
||||
strings [
|
||||
"cards.CMI8338.pcm.front.0:CARD=" $CARD
|
||||
]
|
||||
}
|
||||
channels 2
|
||||
}
|
||||
{
|
||||
pcm {
|
||||
@func concat
|
||||
strings [
|
||||
"cards.CMI8338.pcm.rear.0:CARD=" $CARD
|
||||
]
|
||||
}
|
||||
channels 2
|
||||
}
|
||||
]
|
||||
bindings [
|
||||
{ slave 0 channel 0 }
|
||||
{ slave 0 channel 1 }
|
||||
{ slave 1 channel 0 }
|
||||
{ slave 1 channel 1 }
|
||||
]
|
||||
}
|
||||
|
||||
|
||||
CMI8338.pcm.iec958.0 {
|
||||
@args [ CARD DEV AES0 AES1 AES2 AES3 ]
|
||||
@args.CARD {
|
||||
type string
|
||||
}
|
||||
@args.DEV {
|
||||
type integer
|
||||
}
|
||||
@args.AES0 {
|
||||
type integer
|
||||
}
|
||||
@args.AES1 {
|
||||
type integer
|
||||
}
|
||||
@args.AES2 {
|
||||
type integer
|
||||
}
|
||||
@args.AES3 {
|
||||
type integer
|
||||
}
|
||||
type hooks
|
||||
hooks.0 {
|
||||
type ctl_elems
|
||||
hook_args [
|
||||
{
|
||||
name "IEC958 Enable"
|
||||
value 1
|
||||
lock true
|
||||
preserve true
|
||||
}
|
||||
{
|
||||
interface PCM
|
||||
name "IEC958 Playback PCM Stream"
|
||||
lock true
|
||||
preserve true
|
||||
value [ $AES0 $AES1 $AES2 $AES3 ]
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
alsadir = $(datadir)/alsa/cards
|
||||
cfg_files = SI_7018.conf EMU10K1.conf TRID4DWAVENX.conf ENS1370.conf \
|
||||
INTEL8X0.conf YMFPCI.conf FM801.conf ICE1712.conf CMIPCI.conf
|
||||
cfg_files = aliases.conf SI7018.conf EMU10K1.conf TRID4DWAVENX.conf ENS1370.conf \
|
||||
INTEL8X0.conf YMF744.conf FM801.conf ICE1712.conf CMI8338.conf CMI8x38.conf
|
||||
|
||||
EXTRA_DIST = $(cfg_files)
|
||||
alsa_DATA = $(cfg_files)
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
<confdir:pcm/front.conf>
|
||||
|
||||
SI_7018.pcm.front.0 {
|
||||
SI7018.pcm.front.0 {
|
||||
@args [ CARD ]
|
||||
@args.CARD {
|
||||
type string
|
||||
|
|
@ -16,7 +16,7 @@ SI_7018.pcm.front.0 {
|
|||
|
||||
<confdir:pcm/rear.conf>
|
||||
|
||||
SI_7018.pcm.rear.0 {
|
||||
SI7018.pcm.rear.0 {
|
||||
@args [ CARD ]
|
||||
@args.CARD {
|
||||
type string
|
||||
|
|
@ -42,7 +42,7 @@ SI_7018.pcm.rear.0 {
|
|||
|
||||
<confdir:pcm/surround40.conf>
|
||||
|
||||
SI_7018.pcm.surround40.0 {
|
||||
SI7018.pcm.surround40.0 {
|
||||
@args [ CARD ]
|
||||
@args.CARD {
|
||||
type string
|
||||
|
|
@ -53,7 +53,7 @@ SI_7018.pcm.surround40.0 {
|
|||
pcm {
|
||||
@func concat
|
||||
strings [
|
||||
"cards.SI_7018.pcm.front.0:CARD=" $CARD
|
||||
"cards.SI7018.pcm.front.0:CARD=" $CARD
|
||||
]
|
||||
}
|
||||
channels 2
|
||||
|
|
@ -62,7 +62,7 @@ SI_7018.pcm.surround40.0 {
|
|||
pcm {
|
||||
@func concat
|
||||
strings [
|
||||
"cards.SI_7018.pcm.rear.0:CARD=" $CARD
|
||||
"cards.SI7018.pcm.rear.0:CARD=" $CARD
|
||||
]
|
||||
}
|
||||
channels 2
|
||||
11
src/conf/cards/aliases.conf
Normal file
11
src/conf/cards/aliases.conf
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
#
|
||||
# Define aliases for various drivers
|
||||
#
|
||||
|
||||
YMF724 cards.YMF744
|
||||
YMF724F cards.YMF744
|
||||
YMF740 cards.YMF744
|
||||
YMF740C cards.YMF744
|
||||
YMF754 cards.YMF744
|
||||
CMI8378 cards.CMI8338
|
||||
'E-mu APS' cards.EMU10K1
|
||||
Loading…
Add table
Add a link
Reference in a new issue