1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
|
--- ../alsa-kernel/usb/usbaudio.c 2006-06-20 12:49:23.000000000 +0200
+++ usbaudio.c 2006-06-20 12:51:01.000000000 +0200
@@ -1,3 +1,4 @@
+#include "usbaudio.inc"
/*
* (Tentative) USB Audio Driver for ALSA
*
@@ -69,7 +70,12 @@
static int vid[SNDRV_CARDS] = { [0 ... (SNDRV_CARDS-1)] = -1 }; /* Vendor ID for this card */
static int pid[SNDRV_CARDS] = { [0 ... (SNDRV_CARDS-1)] = -1 }; /* Product ID for this card */
static int nrpacks = 8; /* max. number of packets per urb */
-static int async_unlink = 1;
+static int async_unlink =
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
+1;
+#else
+0; /* disabled as default for buggy async-unlink handling */
+#endif
static int device_setup[SNDRV_CARDS]; /* device parameter for this card*/
module_param_array(index, int, NULL, 0444);
@@ -652,7 +658,11 @@
/*
* complete callback from data urb
*/
+#ifndef OLD_USB
static void snd_complete_urb(struct urb *urb, struct pt_regs *regs)
+#else
+static void snd_complete_urb(struct urb *urb)
+#endif
{
struct snd_urb_ctx *ctx = (struct snd_urb_ctx *)urb->context;
struct snd_usb_substream *subs = ctx->subs;
@@ -675,7 +685,11 @@
/*
* complete callback from sync urb
*/
+#ifndef OLD_USB
static void snd_complete_sync_urb(struct urb *urb, struct pt_regs *regs)
+#else
+static void snd_complete_sync_urb(struct urb *urb)
+#endif
{
struct snd_urb_ctx *ctx = (struct snd_urb_ctx *)urb->context;
struct snd_usb_substream *subs = ctx->subs;
@@ -752,9 +766,12 @@
if (test_bit(i, &subs->active_mask)) {
if (! test_and_set_bit(i, &subs->unlink_mask)) {
struct urb *u = subs->dataurb[i].urb;
- if (async)
+ if (async) {
+#ifdef URB_ASYNC_UNLINK
+ u->transfer_flags |= URB_ASYNC_UNLINK;
+#endif
usb_unlink_urb(u);
- else
+ } else
usb_kill_urb(u);
}
}
@@ -764,9 +781,12 @@
if (test_bit(i+16, &subs->active_mask)) {
if (! test_and_set_bit(i+16, &subs->unlink_mask)) {
struct urb *u = subs->syncurb[i].urb;
- if (async)
+ if (async) {
+#ifdef URB_ASYNC_UNLINK
+ u->transfer_flags |= URB_ASYNC_UNLINK;
+#endif
usb_unlink_urb(u);
- else
+ } else
usb_kill_urb(u);
}
}
@@ -1128,7 +1148,9 @@
if (! u->urb)
goto out_of_memory;
u->urb->transfer_buffer = subs->syncbuf + i * 4;
+#ifdef HAVE_USB_BUFFERS
u->urb->transfer_dma = subs->sync_dma + i * 4;
+#endif
u->urb->transfer_buffer_length = 4;
u->urb->pipe = subs->syncpipe;
u->urb->transfer_flags = URB_ISO_ASAP |
@@ -2013,8 +2035,13 @@
return -ENOMEM;
memcpy(buf, data, size);
}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 12)
err = usb_control_msg(dev, pipe, request, requesttype,
value, index, buf, size, timeout);
+#else
+ err = usb_control_msg(dev, pipe, request, requesttype,
+ value, index, buf, size, timeout * HZ / 1000);
+#endif
if (size > 0) {
memcpy(data, buf, size);
kfree(buf);
@@ -2027,9 +2054,11 @@
* entry point for linux usb interface
*/
+#ifndef OLD_USB
static int usb_audio_probe(struct usb_interface *intf,
const struct usb_device_id *id);
static void usb_audio_disconnect(struct usb_interface *intf);
+#endif
static struct usb_device_id usb_audio_ids [] = {
#include "usbquirks.h"
@@ -2042,9 +2071,15 @@
MODULE_DEVICE_TABLE (usb, usb_audio_ids);
static struct usb_driver usb_audio_driver = {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 70) && LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15) /* FIXME: find right number */
+ .owner = THIS_MODULE,
+#endif
.name = "snd-usb-audio",
.probe = usb_audio_probe,
.disconnect = usb_audio_disconnect,
+#ifdef OLD_USB
+ .driver_list = LIST_HEAD_INIT(usb_audio_driver.driver_list),
+#endif
.id_table = usb_audio_ids,
};
@@ -2576,7 +2611,11 @@
(altsd->bInterfaceSubClass != USB_SUBCLASS_AUDIO_STREAMING &&
altsd->bInterfaceSubClass != USB_SUBCLASS_VENDOR_SPEC) ||
altsd->bNumEndpoints < 1 ||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11)
le16_to_cpu(get_endpoint(alts, 0)->wMaxPacketSize) == 0)
+#else
+ get_endpoint(alts, 0)->wMaxPacketSize == 0)
+#endif
continue;
/* must be isochronous */
if ((get_endpoint(alts, 0)->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) !=
@@ -2645,7 +2684,11 @@
fp->altset_idx = i;
fp->endpoint = get_endpoint(alts, 0)->bEndpointAddress;
fp->ep_attr = get_endpoint(alts, 0)->bmAttributes;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11)
fp->maxpacksize = le16_to_cpu(get_endpoint(alts, 0)->wMaxPacketSize);
+#else
+ fp->maxpacksize = get_endpoint(alts, 0)->wMaxPacketSize;
+#endif
if (snd_usb_get_speed(dev) == USB_SPEED_HIGH)
fp->maxpacksize = (((fp->maxpacksize >> 11) & 3) + 1)
* (fp->maxpacksize & 0x7ff);
@@ -2926,7 +2969,11 @@
fp->iface = altsd->bInterfaceNumber;
fp->endpoint = get_endpoint(alts, 0)->bEndpointAddress;
fp->ep_attr = get_endpoint(alts, 0)->bmAttributes;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11)
fp->maxpacksize = le16_to_cpu(get_endpoint(alts, 0)->wMaxPacketSize);
+#else
+ fp->maxpacksize = get_endpoint(alts, 0)->wMaxPacketSize;
+#endif
switch (fp->maxpacksize) {
case 0x120:
@@ -2994,7 +3041,11 @@
fp->iface = altsd->bInterfaceNumber;
fp->endpoint = get_endpoint(alts, 0)->bEndpointAddress;
fp->ep_attr = get_endpoint(alts, 0)->bmAttributes;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11)
fp->maxpacksize = le16_to_cpu(get_endpoint(alts, 0)->wMaxPacketSize);
+#else
+ fp->maxpacksize = get_endpoint(alts, 0)->wMaxPacketSize;
+#endif
fp->rate_max = fp->rate_min = combine_triple(&alts->extra[8]);
stream = (fp->endpoint & USB_DIR_IN)
@@ -3059,8 +3110,13 @@
struct usb_host_config *config = dev->actconfig;
int err;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11)
if (le16_to_cpu(get_cfg_desc(config)->wTotalLength) == EXTIGY_FIRMWARE_SIZE_OLD ||
le16_to_cpu(get_cfg_desc(config)->wTotalLength) == EXTIGY_FIRMWARE_SIZE_NEW) {
+#else
+ if (get_cfg_desc(config)->wTotalLength == EXTIGY_FIRMWARE_SIZE_OLD ||
+ get_cfg_desc(config)->wTotalLength == EXTIGY_FIRMWARE_SIZE_NEW) {
+#endif
snd_printdd("sending Extigy boot sequence...\n");
/* Send message to force it to reconnect with full interface. */
err = snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev,0),
@@ -3072,8 +3128,13 @@
if (err < 0) snd_printdd("error usb_get_descriptor: %d\n", err);
err = usb_reset_configuration(dev);
if (err < 0) snd_printdd("error usb_reset_configuration: %d\n", err);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11)
snd_printdd("extigy_boot: new boot length = %d\n",
le16_to_cpu(get_cfg_desc(config)->wTotalLength));
+#else
+ snd_printdd("extigy_boot: new boot length = %d\n",
+ get_cfg_desc(config)->wTotalLength);
+#endif
return -ENODEV; /* quit this anyway */
}
return 0;
@@ -3081,6 +3142,8 @@
static int snd_usb_audigy2nx_boot_quirk(struct usb_device *dev)
{
+/* The pre-2.6.13 EHCI driver blows up when doing high speed iso transfers */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
u8 buf = 1;
snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0), 0x2a,
@@ -3092,6 +3155,7 @@
1, 2000, NULL, 0, 1000);
return -ENODEV;
}
+#endif
return 0;
}
@@ -3261,8 +3325,13 @@
chip->index = idx;
chip->dev = dev;
chip->card = card;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11)
chip->usb_id = USB_ID(le16_to_cpu(dev->descriptor.idVendor),
le16_to_cpu(dev->descriptor.idProduct));
+#else
+ chip->usb_id = USB_ID(dev->descriptor.idVendor,
+ dev->descriptor.idProduct);
+#endif
INIT_LIST_HEAD(&chip->pcm_list);
INIT_LIST_HEAD(&chip->midi_list);
INIT_LIST_HEAD(&chip->mixer_list);
@@ -3347,8 +3416,12 @@
alts = &intf->altsetting[0];
ifnum = get_iface_desc(alts)->bInterfaceNumber;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11)
id = USB_ID(le16_to_cpu(dev->descriptor.idVendor),
le16_to_cpu(dev->descriptor.idProduct));
+#else
+ id = USB_ID(dev->descriptor.idVendor, dev->descriptor.idProduct);
+#endif
if (quirk && quirk->ifnum >= 0 && ifnum != quirk->ifnum)
goto __err_val;
@@ -3475,6 +3548,7 @@
}
}
+#ifndef OLD_USB
/*
* new 2.5 USB kernel API
*/
@@ -3495,6 +3569,8 @@
snd_usb_audio_disconnect(interface_to_usbdev(intf),
dev_get_drvdata(&intf->dev));
}
+#endif
+
static int __init snd_usb_audio_init(void)
@@ -3515,3 +3591,5 @@
module_init(snd_usb_audio_init);
module_exit(snd_usb_audio_cleanup);
+
+#include "usbaudio.inc1"
|
