← Back to branch summary

~ubuntu-branches/ubuntu/trusty/alsa-lib/trusty

« back to all changes in this revision

Viewing changes to debian/patches/lp433573-Support-Echo3G.patch

  • Committer: Package Import Robot
  • Author(s): Luke Yelavich, Luke Yelavich
  • Date: 2013-07-26 10:54:32 UTC
  • mfrom: (1.1.17) (2.4.9 sid)
  • Revision ID: package-import@ubuntu.com-20130726105432-nbrwu6yk576ihzbb
Tags: 1.0.27.2-1ubuntu1
[ Luke Yelavich ]
* Merge from debian unstable.  Remaining changes:
  - debian/control: Add Vcs-Bzr URI
  - Show hints for non-standard devices that lack configuration files
  - Add a compile/run autopkg test
  - Add config file for the tegra alc5632 chip found in the AC100 netbook.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/lp433573-Support-Echo3G.patch
1
 
Index: alsa-lib-1.0.25/src/conf/cards/Echo_Echo3G.conf
2
 
===================================================================
3
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
4
 
+++ alsa-lib-1.0.25/src/conf/cards/Echo_Echo3G.conf     2012-02-08 13:48:32.729646737 +1100
5
 
@@ -0,0 +1,318 @@
6
 
+#
7
 
+# Configuration for the Echo3G driver
8
 
+#
9
 
+
10
 
+<confdir:pcm/front.conf>
11
 
+Echo_Echo3G.pcm.front.0 {
12
 
+       @args [ CARD ]
13
 
+       @args.CARD {
14
 
+               type string
15
 
+       }
16
 
+       type hw
17
 
+       card $CARD
18
 
+       device 0
19
 
+       subdevice 0
20
 
+}
21
 
+
22
 
+<confdir:pcm/rear.conf>
23
 
+Echo_Echo3G.pcm.rear.0 {
24
 
+       @args [ CARD ]
25
 
+       @args.CARD {
26
 
+               type string
27
 
+       }
28
 
+       type hw
29
 
+       card $CARD
30
 
+       device 0
31
 
+       subdevice 4
32
 
+}
33
 
+
34
 
+<confdir:pcm/center_lfe.conf>
35
 
+Echo_Echo3G.pcm.center_lfe.0 {
36
 
+       @args [ CARD ]
37
 
+       @args.CARD {
38
 
+               type string
39
 
+       }
40
 
+       type hw
41
 
+       card $CARD
42
 
+       device 0
43
 
+       subdevice 2
44
 
+}
45
 
+
46
 
+<confdir:pcm/side.conf>
47
 
+Echo_Echo3G.pcm.side.0 {
48
 
+       @args [ CARD ]
49
 
+       @args.CARD {
50
 
+               type string
51
 
+       }
52
 
+       type hw
53
 
+       card $CARD
54
 
+       device 0
55
 
+       subdevice 6
56
 
+}
57
 
+
58
 
+<confdir:pcm/surround40.conf>
59
 
+Echo_Echo3G.pcm.surround40.0 {
60
 
+       @args [ CARD ]
61
 
+       @args.CARD {
62
 
+               type string
63
 
+       }
64
 
+       type multi
65
 
+       slaves [
66
 
+               {
67
 
+                       pcm {
68
 
+                               @func concat
69
 
+                               strings [
70
 
+                                       "cards.Echo_Echo3G.pcm.front.0:CARD=" $CARD
71
 
+                               ]
72
 
+                       }
73
 
+                       channels 2
74
 
+               }
75
 
+               {
76
 
+                       pcm {
77
 
+                               @func concat
78
 
+                               strings [
79
 
+                                       "cards.Echo_Echo3G.pcm.rear.0:CARD=" $CARD
80
 
+                               ]
81
 
+                       }
82
 
+                       channels 2
83
 
+               }
84
 
+       ]
85
 
+       bindings [
86
 
+               { slave 0 channel 0 }
87
 
+               { slave 0 channel 1 }
88
 
+               { slave 1 channel 0 }
89
 
+               { slave 1 channel 1 }
90
 
+       ]
91
 
+}
92
 
+
93
 
+<confdir:pcm/surround41.conf>
94
 
