Clean up old depracted and misleading variable names

1 files changed, 33 insertions, 33 deletions

diff --git a/src/class/audio/audio_device.h b/src/class/audio/audio_device.h
index f91540b64..2dccc11bc 100644
--- a/src/class/audio/audio_device.h
+++ b/src/class/audio/audio_device.h
@@ -358,33 +358,33 @@ extern "C" {
 // Application API (Multiple Interfaces)
 // CFG_TUD_AUDIO > 1
 //--------------------------------------------------------------------+
-bool     tud_audio_n_mounted    (uint8_t itf);
+bool     tud_audio_n_mounted    (uint8_t audio_fct_idx);
 
 #if CFG_TUD_AUDIO_ENABLE_EP_OUT && !CFG_TUD_AUDIO_ENABLE_DECODING
-uint16_t tud_audio_n_available                    (uint8_t itf);
-uint16_t tud_audio_n_read                         (uint8_t itf, void* buffer, uint16_t bufsize);
-bool     tud_audio_n_clear_ep_out_ff              (uint8_t itf);                          // Delete all content in the EP OUT FIFO
+uint16_t tud_audio_n_available                    (uint8_t audio_fct_idx);
+uint16_t tud_audio_n_read                         (uint8_t audio_fct_idx, void* buffer, uint16_t bufsize);
+bool     tud_audio_n_clear_ep_out_ff              (uint8_t audio_fct_idx);                          // Delete all content in the EP OUT FIFO
 #endif
 
 #if CFG_TUD_AUDIO_ENABLE_EP_OUT && CFG_TUD_AUDIO_ENABLE_DECODING
-bool     tud_audio_n_clear_rx_support_ff          (uint8_t itf, uint8_t channelId);       // Delete all content in the support RX FIFOs
-uint16_t tud_audio_n_available_support_ff         (uint8_t itf, uint8_t channelId);
-uint16_t tud_audio_n_read_support_ff              (uint8_t itf, uint8_t channelId, void* buffer, uint16_t bufsize);
+bool     tud_audio_n_clear_rx_support_ff          (uint8_t audio_fct_idx, uint8_t ff_idx);       // Delete all content in the support RX FIFOs
+uint16_t tud_audio_n_available_support_ff         (uint8_t audio_fct_idx, uint8_t ff_idx);
+uint16_t tud_audio_n_read_support_ff              (uint8_t audio_fct_idx, uint8_t ff_idx, void* buffer, uint16_t bufsize);
 #endif
 
 #if CFG_TUD_AUDIO_ENABLE_EP_IN && !CFG_TUD_AUDIO_ENABLE_ENCODING
-uint16_t tud_audio_n_write                        (uint8_t itf, const void * data, uint16_t len);
-bool     tud_audio_n_clear_ep_in_ff               (uint8_t itf);                          // Delete all content in the EP IN FIFO
+uint16_t tud_audio_n_write                        (uint8_t audio_fct_idx, const void * data, uint16_t len);
+bool     tud_audio_n_clear_ep_in_ff               (uint8_t audio_fct_idx);                          // Delete all content in the EP IN FIFO
 #endif
 
 #if CFG_TUD_AUDIO_ENABLE_EP_IN && CFG_TUD_AUDIO_ENABLE_ENCODING
-uint16_t tud_audio_n_flush_tx_support_ff          (uint8_t itf);      // Force all content in the support TX FIFOs to be written into EP SW FIFO
-bool     tud_audio_n_clear_tx_support_ff          (uint8_t itf, uint8_t channelId);
-uint16_t tud_audio_n_write_support_ff             (uint8_t itf, uint8_t channelId, const void * data, uint16_t len);
+uint16_t tud_audio_n_flush_tx_support_ff          (uint8_t audio_fct_idx);      // Force all content in the support TX FIFOs to be written into EP SW FIFO
+bool     tud_audio_n_clear_tx_support_ff          (uint8_t audio_fct_idx, uint8_t ff_idx);
+uint16_t tud_audio_n_write_support_ff             (uint8_t audio_fct_idx, uint8_t ff_idx, const void * data, uint16_t len);
 #endif
 
 #if CFG_TUD_AUDIO_INT_CTR_EPSIZE_IN
-uint16_t    tud_audio_int_ctr_n_write             (uint8_t itf, uint8_t const* buffer, uint16_t len);
+uint16_t    tud_audio_int_ctr_n_write             (uint8_t audio_fct_idx, uint8_t const* buffer, uint16_t len);
 #endif
 
 //--------------------------------------------------------------------+
@@ -402,9 +402,9 @@ static inline uint16_t     tud_audio_read                   (void* buffer, uint1
 #endif
 
 #if CFG_TUD_AUDIO_ENABLE_EP_OUT && CFG_TUD_AUDIO_ENABLE_DECODING
-static inline bool     tud_audio_clear_rx_support_ff        (uint8_t channelId);
-static inline uint16_t tud_audio_available_support_ff       (uint8_t channelId);
-static inline uint16_t tud_audio_read_support_ff            (uint8_t channelId, void* buffer, uint16_t bufsize);
+static inline bool     tud_audio_clear_rx_support_ff        (uint8_t ff_idx);
+static inline uint16_t tud_audio_available_support_ff       (uint8_t ff_idx);
+static inline uint16_t tud_audio_read_support_ff            (uint8_t ff_idx, void* buffer, uint16_t bufsize);
 #endif
 
 // TX API
@@ -416,8 +416,8 @@ static inline bool 	   tud_audio_clear_ep_in_ff             (void);
 
 #if CFG_TUD_AUDIO_ENABLE_EP_IN && CFG_TUD_AUDIO_ENABLE_ENCODING
 static inline uint16_t tud_audio_flush_tx_support_ff        (void);
-static inline uint16_t tud_audio_clear_tx_support_ff        (uint8_t channelId);
-static inline uint16_t tud_audio_write_support_ff           (uint8_t channelId, const void * data, uint16_t len);
+static inline uint16_t tud_audio_clear_tx_support_ff        (uint8_t ff_idx);
+static inline uint16_t tud_audio_write_support_ff           (uint8_t ff_idx, const void * data, uint16_t len);
 #endif
 
 // INT CTR API
@@ -439,13 +439,13 @@ bool tud_audio_buffer_and_schedule_control_xfer(uint8_t rhport, tusb_control_req
 //--------------------------------------------------------------------+
 
 #if CFG_TUD_AUDIO_ENABLE_EP_IN
-TU_ATTR_WEAK bool tud_audio_tx_done_pre_load_cb(uint8_t rhport, uint8_t itf, uint8_t ep_in, uint8_t cur_alt_setting);
-TU_ATTR_WEAK bool tud_audio_tx_done_post_load_cb(uint8_t rhport, uint16_t n_bytes_copied, uint8_t itf, uint8_t ep_in, uint8_t cur_alt_setting);
+TU_ATTR_WEAK bool tud_audio_tx_done_pre_load_cb(uint8_t rhport, uint8_t audio_fct_idx, uint8_t ep_in, uint8_t cur_alt_setting);
+TU_ATTR_WEAK bool tud_audio_tx_done_post_load_cb(uint8_t rhport, uint16_t n_bytes_copied, uint8_t audio_fct_idx, uint8_t ep_in, uint8_t cur_alt_setting);
 #endif
 
 #if CFG_TUD_AUDIO_ENABLE_EP_OUT
-TU_ATTR_WEAK bool tud_audio_rx_done_pre_read_cb(uint8_t rhport, uint16_t n_bytes_received, uint8_t itf, uint8_t ep_out, uint8_t cur_alt_setting);
-TU_ATTR_WEAK bool tud_audio_rx_done_post_read_cb(uint8_t rhport, uint16_t n_bytes_received, uint8_t itf, uint8_t ep_out, uint8_t cur_alt_setting);
+TU_ATTR_WEAK bool tud_audio_rx_done_pre_read_cb(uint8_t rhport, uint16_t n_bytes_received, uint8_t audio_fct_idx, uint8_t ep_out, uint8_t cur_alt_setting);
+TU_ATTR_WEAK bool tud_audio_rx_done_post_read_cb(uint8_t rhport, uint16_t n_bytes_received, uint8_t audio_fct_idx, uint8_t ep_out, uint8_t cur_alt_setting);
 #endif
 
 #if CFG_TUD_AUDIO_ENABLE_EP_OUT && CFG_TUD_AUDIO_ENABLE_FEEDBACK_EP
@@ -454,7 +454,7 @@ TU_ATTR_WEAK bool tud_audio_fb_done_cb(uint8_t rhport);
 // Value will be corrected for FS to 10.14 format automatically.
 // (see Universal Serial Bus Specification Revision 2.0 5.12.4.2).
 // Feedback value will be sent at FB endpoint interval till it's changed.
-bool tud_audio_n_fb_set(uint8_t itf, uint32_t feedback);
+bool tud_audio_n_fb_set(uint8_t audio_fct_idx, uint32_t feedback);
 static inline bool tud_audio_fb_set(uint32_t feedback);
 #endif
 
@@ -518,19 +518,19 @@ static inline bool tud_audio_clear_ep_out_ff(void)
 
 #if CFG_TUD_AUDIO_ENABLE_EP_OUT && CFG_TUD_AUDIO_ENABLE_DECODING
 
-static inline bool tud_audio_clear_rx_support_ff(uint8_t channelId)
+static inline bool tud_audio_clear_rx_support_ff(uint8_t ff_idx)
 {
-  return tud_audio_n_clear_rx_support_ff(0, channelId);
+  return tud_audio_n_clear_rx_support_ff(0, ff_idx);
 }
 
-static inline uint16_t tud_audio_available_support_ff(uint8_t channelId)
+static inline uint16_t tud_audio_available_support_ff(uint8_t ff_idx)
 {
-  return tud_audio_n_available_support_ff(0, channelId);
+  return tud_audio_n_available_support_ff(0, ff_idx);
 }
 
-static inline uint16_t tud_audio_read_support_ff(uint8_t channelId, void* buffer, uint16_t bufsize)
+static inline uint16_t tud_audio_read_support_ff(uint8_t ff_idx, void* buffer, uint16_t bufsize)
 {
-  return tud_audio_n_read_support_ff(0, channelId, buffer, bufsize);
+  return tud_audio_n_read_support_ff(0, ff_idx, buffer, bufsize);
 }
 
 #endif
@@ -558,14 +558,14 @@ static inline uint16_t tud_audio_flush_tx_support_ff(void)
   return tud_audio_n_flush_tx_support_ff(0);
 }
 
-static inline uint16_t tud_audio_clear_tx_support_ff(uint8_t channelId)
+static inline uint16_t tud_audio_clear_tx_support_ff(uint8_t ff_idx)
 {
-  return tud_audio_n_clear_tx_support_ff(0, channelId);
+  return tud_audio_n_clear_tx_support_ff(0, ff_idx);
 }
 
-static inline uint16_t tud_audio_write_support_ff(uint8_t channelId, const void * data, uint16_t len)
+static inline uint16_t tud_audio_write_support_ff(uint8_t ff_idx, const void * data, uint16_t len)
 {
-  return tud_audio_n_write_support_ff(0, channelId, data, len);
+  return tud_audio_n_write_support_ff(0, ff_idx, data, len);
 }
 
 #endif