usb: USB Audio class implementation #21526

eobalski · 2019-12-19T15:15:57Z

Tested on nRF52840 only, may not work for other platforms.

Two sample apps attached:
-> headphones + microphone
-> headset

Both apps perform loopback. See README.rst for details.

Fixes: #12775
~~Blocked by: #24735~~

subsys/usb/class/audio/audio.c

raveslave · 2019-12-20T10:46:01Z

Great to see this work-in-progress!

would obviously be nice with support for both audio tx, rx endpoints, format types (stereo, sample rates, clocking etc)
feature units for controls like mute, gain
re: Kconfig/dts, I guess we can look a bit on how it's done in linux, there you have switches for pcm, rawmidi and more.

eobalski · 2019-12-20T10:55:06Z

would obviously be nice with support for both audio tx, rx endpoints, format types (stereo, sample rates, clocking etc)

There is plan for this, but I've started with basics.

feature units for controls like mute, gain

There is idea to use Kconfig for feature unit associated with headphones (Feature Unit) to choose what should be supported. This commit in this PR. This will be reworked in more elegant way using COND_CODE_1

re: Kconfig/dts, I guess we can look a bit on how it's done in linux, there you have switches for pcm, rawmidi and more.

I will have a look, thanks!

subsys/usb/class/audio/audio.c

include/usb/class/usb_audio.h

subsys/usb/class/audio/Kconfig

subsys/usb/class/audio/audio.c

subsys/usb/usb_device.c

zephyrbot · 2020-01-17T15:30:04Z

All checks are passing now.

checkpatch (informational only, not a failure)

-:2789: WARNING:TRAILING_SEMICOLON: macros should not use a trailing semicolon
#2789: FILE: subsys/usb/class/audio/usb_audio_internal.h:332:
+#define USB_AUDIO_IAD_DECLARE struct usb_association_descriptor iad;

- total: 0 errors, 1 warnings, 2820 lines checked

NOTE: For some of the reported defects, checkpatch may be able to
      mechanically convert to the typical style using --fix or --fix-inplace.

Your patch has style problems, please review.

NOTE: Ignored message types: AVOID_EXTERNS BRACES CONFIG_EXPERIMENTAL CONST_STRUCT DATE_TIME FILE_PATH_CHANGES MINMAX NETWORKING_BLOCK_COMMENT_STYLE PRINTK_WITHOUT_KERN_LEVEL SPDX_LICENSE_TAG SPLIT_STRING VOLATILE

NOTE: If any of the errors are false positives, please report
      them to the maintainers.

Tip: The bot edits this comment instead of posting a new one, so you can check the comment's history to see earlier messages.

eobalski · 2020-04-29T14:34:10Z

Pushed the branch with updates addresing @anangl comments.
Branch is now dependent on #24735.
Branch is presenting the fix for #24200 which is global, class specific issue.
This PR does not solve the issue absolutely.

include/usb/class/usb_audio.h

samples/subsys/usb/audio/headphones_microphone/prj.conf

subsys/usb/class/audio/usb_audio_internal.h

subsys/usb/class/audio/audio.c

subsys/usb/class/audio/usb_audio_internal.h

subsys/usb/class/audio/audio.c

include/usb/class/usb_audio.h

subsys/usb/class/audio/audio.c

eobalski · 2020-05-07T10:44:14Z

Updated with @jfischer-phytec-iot comments (please revisit) and rebased.

subsys/usb/class/audio/audio.c

samples/subsys/usb/audio/headphones_microphone/README.rst

samples/subsys/usb/audio/headset/README.rst

By this commit exception for ISO endpoints is made when it comes to its size. ISO endpoint buffer size for nrf devices is 1023 and may be configured with variable length size. NRFX checks is size is chosen accordingly and it is no reason to do it in SHIM. Signed-off-by: Emil Obalski <emil.obalski@nordicsemi.no>

This commit updates definitions to better match usb 2.0 spec. Signed-off-by: Emil Obalski <emil.obalski@nordicsemi.no>

This commit adds enumeration type for isochronous endpoints specific information required by USB Audio Class. Signed-off-by: Emil Obalski <emil.obalski@nordicsemi.no>

This commit adds files related to USB audio device class. Signed-off-by: Emil Obalski <emil.obalski@nordicsemi.no>

This commit adds support for receiveing data from ISO OUT endpoint for NRF devices. NRF USB IP core does not generate IRQ when data are received on ISO OUT endpoint and it must be synchronized with SOF event. Enable SOF handling by default if usb audio is configured with NRF devices. Signed-off-by: Emil Obalski <emil.obalski@nordicsemi.no>

By this commit USB audio class implementation is introduced to Zephyr. The Zephyr USB audio device class follows bellow documentations: - Universal Serial Bus specification rev2.0 (usb20.pdf) - Universal Serial Bus Device Class Definition for Audio Devices (audio10.pdf) - Universal Serial Bus Device Class Definition for Audio Data Formats (frmts10.pdf) - Universal Serial Bus Device Class Definition for Terminal Types (termt10.pdf) Signed-off-by: Emil Obalski <emil.obalski@nordicsemi.no>

This commit adds USB audio sample for Zephyr project. The sample configures two devices: - Microphone (2 channels, Fs=48kHz, PCM format) - Headphones (2 channels, Fs=48kHz, PCM format) Input data stream is passed to output data stream. For more details refer to README.rst. Signed-off-by: Emil Obalski <emil.obalski@nordicsemi.no>

