Configuration for streaming audio + MIDI?

[cmaughan]

uint8_t const desc_configuration[] = {
    // Config number, interface count, string index, total length, attribute, power in mA
    TUD_CONFIG_DESCRIPTOR(1, ITF_NUM_TOTAL, 0, CONFIG_TOTAL_LEN, 0x00, 100),

    // Interface number, string index, EP Out & EP In address, EP size
    TUD_AUDIO10_MIC_ONE_CH_DESCRIPTOR(/*_itfnum*/ ITF_NUM_AUDIO_CONTROL,
        /*_stridx*/ 4,
        /*_nBytesPerSample*/ CFG_TUD_AUDIO_FUNC_1_N_BYTES_PER_SAMPLE_TX,
        /*_nBitsUsedPerSample*/ CFG_TUD_AUDIO_FUNC_1_N_BYTES_PER_SAMPLE_TX * 8,
        /*_epin*/ 0x80 | EPNUM_AUDIO,
        /*_epsize*/ CFG_TUD_AUDIO_EP_SZ_IN),

    // Interface number, string index, EP Out & EP In address, EP size
    TUD_MIDI_DESCRIPTOR(ITF_NUM_MIDI, 5, EPNUM_MIDI_OUT, (0x80 | EPNUM_MIDI_IN), 64),
};

Here's my config for an audio microphone input from a Pi Pico, with a MIDI controller interface. Unfortunately this doesn't work. What GPT is telling me, and seems likely correct, is that the MIDI interface 'looks' like a an audio device, and when TinyUSB starts up, the audio or the Midi (whichever I put first), slurps up both interfaces. Then I get asserts in the code that there are no available devices for the 'other' one.

Is this something that has been solved? I'm not sure how to approach it yet.

[HiFiPhile]

What's not working exactly ? Currently audio driver misses some checking to avoid messing around midi for more complexe config but your config should work.

Example based on audio_test_multi_rate

