summaryrefslogtreecommitdiff
path: root/src/class/audio
diff options
context:
space:
mode:
authorHiFiPhile <[email protected]>2024-07-28 12:04:25 +0200
committerHiFiPhile <[email protected]>2024-07-28 12:04:25 +0200
commit4a48544aebf362e77095c52ddcfcde6a65876acf (patch)
tree8ef461e5f0d2aec02d7e26bc0e1dc7fd1ebbe6cc /src/class/audio
parentf48a4567a6f97c6f814ad6cd3de544bcce42e585 (diff)
audiod_function_t clean up.
Diffstat (limited to 'src/class/audio')
-rw-r--r--src/class/audio/audio_device.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/class/audio/audio_device.c b/src/class/audio/audio_device.c
index 75bb0b883..8c86de433 100644
--- a/src/class/audio/audio_device.c
+++ b/src/class/audio/audio_device.c
@@ -303,8 +303,6 @@ typedef struct
bool mounted; // Device opened
- /*------------- From this point, data is not cleared by bus reset -------------*/
-
uint16_t desc_length; // Length of audio function descriptor
#if CFG_TUD_AUDIO_ENABLE_FEEDBACK_EP
@@ -369,6 +367,8 @@ typedef struct
#endif
#endif
+ /*------------- From this point, data is not cleared by bus reset -------------*/
+
// Buffer for control requests
uint8_t * ctrl_buf;
uint8_t ctrl_buf_sz;
@@ -377,14 +377,10 @@ typedef struct
uint8_t * alt_setting; // We need to save the current alternate setting this way, because it is possible that there are AS interfaces which do not have an EP!
// EP Transfer buffers and FIFOs
-#if CFG_TUD_AUDIO_ENABLE_EP_OUT
-#if !CFG_TUD_AUDIO_ENABLE_DECODING
+#if CFG_TUD_AUDIO_ENABLE_EP_OUT && !CFG_TUD_AUDIO_ENABLE_DECODING
tu_fifo_t ep_out_ff;
#endif
-
-#endif // CFG_TUD_AUDIO_ENABLE_EP_OUT
-
#if CFG_TUD_AUDIO_ENABLE_EP_IN && !CFG_TUD_AUDIO_ENABLE_ENCODING
tu_fifo_t ep_in_ff;
#endif
@@ -394,7 +390,6 @@ typedef struct
CFG_TUSB_MEM_ALIGN uint8_t ep_int_buf[6];
#endif
-
// Support FIFOs for software encoding and decoding
#if CFG_TUD_AUDIO_ENABLE_EP_OUT && CFG_TUD_AUDIO_ENABLE_DECODING
tu_fifo_t * rx_supp_ff;