@@ -261,13 +261,6 @@ osal_mutex_def_t rx_supp_ff_mutex_rd_3[CFG_TUD_AUDIO_FUNC_3_N_RX_SUPP_SW_FIFO];
261
261
#endif
262
262
#endif
263
263
264
- enum {
265
- FEEDBACK_COMPUTE_DISABLED ,
266
- FEEDBACK_COMPUTE_FLOAT ,
267
- FEEDBACK_COMPUTE_FIXED ,
268
- FEEDBACK_COMPUTE_POWER_OF_2 ,
269
- };
270
-
271
264
typedef struct
272
265
{
273
266
uint8_t rhport ;
@@ -1722,10 +1715,10 @@ static bool audiod_set_interface(uint8_t rhport, tusb_control_request_t const *
1722
1715
1723
1716
if ( sample_freq == 0 || mclk_freq == 0 )
1724
1717
{
1725
- audio -> fb_compute_method = FEEDBACK_COMPUTE_DISABLED ;
1718
+ audio -> fb_compute_method = AUDIO_FEEDBACK_METHOD_DISABLED ;
1726
1719
}else
1727
1720
{
1728
- audio -> fb_compute_method = fixed_point ? FEEDBACK_COMPUTE_FIXED : FEEDBACK_COMPUTE_FLOAT ;
1721
+ audio -> fb_compute_method = fixed_point ? AUDIO_FEEDBACK_METHOD_FREQUENCY_FIXED : AUDIO_FEEDBACK_METHOD_FREQUENCY_FLOAT ;
1729
1722
set_fb_params (audio , sample_freq , mclk_freq );
1730
1723
}
1731
1724
}
@@ -2066,9 +2059,9 @@ static bool set_fb_params(audiod_function_t* audio, uint32_t sample_freq, uint32
2066
2059
// Check if parameters really allow for a power of two division
2067
2060
if ((mclk_freq % sample_freq ) == 0 && tu_is_power_of_two (mclk_freq / sample_freq ))
2068
2061
{
2069
- audio -> fb_compute_method = FEEDBACK_COMPUTE_POWER_OF_2 ;
2062
+ audio -> fb_compute_method = AUDIO_FEEDBACK_METHOD_FREQUENCY_POWER_OF_2 ;
2070
2063
audio -> fb_power_of_two_val = 16 - audio -> fb_n_frames_shift - tu_log2 (mclk_freq / sample_freq );
2071
- }else if ( audio -> fb_compute_method == FEEDBACK_COMPUTE_FLOAT )
2064
+ }else if ( audio -> fb_compute_method == AUDIO_FEEDBACK_METHOD_FREQUENCY_FLOAT )
2072
2065
{
2073
2066
audio -> fb_float_val = (float )sample_freq / mclk_freq * (1UL << (16 - audio -> fb_n_frames_shift ));
2074
2067
}else
@@ -2092,15 +2085,15 @@ uint32_t tud_audio_feedback_update(uint8_t func_id, uint32_t cycles)
2092
2085
2093
2086
switch (audio -> fb_compute_method )
2094
2087
{
2095
- case FEEDBACK_COMPUTE_POWER_OF_2 :
2088
+ case AUDIO_FEEDBACK_METHOD_FREQUENCY_POWER_OF_2 :
2096
2089
feedback = (cycles << audio -> fb_power_of_two_val );
2097
2090
break ;
2098
2091
2099
- case FEEDBACK_COMPUTE_FLOAT :
2092
+ case AUDIO_FEEDBACK_METHOD_FREQUENCY_FLOAT :
2100
2093
feedback = (uint32_t ) ((float ) cylces * audio -> fb_float_val );
2101
2094
break ;
2102
2095
2103
- case FEEDBACK_COMPUTE_FIXED :
2096
+ case AUDIO_FEEDBACK_METHOD_FREQUENCY_FIXED :
2104
2097
{
2105
2098
uint64_t fb64 = (((uint64_t ) cycles ) * audio -> fb_sample_freq ) << (16 - audio -> fb_n_frames_shift );
2106
2099
feedback = (uint32_t ) (fb64 / audio -> fb_mclk_freq );
0 commit comments