Skip to content

WiP : MIDI Host #1122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
csBlueChip wants to merge 17 commits into from
Closed

WiP : MIDI Host #1122

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
0da47c8
** add build folder to .gitignore
csBlueChip Oct 3, 2021
6113bca
** Fix audio_desc_cs_ac_interface_t in class/audio/audio.h
csBlueChip Oct 3, 2021
2bab3eb
** Fix MIDI message enums in class/midi/midi.h
csBlueChip Oct 3, 2021
53ca21c
** Add "unused" fields to tusb_desc_endpoint_t - more cleanly documen…
csBlueChip Oct 3, 2021
8fe626c
** MIDI requires the inclusion of class/audio/audio.h
csBlueChip Oct 3, 2021
294094a
MIDI Engine code ...WiP - need a MIDI Host class (driver) before we c…
csBlueChip Oct 3, 2021
fccbccf
Add MIDI host example - development test harness
csBlueChip Oct 3, 2021
62b1529
Add MIDI class code - WiP
csBlueChip Oct 3, 2021
f79968c
Placeholder code for driver patch to fix known-broken MIDI hardware
csBlueChip Oct 3, 2021
beee21e
A liberal sprinkling of temporary printf()s and hexDump()s
csBlueChip Oct 3, 2021
2cc8009
fix example name in Makefile
csBlueChip Oct 3, 2021
a3589e7
** fix/hack to get TUSB working on rp2040 in debug mode (CFG_TUSB_DEB…
csBlueChip Oct 3, 2021
6d958dd
increase debug level - highlights problem in the rp2040 portable code…
csBlueChip Oct 4, 2021
efe6fa8
** add api call to expose device strings {iManuf, iProd, iSerial}
csBlueChip Oct 4, 2021
d2d5f1b
failed attempt to retrieve the product string
csBlueChip Oct 4, 2021
94fab4f
fix makeshift Makefile
csBlueChip Oct 4, 2021
cfdc811
Merge branch 'hathach:master' into master
csBlueChip Oct 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions src/class/audio/audio.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,15 +663,16 @@ typedef struct TU_ATTR_PACKED {
} audio_desc_channel_cluster_t;

/// AUDIO Class-Specific AC Interface Header Descriptor (4.7.2)
// https://www.usb.org/sites/default/files/midi10.pdf (B.3.2) ...tested against a real device
typedef struct TU_ATTR_PACKED
{
uint8_t bLength ; ///< Size of this descriptor in bytes: 9.
uint8_t bDescriptorType ; ///< Descriptor Type. Value: TUSB_DESC_CS_INTERFACE.
uint8_t bDescriptorSubType ; ///< Descriptor SubType. Value: AUDIO_CS_AC_INTERFACE_HEADER.
uint16_t bcdADC ; ///< Audio Device Class Specification Release Number in Binary-Coded Decimal. Value: U16_TO_U8S_LE(0x0200).
uint8_t bCategory ; ///< Constant, indicating the primary use of this audio function, as intended by the manufacturer. See: audio_function_t.
Copy link
Copy Markdown
Collaborator

@kasjer kasjer Oct 4, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This changes definition from Audio 2 specification section 4.7.2 to version 1.0 section 4.3.2 with limitation to 1 interface.

Maybe better way to handle this is to have 1.0 version separated and not change just one structure to different specification version.

Copy link
Copy Markdown
Author

@csBlueChip csBlueChip Oct 4, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah. Yes. I didn't realise that was the root of the problem!

I would suggest the v1 be called audio_desc_cs_ac_interface_t and v2 audio_desc_cs_ac_interface_v2_t ...but I guess that might be seen as an undesirable breaking-change :/

Do you have any ideas for the best/right way to do this?

Copy link
Copy Markdown
Owner

@hathach hathach Oct 13, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please revert the change, audio v1 is only used by MIDI, all other class moves to audio v2. MIDI driver could handle this locally within its driver

Copy link
Copy Markdown
Author

@csBlueChip csBlueChip Oct 13, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Understood. Thanks.

uint16_t wTotalLength ; ///< Total number of bytes returned for the class-specific AudioControl interface descriptor. Includes the combined length of this descriptor header and all Clock Source, Unit and Terminal descriptors.
uint8_t bmControls ; ///< See: audio_cs_ac_interface_control_pos_t.
uint8_t bLength ; ///< Size of this descriptor in bytes: 9.
uint8_t bDescriptorType ; ///< Descriptor Type. Value: TUSB_DESC_CS_INTERFACE.
uint8_t bDescriptorSubType ; ///< Descriptor SubType. Value: AUDIO_CS_AC_INTERFACE_HEADER.
uint16_t bcdADC ; ///< Audio Device Class Specification Release Number in Binary-Coded Decimal. Value: U16_TO_U8S_LE(0x0200).
uint16_t wTotalLength ; ///< Total number of bytes returned for the class-specific AudioControl interface descriptor. Includes the combined length of this descriptor header and all Clock Source, Unit and Terminal descriptors.
uint8_t bInCollection ; ///< See: Number of streaming interfaces.
uint8_t baInterfaceNr ; ///< Interfaces that belong to this AudioControl interface.
} audio_desc_cs_ac_interface_t;

/// AUDIO Clock Source Descriptor (4.7.2.1)
Expand Down