+Echo_Echo3G.pcm.surround41.0 {
95
 
+       @args [ CARD ]
96
 
+       @args.CARD {
97
 
+               type string
98
 
+       }
99
 
+       type multi
100
 
+       slaves [
101
 
+               {
102
 
+                       pcm {
103
 
+                               @func concat
104
 
+                               strings [
105
 
+                                       "cards.Echo_Echo3G.pcm.front.0:CARD=" $CARD
106
 
+                               ]
107
 
+                       }
108
 
+                       channels 2
109
 
+               }
110
 
+               {
111
 
+                       pcm {
112
 
+                               @func concat
113
 
+                               strings [
114
 
+                                       "cards.Echo_Echo3G.pcm.rear.0:CARD=" $CARD
115
 
+                               ]
116
 
+                       }
117
 
+                       channels 2
118
 
+               }
119
 
+               {
120
 
+                       pcm {
121
 
+                               @func concat
122
 
+                               strings [
123
 
+                                       "cards.Echo_Echo3G.pcm.center_lfe.0:CARD=" $CARD
124
 
+                               ]
125
 
+                       }
126
 
+                       channels 2
127
 
+               }
128
 
+       ]
129
 
+       bindings [
130
 
+               { slave 0 channel 0 }
131
 
+               { slave 0 channel 1 }
132
 
+               { slave 1 channel 0 }
133
 
+               { slave 1 channel 1 }
134
 
+               { slave 2 channel 0 }
135
 
+       ]
136
 
+}
137
 
+
138
 
+<confdir:pcm/surround50.conf>
139
 
+Echo_Echo3G.pcm.surround50.0 {
140
 
+       @args [ CARD ]
141
 
+       @args.CARD {
142
 
+               type string
143
 
+       }
144
 
+       type multi
145
 
+       slaves [
146
 
+               {
147
 
+                       pcm {
148
 
+                               @func concat
149
 
+                               strings [
150
 
+                                       "cards.Echo_Echo3G.pcm.front.0:CARD=" $CARD
151
 
+                               ]
152
 
+                       }
153
 
+                       channels 2
154
 
+               }
155
 
+               {
156
 
+                       pcm {
157
 
+                               @func concat
158
 
+                               strings [
159
 
+                                       "cards.Echo_Echo3G.pcm.rear.0:CARD=" $CARD
160
 
+                               ]
161
 
+                       }
162
 
+                       channels 2
163
 
+               }
164
 
+               {
165
 
+                       pcm {
166
 
+                               @func concat
167
 
+                               strings [
168
 
+                                       "cards.Echo_Echo3G.pcm.center_lfe.0:CARD=" $CARD
169
 
+                               ]
170
 
+                       }
171
 
+                       channels 2
172
 
+               }
173
 
+       ]
174
 
+       bindings [
175
 
+               { slave 0 channel 0 }
176
 
+               { slave 0 channel 1 }
177
 
+               { slave 1 channel 0 }
178
 
+               { slave 1 channel 1 }
179
 
+               { slave 2 channel 1 }
180
 
+       ]
181
 
+}
182
 
+
183
 
+<confdir:pcm/surround51.conf>
184
 
+Echo_Echo3G.pcm.surround51.0 {
185
 
+       @args [ CARD ]
186
 
+       @args.CARD {
187
 
+               type string
188
 
+       }
189
 
+       type multi
190
 
+       slaves [
191
 
+               {
192
 
+                       pcm {
193
 
+                               @func concat
194
 
+                               strings [
195
 
+                                       "cards.Echo_Echo3G.pcm.front.0:CARD=" $CARD
196
 
+                               ]
197
 
+                       }
198
 
+                       channels 2
199
 
+               }
200
 
+               {
201
 
+                       pcm {
202
 
+                               @func concat
203
 
+                               strings [
204
 
+                                       "cards.Echo_Echo3G.pcm.rear.0:CARD=" $CARD
205
 
+                               ]
206
 
+                       }
207
 
+                       channels 2
208
 
+               }
209
 
+               {
210
 
+                       pcm {
211
 
+                               @func concat
212
 
+                               strings [
213
 
+                                       "cards.Echo_Echo3G.pcm.center_lfe.0:CARD=" $CARD
214
 
+                               ]
215
 
+                       }
216
 
+                       channels 2
217
 
+               }
218
 
+       ]
219
 
+       bindings [
220
 
+               { slave 0 channel 0 }
221
 
+               { slave 0 channel 1 }
222
 
+               { slave 1 channel 0 }
223
 
+               { slave 1 channel 1 }
224
 
+               { slave 2 channel 0 }
225
 
+               { slave 2 channel 1 }
226
 
+       ]
227
 
+}
228
 