diff --git a/examples/device/audio_test_multi_rate/src/tusb_config.h b/examples/device/audio_test_multi_rate/src/tusb_config.h
index 3587ae089..d8826cf8d 100644
--- a/examples/device/audio_test_multi_rate/src/tusb_config.h
+++ b/examples/device/audio_test_multi_rate/src/tusb_config.h
@@ -100,7 +100,7 @@ extern "C" {
 #define CFG_TUD_CDC               0
 #define CFG_TUD_MSC               0
 #define CFG_TUD_HID               0
-#define CFG_TUD_MIDI              0
+#define CFG_TUD_MIDI              1
 #define CFG_TUD_VENDOR            0
 
 //--------------------------------------------------------------------
@@ -139,6 +139,11 @@ extern "C" {
 // Example write FIFO every 1ms (8 HS frames), so buffer size should be 8 times larger for HS device
 #define CFG_TUD_AUDIO_FUNC_1_EP_IN_SW_BUF_SZ                         TU_MAX(4 * CFG_TUD_AUDIO10_FUNC_1_FORMAT_1_EP_SZ_IN, TU_MAX(32 * CFG_TUD_AUDIO20_FUNC_1_FORMAT_1_EP_SZ_IN, 32 * CFG_TUD_AUDIO20_FUNC_1_FORMAT_2_EP_SZ_IN))
 
+// MIDI FIFO size of TX and RX
+#define CFG_TUD_MIDI_RX_BUFSIZE   (TUD_OPT_HIGH_SPEED ? 512 : 64)
+#define CFG_TUD_MIDI_TX_BUFSIZE   (TUD_OPT_HIGH_SPEED ? 512 : 64)
+
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/examples/device/audio_test_multi_rate/src/usb_descriptors.c b/examples/device/audio_test_multi_rate/src/usb_descriptors.c
index 505936fdb..5256565fe 100644
--- a/examples/device/audio_test_multi_rate/src/usb_descriptors.c
+++ b/examples/device/audio_test_multi_rate/src/usb_descriptors.c
@@ -76,6 +76,8 @@ uint8_t const * tud_descriptor_device_cb(void) {
 enum {
   ITF_NUM_AUDIO_CONTROL = 0,
   ITF_NUM_AUDIO_STREAMING,
+  ITF_NUM_MIDI,
+  ITF_NUM_MIDI_STREAMING,
   ITF_NUM_TOTAL
 };
 
@@ -92,14 +94,19 @@ enum {
   #define EPNUM_AUDIO   0x01
 #endif
 
-#define CONFIG_UAC1_TOTAL_LEN    	(TUD_CONFIG_DESC_LEN + TUD_AUDIO10_MIC_ONE_CH_DESC_LEN(3))
+  #define EPNUM_MIDI_OUT  0x02
+  #define EPNUM_MIDI_IN   0x82
+
+#define CONFIG_UAC1_TOTAL_LEN    	(TUD_CONFIG_DESC_LEN + TUD_MIDI_DESC_LEN + TUD_AUDIO10_MIC_ONE_CH_DESC_LEN(3))
 
 uint8_t const desc_uac1_configuration[] = {
   // Config number, interface count, string index, total length, attribute, power in mA
   TUD_CONFIG_DESCRIPTOR(1, ITF_NUM_TOTAL, 0, CONFIG_UAC1_TOTAL_LEN, 0x00, 100),
 
   // Interface number, string index, EP Out & EP In address, EP size
-  TUD_AUDIO10_MIC_ONE_CH_DESCRIPTOR(/*_itfnum*/ ITF_NUM_AUDIO_CONTROL, /*_stridx*/ 0, /*_nBytesPerSample*/ 2, /*_nBitsUsedPerSample*/ 16, /*_epin*/ 0x80 | EPNUM_AUDIO, /*_epsize*/ CFG_TUD_AUDIO10_FUNC_1_FORMAT_1_EP_SZ_IN, 32000, 48000, 96000)
+  TUD_AUDIO10_MIC_ONE_CH_DESCRIPTOR(/*_itfnum*/ ITF_NUM_AUDIO_CONTROL, /*_stridx*/ 0, /*_nBytesPerSample*/ 2, /*_nBitsUsedPerSample*/ 16, /*_epin*/ 0x80 | EPNUM_AUDIO, /*_epsize*/ CFG_TUD_AUDIO10_FUNC_1_FORMAT_1_EP_SZ_IN, 32000, 48000, 96000),
+
+  TUD_MIDI_DESCRIPTOR(ITF_NUM_MIDI, 0, EPNUM_MIDI_OUT, (0x80 | EPNUM_MIDI_IN), 64)
 };
 
 TU_VERIFY_STATIC(sizeof(desc_uac1_configuration) == CONFIG_UAC1_TOTAL_LEN, "Incorrect size");

[cmaughan]

With the audio listed first, as I have it, I assert in audio_device.c, Line 1037:

  // Verify we found a free one
  TU_ASSERT(i < CFG_TUD_AUDIO);

This is because the Midi device has swallowed up both of the configs (because, I assume, the MIDI and the AUDIO configs are both really AUDIO class...)

If I swap the order and put MIDI first, then I assert in usbd.c, Line 1138:

     // Interface number must not be used already
     TU_ASSERT(DRVID_INVALID == _usbd_dev.itf2drv[itf_num]);

In this case, I believe the opposite has happened; the audio has swallowed up both configs, and now the MIDI can't find a free device.

Your config is slightly different to mine: you are using AUDIO10; I can try that.

[cmaughan]

Same failure with the same config as yours.

[cmaughan]

... right, after getting the AUDIO10 config correct, I get the same asserts; so no further forward.
Note that I can setup MIDI or AUDIO too; so I know I'm in the right ballpark, but getting them to work together is not fun currently!

[HiFiPhile]

I assert in audio_device.c, Line 1037

That's what happens with more complexe config fixed in #3383
Midi driver is ok, it's audio driver who swallowed both.

Your config is slightly different to mine: you are using AUDIO10; I can try that.

Isn't you are using also UAC1 ?

Same failure with the same config as yours.

You must have other modifications other than mine.

[cmaughan]

In my config above, I was using UAC2; I tried your change for UAC1 and got the same behavior; maybe I missed something.

[cmaughan]

I can try your PR....

[HiFiPhile]

[cmaughan]

Ah, sorry, wrong screenshot; I had already experimented with 10; Here's the current options:

//#define IS_AUDIO_20
#ifdef IS_AUDIO_20
#define CONFIG_TOTAL_LEN          \
    (TUD_CONFIG_DESC_LEN                  \
        + TUD_AUDIO20_MIC_ONE_CH_DESC_LEN \
        + TUD_MIDI_DESC_LEN)
#else

#define CONFIG_TOTAL_LEN             \
    (TUD_CONFIG_DESC_LEN                     \
        + TUD_AUDIO10_MIC_ONE_CH_DESC_LEN(1) \
        + TUD_MIDI_DESC_LEN)
#endif

#define EPNUM_AUDIO 0x02
#define EPNUM_MIDI_OUT 0x01
#define EPNUM_MIDI_IN 0x81

static_assert(EPNUM_MIDI_OUT != EPNUM_AUDIO, "MIDI OUT and AUDIO IN endpoint numbers must be different");
static_assert(EPNUM_MIDI_IN != EPNUM_AUDIO, "MIDI OUT and AUDIO IN endpoint numbers must be different");
static_assert(EPNUM_MIDI_IN != EPNUM_MIDI_OUT, "MIDI OUT and AUDIO IN endpoint numbers must be different");

#define CFG_TUD_AUDIO10_FUNC_1_FORMAT_1_EP_SZ_IN  TUD_AUDIO_EP_SIZE(false, 48000, CFG_TUD_AUDIO_FUNC_1_N_BYTES_PER_SAMPLE_TX, 1)
uint8_t desc_configuration[] = {
    // Config number, interface count, string index, total length, attribute, power in mA
    TUD_CONFIG_DESCRIPTOR(1, ITF_NUM_TOTAL, 0, CONFIG_TOTAL_LEN, 0x00, 100),

// Interface number, string index, EP Out & EP In address, EP size
#ifdef IS_AUDIO_20
    TUD_AUDIO20_MIC_ONE_CH_DESCRIPTOR(/*_itfnum*/ ITF_NUM_AUDIO_CONTROL,
        /*_stridx*/ 4,
        /*_nBytesPerSample*/ CFG_TUD_AUDIO_FUNC_1_N_BYTES_PER_SAMPLE_TX,
        /*_nBitsUsedPerSample*/ CFG_TUD_AUDIO_FUNC_1_N_BYTES_PER_SAMPLE_TX * 8,
        /*_epin*/ 0x80 | EPNUM_AUDIO,
        /*_epsize*/ CFG_TUD_AUDIO_EP_SZ_IN),
#else
    TUD_AUDIO10_MIC_ONE_CH_DESCRIPTOR(/*_itfnum*/ ITF_NUM_AUDIO_CONTROL,
        /*_stridx*/ 4,
        /*_nBytesPerSample*/ CFG_TUD_AUDIO_FUNC_1_N_BYTES_PER_SAMPLE_TX,
        /*_nBitsUsedPerSample*/ CFG_TUD_AUDIO_FUNC_1_N_BYTES_PER_SAMPLE_TX * 8,
        /*_epin*/ 0x80 | EPNUM_AUDIO,
        /*_epsize*/ CFG_TUD_AUDIO10_FUNC_1_FORMAT_1_EP_SZ_IN, 48000),
#endif // AUDIO 20

    // Interface number, string index, EP Out & EP In address, EP size
    TUD_MIDI_DESCRIPTOR(ITF_NUM_MIDI, 5, EPNUM_MIDI_OUT, (0x80 | EPNUM_MIDI_IN), 64),
};

Doesn't matter which way I set the top define.

[cmaughan]

Your fix did the trick :)
Thanks for the fast turnaround - with your changes to audio_device I can enumerate and simultaneously capture audio and MIDI....

[HiFiPhile]

Nice !