Merge pull request #3770 from fritsch/usb5.0alsa

alsa-lib: Fix PHIREE U2 and Soundblaster F-Xi XD
This commit is contained in:
Stefan Saraev 2015-01-11 15:45:51 +02:00
commit 92823333c1

View File

@ -0,0 +1,69 @@
From 01b686cf032d523642c5ab33f455d814ef468925 Mon Sep 17 00:00:00 2001
From: fritsch <Peter.Fruehberger@gmail.com>
Date: Sat, 10 Jan 2015 23:47:58 +0100
Subject: [PATCH] Support PHIREE U2 and Sound blaster F-Xi HD (done by Anssih)
---
src/conf/cards/USB-Audio.conf | 41 ++++++++++++++++++++++++++++++++++++++++-
1 file changed, 40 insertions(+), 1 deletion(-)
diff --git a/src/conf/cards/USB-Audio.conf b/src/conf/cards/USB-Audio.conf
index ce3ae01..107d6fa 100644
--- a/src/conf/cards/USB-Audio.conf
+++ b/src/conf/cards/USB-Audio.conf
@@ -52,6 +52,10 @@ USB-Audio.pcm.iec958_device {
"USB Device 0x46d:0x992" 999
}
+USB-Audio.pcm.iec958_2_device {
+ "PHIREE U2" 1
+ "USB Sound Blaster HD" 1
+}
# If a device requires non-standard definitions for front, surround40,
# surround51, surround71 or iec958, they can be defined here.
@@ -422,4 +426,39 @@ USB-Audio.pcm.iec958.0 {
}
}
-# vim: ft=alsaconf
+USB-Audio.pcm.iec958.1 {
+ @args [ CARD AES0 AES1 AES2 AES3 ]
+ @args.CARD { type string }
+ @args.AES0 { type integer }
+ @args.AES1 { type integer }
+ @args.AES2 { type integer }
+ @args.AES3 { type integer }
+ @func refer
+ name {
+ @func concat
+ strings [
+ "cards.USB-Audio."
+ { @func card_name card $CARD }
+ ".pcm.iec958_2:CARD=" $CARD
+ ",AES0=" $AES0 ",AES1=" $AES1 ",AES2=" $AES2 ",AES3=" $AES3
+ ]
+ }
+ default {
+ # FIXME: we cannot set the AES parameters
+ type hw
+ card $CARD
+ device {
+ @func refer
+ name {
+ @func concat
+ strings [
+ "cards.USB-Audio.pcm.iec958_2_device."
+ { @func card_name card $CARD }
+ ]
+ }
+ default 999
+ }
+ }
+}
+
+# vim: ft=alsaconf
\ No newline at end of file
--
1.9.1