This commit adds USB audio sample to the Zephyr project. The sample configures one I/O device: - Headset (2 channels, Fs=48kHz, PCM format) Input data sstream is passed to output data stream. For more details refer to README.rst. Signed-off-by: Emil Obalski <emil.obalski@nordicsemi.no>

carlescufi

Very nice work Emil, thanks!

arvid-r · 2020-05-08T13:51:56Z

Well done! Great work.

eobalski requested review from pdunaj, finikorg, jfischer-no, carlescufi and masz-nordic December 19, 2019 15:15

eobalski mentioned this pull request Dec 19, 2019

USB audio isochronous endpoints #12775

Closed

eobalski added area: USB Universal Serial Bus DNM This PR should not be merged (Do Not Merge) Feature A planned feature with a milestone labels Dec 19, 2019

carlescufi reviewed Dec 19, 2019

View reviewed changes

subsys/usb/class/audio/audio.c Outdated Show resolved Hide resolved

masz-nordic reviewed Dec 20, 2019

View reviewed changes

eobalski requested a review from anangl December 20, 2019 12:37

eobalski force-pushed the usb_audio_class branch 2 times, most recently from f8867fc to 0ce0cf8 Compare December 20, 2019 14:32

jfischer-no mentioned this pull request Dec 20, 2019

usb: redesign of USB transfers #21490

Closed

eobalski force-pushed the usb_audio_class branch 3 times, most recently from 7bede92 to b0a3964 Compare January 17, 2020 15:18

zephyrbot added area: API Changes to public APIs area: Samples Samples labels Jan 17, 2020

eobalski force-pushed the usb_audio_class branch 7 times, most recently from 1b567d9 to 41780b7 Compare January 24, 2020 12:23

eobalski force-pushed the usb_audio_class branch from 261e5d1 to fc79edf Compare April 29, 2020 14:25

eobalski added the DNM This PR should not be merged (Do Not Merge) label Apr 29, 2020

eobalski force-pushed the usb_audio_class branch 2 times, most recently from b1ba354 to e42f9b4 Compare May 5, 2020 12:56

anangl reviewed May 6, 2020

View reviewed changes

carlescufi added this to the v2.3.0 milestone May 6, 2020

anangl reviewed May 6, 2020

View reviewed changes

subsys/usb/class/audio/audio.c Outdated Show resolved Hide resolved

eobalski force-pushed the usb_audio_class branch from e42f9b4 to 922510d Compare May 6, 2020 13:11

jfischer-no requested changes May 6, 2020

View reviewed changes

eobalski force-pushed the usb_audio_class branch from 922510d to f8f032d Compare May 7, 2020 10:43

eobalski removed the DNM This PR should not be merged (Do Not Merge) label May 7, 2020

jfischer-no requested changes May 7, 2020

View reviewed changes

Emil Obalski added 6 commits May 7, 2020 15:59

drivers: usb: Correct naming for endpoint Transfer Type

04d405e

This commit updates definitions to better match usb 2.0 spec. Signed-off-by: Emil Obalski <emil.obalski@nordicsemi.no>

drivers: usb: Add enum type for Synchronization Type.

82b0550

This commit adds enumeration type for isochronous endpoints specific information required by USB Audio Class. Signed-off-by: Emil Obalski <emil.obalski@nordicsemi.no>

usb: Add Audio class related files

126ddcb

This commit adds files related to USB audio device class. Signed-off-by: Emil Obalski <emil.obalski@nordicsemi.no>

eobalski force-pushed the usb_audio_class branch from f8f032d to d1b4eb0 Compare May 8, 2020 10:22

Emil Obalski added 2 commits May 8, 2020 12:24

eobalski force-pushed the usb_audio_class branch from d1b4eb0 to 6acde07 Compare May 8, 2020 10:25

anangl approved these changes May 8, 2020

View reviewed changes

jfischer-no approved these changes May 8, 2020

View reviewed changes

carlescufi approved these changes May 8, 2020

View reviewed changes

carlescufi merged commit 6789ecb into zephyrproject-rtos:master May 8, 2020

eobalski deleted the usb_audio_class branch July 14, 2020 08:23

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

usb: USB Audio class implementation #21526

usb: USB Audio class implementation #21526

eobalski commented Dec 19, 2019 •

edited

Loading

raveslave commented Dec 20, 2019

eobalski commented Dec 20, 2019

zephyrbot commented Jan 17, 2020 •

edited

Loading

eobalski commented Apr 29, 2020

eobalski commented May 7, 2020

carlescufi left a comment

arvid-r commented May 8, 2020

usb: USB Audio class implementation #21526

usb: USB Audio class implementation #21526

Conversation

eobalski commented Dec 19, 2019 • edited Loading

raveslave commented Dec 20, 2019

eobalski commented Dec 20, 2019

zephyrbot commented Jan 17, 2020 • edited Loading

checkpatch (informational only, not a failure)

eobalski commented Apr 29, 2020

eobalski commented May 7, 2020

carlescufi left a comment

Choose a reason for hiding this comment

arvid-r commented May 8, 2020

eobalski commented Dec 19, 2019 •

edited

Loading

zephyrbot commented Jan 17, 2020 •

edited

Loading