summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReinhard Panhuber <[email protected]>2021-04-15 17:04:25 +0200
committerReinhard Panhuber <[email protected]>2021-04-15 17:04:25 +0200
commitfa0d71f2cf26419d01a78227e7689ecb8771e785 (patch)
treee1cee597bfb245b849d0e27a5d9c60a1fc29abde
parent2e65d1543fe24d51862d425ae8822c2f3c7bf3e3 (diff)
Try to resolve include hassle in uac2_headset
-rw-r--r--examples/device/uac2_headset/src/tusb_config.h5
-rw-r--r--examples/device/uac2_headset/src/usb_descriptors.h2
2 files changed, 5 insertions, 2 deletions
diff --git a/examples/device/uac2_headset/src/tusb_config.h b/examples/device/uac2_headset/src/tusb_config.h
index 4b4570b77..88f9efcff 100644
--- a/examples/device/uac2_headset/src/tusb_config.h
+++ b/examples/device/uac2_headset/src/tusb_config.h
@@ -35,6 +35,8 @@ extern "C" {
// COMMON CONFIGURATION
//--------------------------------------------------------------------
+#include "usb_descriptors.h"
+
// defined by compiler flags for flexibility
#ifndef CFG_TUSB_MCU
#error CFG_TUSB_MCU must be defined
@@ -94,7 +96,8 @@ extern "C" {
#define CFG_TUD_AUDIO_IN_PATH (CFG_TUD_AUDIO)
#define CFG_TUD_AUDIO_OUT_PATH (CFG_TUD_AUDIO)
-#define CFG_TUD_AUDIO_FUNC_1_DESC_LEN 220 // This equals TUD_AUDIO_HEADSET_STEREO_DESC_LEN, however, including it from usb_descriptors.h is not possible due to some strange include hassle
+//#define CFG_TUD_AUDIO_FUNC_1_DESC_LEN 220 // This equals TUD_AUDIO_HEADSET_STEREO_DESC_LEN, however, including it from usb_descriptors.h is not possible due to some strange include hassle
+#define CFG_TUD_AUDIO_FUNC_1_DESC_LEN TUD_AUDIO_HEADSET_STEREO_DESC_LEN
// Audio format type I specifications
#define CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_TX 1
diff --git a/examples/device/uac2_headset/src/usb_descriptors.h b/examples/device/uac2_headset/src/usb_descriptors.h
index 6651897b0..d9c5a63a7 100644
--- a/examples/device/uac2_headset/src/usb_descriptors.h
+++ b/examples/device/uac2_headset/src/usb_descriptors.h
@@ -26,7 +26,7 @@
#ifndef _USB_DESCRIPTORS_H_
#define _USB_DESCRIPTORS_H_
-#include "tusb.h"
+// #include "tusb.h"
// Unit numbers are arbitrary selected
#define UAC2_ENTITY_CLOCK 0x04