Embedded/tinyusb
1
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2025-01-31 05:52:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Convert to bit-field since it's more reliable.

Browse Source
This commit is contained in:
HiFiPhile 2024-05-09 21:55:28 +02:00
parent 16cd92fbf1
commit 376b43906a
3 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1835,7 +1835,7 @@ static bool audiod_set_interface(uint8_t rhport, tusb_control_request_t const *
audio->feedback.frame_shift = desc_ep->bInterval -1; audio->feedback.frame_shift = desc_ep->bInterval -1;
// Enable SOF interrupt if callback is implemented // Enable SOF interrupt if callback is implemented
if (tud_audio_feedback_interval_isr) usbd_sof_enable(rhport, true); if (tud_audio_feedback_interval_isr) usbd_sof_enable(rhport, SOF_CONSUMER_AUDIO, true);
} }
#endif #endif
#endif // CFG_TUD_AUDIO_ENABLE_EP_OUT #endif // CFG_TUD_AUDIO_ENABLE_EP_OUT
@ -1909,7 +1909,7 @@ static bool audiod_set_interface(uint8_t rhport, tusb_control_request_t const *
break; break;
} }
} }
if (disable) usbd_sof_enable(rhport, false); if (disable) usbd_sof_enable(rhport, SOF_CONSUMER_AUDIO, false);
#endif #endif
#if CFG_TUD_AUDIO_ENABLE_EP_IN && CFG_TUD_AUDIO_EP_IN_FLOW_CONTROL #if CFG_TUD_AUDIO_ENABLE_EP_IN && CFG_TUD_AUDIO_EP_IN_FLOW_CONTROL

22
src/device/usbd.c
View File

@ -76,13 +76,11 @@ typedef struct {
uint8_t remote_wakeup_en : 1; // enable/disable by host uint8_t remote_wakeup_en : 1; // enable/disable by host
uint8_t remote_wakeup_support : 1; // configuration descriptor's attribute uint8_t remote_wakeup_support : 1; // configuration descriptor's attribute
uint8_t self_powered : 1; // configuration descriptor's attribute uint8_t self_powered : 1; // configuration descriptor's attribute
uint8_t sof_cb_en : 1; // SOF user callback enable
}; };
volatile uint8_t cfg_num; // current active configuration (0x00 is not configured) volatile uint8_t cfg_num; // current active configuration (0x00 is not configured)
uint8_t speed; uint8_t speed;
volatile uint8_t setup_count; volatile uint8_t setup_count;
uint8_t sof_ref_cnt; volatile uint8_t sof_consumer;
uint8_t itf2drv[CFG_TUD_INTERFACE_MAX]; // map interface number to driver (0xff is invalid) uint8_t itf2drv[CFG_TUD_INTERFACE_MAX]; // map interface number to driver (0xff is invalid)
uint8_t ep2drv[CFG_TUD_ENDPPOINT_MAX][2]; // map endpoint to driver ( 0xff is invalid ), can use only 4-bit each uint8_t ep2drv[CFG_TUD_ENDPPOINT_MAX][2]; // map endpoint to driver ( 0xff is invalid ), can use only 4-bit each
@ -392,10 +390,7 @@ bool tud_connect(void) {
bool tud_sof_cb_enable(bool en) bool tud_sof_cb_enable(bool en)
{ {
if(_usbd_dev.sof_cb_en != en) { usbd_sof_enable(_usbd_rhport, SOF_CONSUMER_USER, en);
_usbd_dev.sof_cb_en = en;
usbd_sof_enable(_usbd_rhport, en);
}
return true; return true;
} }
@ -1384,18 +1379,21 @@ void usbd_edpt_close(uint8_t rhport, uint8_t ep_addr) {
return; return;
} }
void usbd_sof_enable(uint8_t rhport, bool en) { void usbd_sof_enable(uint8_t rhport, sof_consumer_t consumer, bool en) {
rhport = _usbd_rhport; rhport = _usbd_rhport;
uint8_t consumer_old = _usbd_dev.sof_consumer;
// Keep track how many class instances need the SOF interrupt // Keep track how many class instances need the SOF interrupt
if (en) { if (en) {
_usbd_dev.sof_ref_cnt++; _usbd_dev.sof_consumer = tu_bit_set(_usbd_dev.sof_consumer, consumer);
} else { } else {
_usbd_dev.sof_ref_cnt--; _usbd_dev.sof_consumer = tu_bit_clear(_usbd_dev.sof_consumer, consumer);
} }
// Only disable SOF interrupts if all drivers switched off SOF calls and if the SOF callback isn't used // Test logically unequal
dcd_sof_enable(rhport, _usbd_dev.sof_ref_cnt ? true : false); if(!!_usbd_dev.sof_consumer != !!consumer_old) {
dcd_sof_enable(rhport, _usbd_dev.sof_consumer);
}
} }
bool usbd_edpt_iso_alloc(uint8_t rhport, uint8_t ep_addr, uint16_t largest_packet_size) { bool usbd_edpt_iso_alloc(uint8_t rhport, uint8_t ep_addr, uint16_t largest_packet_size) {

11
src/device/usbd_pvt.h
View File

@ -35,6 +35,15 @@
#define TU_LOG_USBD(...) TU_LOG(CFG_TUD_LOG_LEVEL, __VA_ARGS__) #define TU_LOG_USBD(...) TU_LOG(CFG_TUD_LOG_LEVEL, __VA_ARGS__)
//--------------------------------------------------------------------+
// MACRO CONSTANT TYPEDEF PROTYPES
//--------------------------------------------------------------------+
typedef enum {
SOF_CONSUMER_USER = 0,
SOF_CONSUMER_AUDIO,
} sof_consumer_t;
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
// Class Driver API // Class Driver API
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
@ -108,7 +117,7 @@ bool usbd_edpt_ready(uint8_t rhport, uint8_t ep_addr) {
} }
// Enable SOF interrupt // Enable SOF interrupt
void usbd_sof_enable(uint8_t rhport, bool en); void usbd_sof_enable(uint8_t rhport, sof_consumer_t consumer, bool en);
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
/* Helper /* Helper