andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

PanRe refactor applied: s{_int_ctr_}{_int_}g; s{_INT_CTR_}{_INT_}g;

Browse Source
This commit is contained in:
Mark K Cowan
2022-10-26 21:43:27 +03:00
parent 15ed45e1a3
commit 9673d20901
2 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/class/audio/audio_device.c
View File

@@ -283,8 +283,8 @@ typedef struct
#endif #endif
#if CFG_TUD_AUDIO_INT_CTR_EPSIZE_IN #if CFG_TUD_AUDIO_INT_EPSIZE_IN
uint8_t ep_int_ctr; // Audio control interrupt EP. uint8_t ep_int; // Audio control interrupt EP.
#endif #endif
/*------------- From this point, data is not cleared by bus reset -------------*/ /*------------- From this point, data is not cleared by bus reset -------------*/
@@ -340,8 +340,8 @@ typedef struct
#endif #endif
// Audio control interrupt buffer - no FIFO - 6 Bytes according to UAC 2 specification (p. 74) // Audio control interrupt buffer - no FIFO - 6 Bytes according to UAC 2 specification (p. 74)
#if CFG_TUD_AUDIO_INT_CTR_EPSIZE_IN #if CFG_TUD_AUDIO_INT_EPSIZE_IN
CFG_TUSB_MEM_ALIGN uint8_t ep_int_ctr_buf[CFG_TUD_AUDIO_INT_CTR_EP_IN_SW_BUFFER_SIZE]; CFG_TUSB_MEM_ALIGN uint8_t ep_int_buf[CFG_TUD_AUDIO_INT_EP_IN_SW_BUFFER_SIZE];
#endif #endif
// Decoding parameters - parameters are set when alternate AS interface is set by host // Decoding parameters - parameters are set when alternate AS interface is set by host
@@ -465,7 +465,7 @@ bool tud_audio_n_mounted(uint8_t func_id)
#endif #endif
#if CFG_TUD_AUDIO_ENABLE_INTERRUPT_EP #if CFG_TUD_AUDIO_ENABLE_INTERRUPT_EP
if (audio->ep_int_ctr == 0) return false; if (audio->ep_int == 0) return false;
#endif #endif
#if CFG_TUD_AUDIO_ENABLE_FEEDBACK_EP #if CFG_TUD_AUDIO_ENABLE_FEEDBACK_EP
@@ -815,23 +815,23 @@ tu_fifo_t* tud_audio_n_get_tx_support_ff(uint8_t func_id, uint8_t ff_idx)
#if CFG_TUD_AUDIO_ENABLE_INTERRUPT_EP #if CFG_TUD_AUDIO_ENABLE_INTERRUPT_EP
// If no interrupt transmit is pending bytes get written into buffer and a transmit is scheduled - once transmit completed tud_audio_int_ctr_done_cb() is called in inform user // If no interrupt transmit is pending bytes get written into buffer and a transmit is scheduled - once transmit completed tud_audio_int_done_cb() is called in inform user
uint16_t tud_audio_int_ctr_n_write(uint8_t func_id, uint8_t const* buffer, uint16_t len) uint16_t tud_audio_int_n_write(uint8_t func_id, uint8_t const* buffer, uint16_t len)
{ {
TU_VERIFY(_audiod_fct[func_id].ep_int_ctr != 0); TU_VERIFY(_audiod_fct[func_id].ep_int != 0);
TU_VERIFY(func_id < CFG_TUD_AUDIO && _audiod_fct[func_id].p_desc != NULL); TU_VERIFY(func_id < CFG_TUD_AUDIO && _audiod_fct[func_id].p_desc != NULL);
// We write directly into the EP's buffer - abort if previous transfer not complete // We write directly into the EP's buffer - abort if previous transfer not complete
TU_VERIFY(!usbd_edpt_busy(_audiod_fct[func_id].rhport, _audiod_fct[func_id].ep_int_ctr)); TU_VERIFY(!usbd_edpt_busy(_audiod_fct[func_id].rhport, _audiod_fct[func_id].ep_int));
// Check length // Check length
TU_VERIFY(len <= CFG_TUD_AUDIO_INT_CTR_EP_IN_SW_BUFFER_SIZE); TU_VERIFY(len <= CFG_TUD_AUDIO_INT_EP_IN_SW_BUFFER_SIZE);
memcpy(_audiod_fct[func_id].ep_int_ctr_buf, buffer, len); memcpy(_audiod_fct[func_id].ep_int_buf, buffer, len);
// Schedule transmit // Schedule transmit
TU_VERIFY(usbd_edpt_xfer(_audiod_fct[func_id].rhport, _audiod_fct[func_id].ep_int_ctr, _audiod_fct[func_id].ep_int_ctr_buf, len)); TU_VERIFY(usbd_edpt_xfer(_audiod_fct[func_id].rhport, _audiod_fct[func_id].ep_int, _audiod_fct[func_id].ep_int_buf, len));
return true; return true;
} }
@@ -1082,7 +1082,7 @@ static inline bool audiod_fb_send(uint8_t rhport, audiod_function_t *audio)
#endif #endif
#if CFG_TUD_AUDIO_ENABLE_INTERRUPT_EP #if CFG_TUD_AUDIO_ENABLE_INTERRUPT_EP
static bool set_int_ctr_number(audiod_function_t *audio) static bool set_int_number(audiod_function_t *audio)
{ {
uint8_t const *p_desc = audio->p_desc; uint8_t const *p_desc = audio->p_desc;
@@ -1108,7 +1108,7 @@ static bool set_int_ctr_number(audiod_function_t *audio)
if (tu_edpt_dir(ep_addr) == TUSB_DIR_IN && desc_ep->bmAttributes.xfer == 0x03) // Check if usage is interrupt EP if (tu_edpt_dir(ep_addr) == TUSB_DIR_IN && desc_ep->bmAttributes.xfer == 0x03) // Check if usage is interrupt EP
{ {
// Store endpoint number and open endpoint // Store endpoint number and open endpoint
audio->ep_int_ctr = ep_addr; audio->ep_int = ep_addr;
TU_ASSERT(usbd_edpt_open(audio->rhport, desc_ep)); TU_ASSERT(usbd_edpt_open(audio->rhport, desc_ep));
found = true; found = true;
} }
@@ -1485,7 +1485,7 @@ uint16_t audiod_open(uint8_t rhport, tusb_desc_interface_t const * itf_desc, uin
// Verify interrupt control EP is enabled if demanded by descriptor - this should be best some static check however - this check can be omitted // Verify interrupt control EP is enabled if demanded by descriptor - this should be best some static check however - this check can be omitted
if (itf_desc->bNumEndpoints == 1) // 0 or 1 EPs are allowed if (itf_desc->bNumEndpoints == 1) // 0 or 1 EPs are allowed
{ {
TU_VERIFY(CFG_TUD_AUDIO_INT_CTR_EPSIZE_IN > 0); TU_VERIFY(CFG_TUD_AUDIO_INT_EPSIZE_IN > 0);
} }
// Alternate setting MUST be zero - this check can be omitted // Alternate setting MUST be zero - this check can be omitted
@@ -1529,7 +1529,7 @@ uint16_t audiod_open(uint8_t rhport, tusb_desc_interface_t const * itf_desc, uin
uint16_t drv_len = _audiod_fct[i].desc_length - TUD_AUDIO_DESC_IAD_LEN; // - TUD_AUDIO_DESC_IAD_LEN since tinyUSB already handles the IAD descriptor uint16_t drv_len = _audiod_fct[i].desc_length - TUD_AUDIO_DESC_IAD_LEN; // - TUD_AUDIO_DESC_IAD_LEN since tinyUSB already handles the IAD descriptor
#if CFG_TUD_AUDIO_ENABLE_INTERRUPT_EP #if CFG_TUD_AUDIO_ENABLE_INTERRUPT_EP
TU_ASSERT(set_int_ctr_number(&_audiod_fct[i])); TU_ASSERT(set_int_number(&_audiod_fct[i]));
#endif #endif
return drv_len; return drv_len;
@@ -2030,10 +2030,10 @@ bool audiod_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t result, uint3
{ {
audiod_function_t* audio = &_audiod_fct[func_id]; audiod_function_t* audio = &_audiod_fct[func_id];
#if CFG_TUD_AUDIO_INT_CTR_EPSIZE_IN #if CFG_TUD_AUDIO_INT_EPSIZE_IN
// Data transmission of control interrupt finished // Data transmission of control interrupt finished
if (audio->ep_int_ctr == ep_addr) if (audio->ep_int == ep_addr)
{ {
// According to USB2 specification, maximum payload of interrupt EP is 8 bytes on low speed, 64 bytes on full speed, and 1024 bytes on high speed (but only if an alternate interface other than 0 is used - see specification p. 49) // According to USB2 specification, maximum payload of interrupt EP is 8 bytes on low speed, 64 bytes on full speed, and 1024 bytes on high speed (but only if an alternate interface other than 0 is used - see specification p. 49)
// In case there is nothing to send we have to return a NAK - this is taken care of by PHY ??? // In case there is nothing to send we have to return a NAK - this is taken care of by PHY ???
@@ -2042,7 +2042,7 @@ bool audiod_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t result, uint3
// I assume here, that things above are handled by PHY // I assume here, that things above are handled by PHY
// All transmission is done - what remains to do is to inform job was completed // All transmission is done - what remains to do is to inform job was completed
if (tud_audio_int_ctr_done_cb) TU_VERIFY(tud_audio_int_ctr_done_cb(rhport, (uint16_t) xferred_bytes)); if (tud_audio_int_done_cb) TU_VERIFY(tud_audio_int_done_cb(rhport, (uint16_t) xferred_bytes));
} }
#endif #endif

20
src/class/audio/audio_device.h
View File

@@ -197,17 +197,17 @@
#endif #endif
// Audio interrupt control EP size - disabled if 0 // Audio interrupt control EP size - disabled if 0
#ifndef CFG_TUD_AUDIO_INT_CTR_EPSIZE_IN #ifndef CFG_TUD_AUDIO_INT_EPSIZE_IN
// Audio interrupt control - if required - 6 Bytes according to UAC 2 specification (p. 74) // Audio interrupt control - if required - 6 Bytes according to UAC 2 specification (p. 74)
#if CFG_TUD_AUDIO_ENABLE_INTERRUPT_EP #if CFG_TUD_AUDIO_ENABLE_INTERRUPT_EP
#define CFG_TUD_AUDIO_INT_CTR_EPSIZE_IN 6 #define CFG_TUD_AUDIO_INT_EPSIZE_IN 6
#else #else
#define CFG_TUD_AUDIO_INT_CTR_EPSIZE_IN 0 #define CFG_TUD_AUDIO_INT_EPSIZE_IN 0
#endif #endif
#endif #endif
#ifndef CFG_TUD_AUDIO_INT_CTR_EP_IN_SW_BUFFER_SIZE #ifndef CFG_TUD_AUDIO_INT_EP_IN_SW_BUFFER_SIZE
#define CFG_TUD_AUDIO_INT_CTR_EP_IN_SW_BUFFER_SIZE 6 // Buffer size of audio control interrupt EP - 6 Bytes according to UAC 2 specification (p. 74) #define CFG_TUD_AUDIO_INT_EP_IN_SW_BUFFER_SIZE 6 // Buffer size of audio control interrupt EP - 6 Bytes according to UAC 2 specification (p. 74)
#endif #endif
// Use software encoding/decoding // Use software encoding/decoding
@@ -399,7 +399,7 @@ tu_fifo_t* tud_audio_n_get_tx_support_ff (uint8_t func_id, uint8_t ff_i
#endif #endif
#if CFG_TUD_AUDIO_ENABLE_INTERRUPT_EP #if CFG_TUD_AUDIO_ENABLE_INTERRUPT_EP
uint16_t tud_audio_int_ctr_n_write (uint8_t func_id, uint8_t const* buffer, uint16_t len); uint16_t tud_audio_int_n_write (uint8_t func_id, uint8_t const* buffer, uint16_t len);
#endif #endif
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
@@ -442,7 +442,7 @@ static inline tu_fifo_t* tud_audio_get_tx_support_ff (uint8_t ff_idx);
// INT CTR API // INT CTR API
#if CFG_TUD_AUDIO_ENABLE_INTERRUPT_EP #if CFG_TUD_AUDIO_ENABLE_INTERRUPT_EP
static inline uint16_t tud_audio_int_ctr_write (uint8_t const* buffer, uint16_t len); static inline uint16_t tud_audio_int_write (uint8_t const* buffer, uint16_t len);
#endif #endif
// Buffer control EP data and schedule a transmit // Buffer control EP data and schedule a transmit
@@ -567,7 +567,7 @@ typedef struct TU_ATTR_PACKED
}; };
} audio_status_update_t; } audio_status_update_t;
TU_ATTR_WEAK bool tud_audio_int_ctr_done_cb(uint8_t rhport, uint16_t n_bytes_copied); TU_ATTR_WEAK bool tud_audio_int_done_cb(uint8_t rhport, uint16_t n_bytes_copied);
#endif #endif
// Invoked when audio set interface request received // Invoked when audio set interface request received
@@ -699,9 +699,9 @@ static inline tu_fifo_t* tud_audio_get_tx_support_ff(uint8_t ff_idx)
#endif #endif
#if CFG_TUD_AUDIO_ENABLE_INTERRUPT_EP #if CFG_TUD_AUDIO_ENABLE_INTERRUPT_EP
static inline uint16_t tud_audio_int_ctr_write(uint8_t const* buffer, uint16_t len) static inline uint16_t tud_audio_int_write(uint8_t const* buffer, uint16_t len)
{ {
return tud_audio_int_ctr_n_write(0, buffer, len); return tud_audio_int_n_write(0, buffer, len);
} }
#endif #endif