+
229
 
+<confdir:pcm/surround71.conf>
230
 
+Echo_Echo3G.pcm.surround71.0 {
231
 
+       @args [ CARD ]
232
 
+       @args.CARD {
233
 
+               type string
234
 
+       }
235
 
+       type multi
236
 
+       slaves [
237
 
+               {
238
 
+                       pcm {
239
 
+                               @func concat
240
 
+                               strings [
241
 
+                                       "cards.Echo_Echo3G.pcm.front.0:CARD=" $CARD
242
 
+                               ]
243
 
+                       }
244
 
+                       channels 2
245
 
+               }
246
 
+               {
247
 
+                       pcm {
248
 
+                               @func concat
249
 
+                               strings [
250
 
+                                       "cards.Echo_Echo3G.pcm.rear.0:CARD=" $CARD
251
 
+                               ]
252
 
+                       }
253
 
+                       channels 2
254
 
+               }
255
 
+               {
256
 
+                       pcm {
257
 
+                               @func concat
258
 
+                               strings [
259
 
+                                       "cards.Echo_Echo3G.pcm.center_lfe.0:CARD=" $CARD
260
 
+                               ]
261
 
+                       }
262
 
+                       channels 2
263
 
+               }
264
 
+               {
265
 
+                       pcm {
266
 
+                               @func concat
267
 
+                               strings [
268
 
+                                       "cards.Echo_Echo3G.pcm.side.0:CARD=" $CARD
269
 
+                               ]
270
 
+                       }
271
 
+                       channels 2
272
 
+               }
273
 
+       ]
274
 
+       bindings [
275
 
+               { slave 0 channel 0 }
276
 
+               { slave 0 channel 1 }
277
 
+               { slave 1 channel 0 }
278
 
+               { slave 1 channel 1 }
279
 
+               { slave 2 channel 0 }
280
 
+               { slave 2 channel 1 }
281
 
+               { slave 3 channel 0 }
282
 
+               { slave 3 channel 1 }
283
 
+       ]
284
 
+}
285
 
+
286
 
+<confdir:pcm/iec958.conf>
287
 
+Echo_Echo3G.pcm.iec958.0 {
288
 
+       @args [ CARD AES0 AES1 AES2 AES3 ]
289
 
+       @args.CARD {
290
 
+               type string
291
 
+       }
292
 
+       @args.AES0 {
293
 
+               type integer
294
 
+       }
295
 
+       @args.AES1 {
296
 
+               type integer
297
 
+       }
298
 
+       @args.AES2 {
299
 
+               type integer
300
 
+       }
301
 
+       @args.AES3 {
302
 
+               type integer
303
 
+       }
304
 
+       type hooks
305
 
+       slave.pcm {
306
 
+               type hw
307
 
+               card $CARD
308
 
+               device 1
309
 
+       }
310
 
+
311
 
+       hooks.0 {
312
 
+               type ctl_elems
313
 
+               hook_args [
314
 
+                       {
315
 
+                               interface PCM
316
 
+                               name "IEC958 Playback Default"
317
 
+                               preserve true
318
 
+                               optional true
319
 
+                               value [ $AES0 $AES1 $AES2 $AES3 ]
320
 
+                       }
321
 
+               ]
322
 
+       }
323
 
+}
324
 
Index: alsa-lib-1.0.25/src/conf/cards/Makefile.am
325
 
===================================================================
326
 
--- alsa-lib-1.0.25.orig/src/conf/cards/Makefile.am     2012-01-25 18:56:56.000000000 +1100
327
 
+++ alsa-lib-1.0.25/src/conf/cards/Makefile.am  2012-02-08 13:49:24.909646241 +1100
328
 
@@ -19,6 +19,7 @@
329
 
        CMI8738-MC8.conf \
330
 
        CMI8788.conf \
331
 
        CS46xx.conf \
332
 
+       Echo_Echo3G.conf \
333
 
        EMU10K1.conf \
334
 
        EMU10K1X.conf \
335
 
        ENS1370.conf \