History

ALSA: line6: Add high-speed USB support

This has two parts: * intervals_per_second setup (high speed needs 8000, instead of 1000) * iso_buffers setup (count of iso buffers depends on USB speed, 2 is not enough for high speed)

Andrej Krutak committed 10 years ago

Commit 79faa2b1 parent b2233d95 files · +35 −14Browse files

Unified · Split

5 files
  1. sound/usb/line6/capture.c +9 −1
  2. sound/usb/line6/driver.c +10 −5
  3. sound/usb/line6/driver.h +12 −3
  4. sound/usb/line6/pcm.h +3 −4
  5. sound/usb/line6/playback.c +1 −1
sound/usb/line6/capture.c+9−1
@@ -181,7 +181,15 @@ static void audio_in_callback(struct urb *urb) · 180 unmodified lines
181181
182182 length += fsize;
183183
184− /* the following assumes LINE6_ISO_PACKETS == 1: */
184+ BUILD_BUG_ON_MSG(LINE6_ISO_PACKETS != 1,
185+ "The following code assumes LINE6_ISO_PACKETS == 1");
186+ /* TODO:
187+ * Also, if iso_buffers != 2, the prev frame is almost random at
188+ * playback side.
189+ * This needs to be redesigned. It should be "stable", but we may
190+ * experience sync problems on such high-speed configs.
191+ */
192+
185193 line6pcm->prev_fbuf = fbuf;
186194 line6pcm->prev_fsize = fsize;
187195
sound/usb/line6/driver.c+10−5
@@ -462,14 +462,18 @@ static void line6_destruct(struct snd_card *card) · 461 unmodified lines
462462 static void line6_get_interval(struct usb_line6 *line6)
463463 {
464464 struct usb_device *usbdev = line6->usbdev;
465− struct usb_host_endpoint *ep;
466− unsigned pipe = usb_rcvintpipe(usbdev, line6->properties->ep_ctrl_r);
467− unsigned epnum = usb_pipeendpoint(pipe);
465+ struct usb_host_endpoint *ep = usbdev->ep_in[line6->properties->ep_ctrl_r];
468466
469− ep = usbdev->ep_in[epnum];
470− line6->iso_buffers = LINE6_ISO_BUFFERS;
471467 if (ep) {
472468 line6->interval = ep->desc.bInterval;
469+ if (usbdev->speed == USB_SPEED_LOW) {
470+ line6->intervals_per_second = USB_LOW_INTERVALS_PER_SECOND;
471+ line6->iso_buffers = USB_LOW_ISO_BUFFERS;
472+ } else {
473+ line6->intervals_per_second = USB_HIGH_INTERVALS_PER_SECOND;
474+ line6->iso_buffers = USB_HIGH_ISO_BUFFERS;
475+ }
476+
473477 line6->max_packet_size = le16_to_cpu(ep->desc.wMaxPacketSize);
474478 } else {
475479 dev_err(line6->ifcdev,
@@ -559,6 +563,7 @@ int line6_probe(struct usb_interface *interface, · 83 unmodified lines
559563 /* query interface number */
560564 interface_number = interface->cur_altsetting->desc.bInterfaceNumber;
561565
566+ /* TODO reserves the bus bandwidth even without actual transfer */
562567 ret = usb_set_interface(usbdev, interface_number,
563568 properties->altsetting);
564569 if (ret < 0) {
sound/usb/line6/driver.h+12−3
@@ -18,7 +18,13 @@ · 17 unmodified lines
1818
1919 #include "midi.h"
2020
21−#define USB_INTERVALS_PER_SECOND 1000
21+/* USB 1.1 speed configuration */
22+#define USB_LOW_INTERVALS_PER_SECOND 1000
23+#define USB_LOW_ISO_BUFFERS 2
24+
25+/* USB 2.0+ speed configuration */
26+#define USB_HIGH_INTERVALS_PER_SECOND 8000
27+#define USB_HIGH_ISO_BUFFERS 16
2228
2329 /* Fallback USB interval and max packet size values */
2430 #define LINE6_FALLBACK_INTERVAL 10
@@ -109,12 +115,15 @@ struct usb_line6 { · 84 unmodified lines
109115 /* Properties */
110116 const struct line6_properties *properties;
111117
112− /* Interval (ms) */
118+ /* Interval for data USB packets */
113119 int interval;
120+ /* ...for isochronous transfers framing */
121+ int intervals_per_second;
122+
114123 /* Number of isochronous URBs used for frame transfers */
115124 int iso_buffers;
116125
117− /* Maximum size of USB packet */
126+ /* Maximum size of data USB packet */
118127 int max_packet_size;
119128
120129 /* Device representing the USB interface */
sound/usb/line6/pcm.h+3−4
@@ -20,9 +20,6 @@ · 19 unmodified lines
2020
2121 #include "driver.h"
2222
23−/* number of URBs */
24−#define LINE6_ISO_BUFFERS 2
25−
2623 /*
2724 number of USB frames per URB
2825 The Line 6 Windows driver always transmits two frames per packet, but
@@ -31,7 +28,9 @@ · 2 unmodified lines
3128 */
3229 #define LINE6_ISO_PACKETS 1
3330
34−/* in a "full speed" device (such as the PODxt Pro) this means 1ms */
31+/* in a "full speed" device (such as the PODxt Pro) this means 1ms,
32+ * for "high speed" it's 1/8ms
33+ */
3534 #define LINE6_ISO_INTERVAL 1
3635
3736 #define LINE6_IMPULSE_DEFAULT_PERIOD 100
sound/usb/line6/playback.c+1−1
@@ -151,7 +151,7 @@ static int submit_audio_out_urb(struct snd_line6_pcm *line6pcm) · 150 unmodified lines
151151 line6pcm->properties->rates.rats[0].num_min;
152152 const int frame_factor =
153153 line6pcm->properties->rates.rats[0].den *
154− (USB_INTERVALS_PER_SECOND / LINE6_ISO_INTERVAL);
154+ (line6pcm->line6->intervals_per_second / LINE6_ISO_INTERVAL);
155155 struct urb *urb_out;
156156
157157 index = find_first_zero_bit(&line6pcm->out.active_urbs,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t