From: Dmitry Panchenko | d-Systems <dmitry@d-systems.ee>
To: alsa-devel@alsa-project.org
Cc: tiwai@suse.de, alexander@tsoy.me
Subject: ALSA: usb-audio: Add Pioneer DJ DJM-900NXS2 support
Date: Mon, 1 Jun 2020 13:22:24 +0300 [thread overview]
Message-ID: <48ab19ff-3303-9bf8-ed0e-bcb31d8537eb@d-systems.ee> (raw)
In-Reply-To: <13d0e6b3-2066-e67e-3499-a72291ce4348@d-systems.ee>
[-- Attachment #1: Type: text/plain, Size: 480 bytes --]
Pioneer DJ DJM-900NXS2 is a widely used DJ mixer with 2 audio USB
interfaces. Both have a MIDI controller, 10 playback and 12 capture
channels. Audio endpoints are vendor-specific and 3 files need to be
patched. All playback and capture channels work fine with all supported
sample rates (44.1k, 48k, 96k). Patches are attached.
Signed-off-by: Dmitry Panchenko <dmitry@d-systems.ee>
--
Kind regards,
Dmitry Panchenko
d-Systems Ltd
Lai 6, Tartu 51005, Estonia
www.d-systems.ee
[-- Attachment #2: pcm.c.patch --]
[-- Type: text/x-patch, Size: 445 bytes --]
--- sound/usb/pcm.c 2020-04-23 11:38:27.000000000 +0300
+++ /root/linux-5.6.7/sound/usb/pcm.c 2020-05-01 14:17:54.785566648 +0300
@@ -365,6 +365,10 @@
ep = 0x81;
ifnum = 2;
goto add_sync_ep_from_ifnum;
+ case USB_ID(0x2b73, 0x000a): /* Pioneer DJ DJM-900NXS2 */
+ ep = 0x82;
+ ifnum = 0;
+ goto add_sync_ep_from_ifnum;
case USB_ID(0x0582, 0x01d8): /* BOSS Katana */
/* BOSS Katana amplifiers do not need quirks */
return 0;
[-- Attachment #3: quirks.c.patch --]
[-- Type: text/x-patch, Size: 1159 bytes --]
--- sound/usb/quirks.c 2020-04-23 11:38:27.000000000 +0300
+++ /root/linux-5.6.7/sound/usb/quirks.c 2020-05-01 14:45:57.545650031 +0300
@@ -1414,6 +1414,30 @@
subs->pkt_offset_adj = (emu_samplerate_id >= EMU_QUIRK_SR_176400HZ) ? 4 : 0;
}
+
+/*
+ * Pioneer DJ DJM-900NXS2
+ * Device needs to know the sample rate each time substream is started
+ */
+static int pioneer_djm_set_format_quirk(struct snd_usb_substream *subs)
+{
+
+ /* Convert sample rate value to little endian */
+ u8 sr[3];
+
+ sr[0] = subs->cur_rate&0xff;
+ sr[1] = (subs->cur_rate>>8)&0xff;
+ sr[2] = (subs->cur_rate>>16)&0xff;
+
+ /* Configure device */
+ usb_set_interface(subs->dev, 0, 1);
+ snd_usb_ctl_msg(subs->stream->chip->dev,
+ usb_rcvctrlpipe(subs->stream->chip->dev, 0),
+ 0x01, 0x22, 0x0100, 0x0082, &sr, 0x0003);
+
+ return 0;
+}
+
void snd_usb_set_format_quirk(struct snd_usb_substream *subs,
struct audioformat *fmt)
{
@@ -1424,6 +1448,9 @@
case USB_ID(0x041e, 0x3f19): /* E-Mu 0204 USB */
set_format_emu_quirk(subs, fmt);
break;
+ case USB_ID(0x2b73, 0x000a): /* Pioneer DJ DJM-900NXS2 */
+ pioneer_djm_set_format_quirk(subs);
+ break;
}
}
[-- Attachment #4: quirks-table.h.patch --]
[-- Type: text/x-patch, Size: 1830 bytes --]
--- sound/usb/quirks-table.h 2020-04-23 11:38:27.000000000 +0300
+++ /root/linux-5.6.7/sound/usb/quirks-table.h 2020-05-01 14:48:44.665672833 +0300
@@ -3592,5 +3592,68 @@
}
}
},
+{
+ /*
+ * Pioneer DJ DJM-900NXS2
+ * 10 channels playback & 12 channels capture @ 44.1/48/96kHz S24LE
+ */
+ USB_DEVICE_VENDOR_SPEC(0x2b73, 0x000a),
+ .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
+ .ifnum = QUIRK_ANY_INTERFACE,
+ .type = QUIRK_COMPOSITE,
+ .data = (const struct snd_usb_audio_quirk[]) {
+ {
+ .ifnum = 0,
+ .type = QUIRK_AUDIO_FIXED_ENDPOINT,
+ .data = &(const struct audioformat) {
+ .formats = SNDRV_PCM_FMTBIT_S24_3LE,
+ .channels = 10,
+ .iface = 0,
+ .altsetting = 1,
+ .altset_idx = 1,
+ .endpoint = 0x01,
+ .ep_attr = USB_ENDPOINT_XFER_ISOC|
+ USB_ENDPOINT_SYNC_ASYNC,
+ .rates = SNDRV_PCM_RATE_44100|
+ SNDRV_PCM_RATE_48000|
+ SNDRV_PCM_RATE_96000,
+ .rate_min = 44100,
+ .rate_max = 96000,
+ .nr_rates = 3,
+ .rate_table = (unsigned int[]) {
+ 44100, 48000, 96000
+ }
+ }
+ },
+ {
+ .ifnum = 0,
+ .type = QUIRK_AUDIO_FIXED_ENDPOINT,
+ .data = &(const struct audioformat) {
+ .formats = SNDRV_PCM_FMTBIT_S24_3LE,
+ .channels = 12,
+ .iface = 0,
+ .altsetting = 1,
+ .altset_idx = 1,
+ .endpoint = 0x82,
+ .ep_attr = USB_ENDPOINT_XFER_ISOC|
+ USB_ENDPOINT_SYNC_ASYNC|
+ USB_ENDPOINT_USAGE_IMPLICIT_FB,
+ .rates = SNDRV_PCM_RATE_44100|
+ SNDRV_PCM_RATE_48000|
+ SNDRV_PCM_RATE_96000,
+ .rate_min = 44100,
+ .rate_max = 96000,
+ .nr_rates = 3,
+ .rate_table = (unsigned int[]) {
+ 44100, 48000, 96000
+ }
+ }
+ },
+ {
+ .ifnum = -1
+ }
+ }
+ }
+},
#undef USB_DEVICE_VENDOR_SPEC
next prev parent reply other threads:[~2020-06-01 10:23 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-29 9:56 Pioneer DJ DJM-900NXS2 support patches Dmitry Panchenko | d-Systems
2020-04-30 17:18 ` Takashi Iwai
2020-04-30 17:40 ` Alexander Tsoy
2020-05-01 12:14 ` Dmitry Panchenko | d-Systems
2020-06-01 10:22 ` Dmitry Panchenko | d-Systems [this message]
2020-06-01 18:44 ` ALSA: usb-audio: Add Pioneer DJ DJM-900NXS2 support Takashi Iwai
[not found] <a93cb55a-66f6-38f8-fab6-40f1bf6a5ab9@d-systems.ee>
2025-02-19 21:57 ` Dmitry Panchenko | d-Systems
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=48ab19ff-3303-9bf8-ed0e-bcb31d8537eb@d-systems.ee \
--to=dmitry@d-systems.ee \
--cc=alexander@tsoy.me \
--cc=alsa-devel@alsa-project.org \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox