mirror of
https://github.com/hathach/tinyusb.git
synced 2026-06-25 06:24:18 +00:00
Merge pull request #3618 from hathach/copilot/fix-audio-bitfield-order-issues
fix: BE bitfield guards for audio structs and endian-safe wValue/wIndex extraction in UAC2 examples
This commit is contained in:
Ha Thach
GitHub
@ -82,20 +82,20 @@ void audio_task(void) {
|
||||
}
|
||||
|
||||
// Helper for clock get requests
|
||||
static bool tud_audio_clock_get_request(uint8_t rhport, audio20_control_request_t const *request)
|
||||
static bool tud_audio_clock_get_request(uint8_t rhport, tusb_control_request_t const *p_request)
|
||||
{
|
||||
TU_ASSERT(request->bEntityID == UAC2_ENTITY_CLOCK);
|
||||
uint8_t const ctrl_sel = TU_U16_HIGH(p_request->wValue);
|
||||
|
||||
if (request->bControlSelector == AUDIO20_CS_CTRL_SAM_FREQ)
|
||||
if (ctrl_sel == AUDIO20_CS_CTRL_SAM_FREQ)
|
||||
{
|
||||
if (request->bRequest == AUDIO20_CS_REQ_CUR)
|
||||
if (p_request->bRequest == AUDIO20_CS_REQ_CUR)
|
||||
{
|
||||
TU_LOG1("Clock get current freq %" PRIu32 "\r\n", current_sample_rate);
|
||||
|
||||
audio20_control_cur_4_t curf = { (int32_t) tu_htole32(current_sample_rate) };
|
||||
return tud_audio_buffer_and_schedule_control_xfer(rhport, (tusb_control_request_t const *)request, &curf, sizeof(curf));
|
||||
return tud_audio_buffer_and_schedule_control_xfer(rhport, p_request, &curf, sizeof(curf));
|
||||
}
|
||||
else if (request->bRequest == AUDIO20_CS_REQ_RANGE)
|
||||
else if (p_request->bRequest == AUDIO20_CS_REQ_RANGE)
|
||||
{
|
||||
audio20_control_range_4_n_t(N_SAMPLE_RATES) rangef =
|
||||
{
|
||||
@ -110,32 +110,33 @@ static bool tud_audio_clock_get_request(uint8_t rhport, audio20_control_request_
|
||||
TU_LOG1("Range %d (%d, %d, %d)\r\n", i, (int)rangef.subrange[i].bMin, (int)rangef.subrange[i].bMax, (int)rangef.subrange[i].bRes);
|
||||
}
|
||||
|
||||
return tud_audio_buffer_and_schedule_control_xfer(rhport, (tusb_control_request_t const *)request, &rangef, sizeof(rangef));
|
||||
return tud_audio_buffer_and_schedule_control_xfer(rhport, p_request, &rangef, sizeof(rangef));
|
||||
}
|
||||
}
|
||||
else if (request->bControlSelector == AUDIO20_CS_CTRL_CLK_VALID &&
|
||||
request->bRequest == AUDIO20_CS_REQ_CUR)
|
||||
else if (ctrl_sel == AUDIO20_CS_CTRL_CLK_VALID &&
|
||||
p_request->bRequest == AUDIO20_CS_REQ_CUR)
|
||||
{
|
||||
audio20_control_cur_1_t cur_valid = { .bCur = 1 };
|
||||
TU_LOG1("Clock get is valid %u\r\n", cur_valid.bCur);
|
||||
return tud_audio_buffer_and_schedule_control_xfer(rhport, (tusb_control_request_t const *)request, &cur_valid, sizeof(cur_valid));
|
||||
return tud_audio_buffer_and_schedule_control_xfer(rhport, p_request, &cur_valid, sizeof(cur_valid));
|
||||
}
|
||||
TU_LOG1("Clock get request not supported, entity = %u, selector = %u, request = %u\r\n",
|
||||
request->bEntityID, request->bControlSelector, request->bRequest);
|
||||
TU_LOG1("Clock get request not supported, selector = %u, request = %u\r\n",
|
||||
ctrl_sel, p_request->bRequest);
|
||||
return false;
|
||||
}
|
||||
|
||||
// Helper for clock set requests
|
||||
static bool tud_audio_clock_set_request(uint8_t rhport, audio20_control_request_t const *request, uint8_t const *buf)
|
||||
static bool tud_audio_clock_set_request(uint8_t rhport, tusb_control_request_t const *p_request, uint8_t const *buf)
|
||||
{
|
||||
(void)rhport;
|
||||
|
||||
TU_ASSERT(request->bEntityID == UAC2_ENTITY_CLOCK);
|
||||
TU_VERIFY(request->bRequest == AUDIO20_CS_REQ_CUR);
|
||||
uint8_t const ctrl_sel = TU_U16_HIGH(p_request->wValue);
|
||||
|
||||
if (request->bControlSelector == AUDIO20_CS_CTRL_SAM_FREQ)
|
||||
TU_VERIFY(p_request->bRequest == AUDIO20_CS_REQ_CUR);
|
||||
|
||||
if (ctrl_sel == AUDIO20_CS_CTRL_SAM_FREQ)
|
||||
{
|
||||
TU_VERIFY(request->wLength == sizeof(audio20_control_cur_4_t));
|
||||
TU_VERIFY(p_request->wLength == sizeof(audio20_control_cur_4_t));
|
||||
|
||||
current_sample_rate = (uint32_t) ((audio20_control_cur_4_t const *)buf)->bCur;
|
||||
|
||||
@ -145,80 +146,83 @@ static bool tud_audio_clock_set_request(uint8_t rhport, audio20_control_request_
|
||||
}
|
||||
else
|
||||
{
|
||||
TU_LOG1("Clock set request not supported, entity = %u, selector = %u, request = %u\r\n",
|
||||
request->bEntityID, request->bControlSelector, request->bRequest);
|
||||
TU_LOG1("Clock set request not supported, selector = %u, request = %u\r\n",
|
||||
ctrl_sel, p_request->bRequest);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
// Helper for feature unit get requests
|
||||
static bool tud_audio_feature_unit_get_request(uint8_t rhport, audio20_control_request_t const *request)
|
||||
static bool tud_audio_feature_unit_get_request(uint8_t rhport, tusb_control_request_t const *p_request)
|
||||
{
|
||||
TU_ASSERT(request->bEntityID == UAC2_ENTITY_SPK_FEATURE_UNIT);
|
||||
uint8_t const ctrl_sel = TU_U16_HIGH(p_request->wValue);
|
||||
uint8_t const channel_num = TU_U16_LOW(p_request->wValue);
|
||||
|
||||
if (request->bControlSelector == AUDIO20_FU_CTRL_MUTE && request->bRequest == AUDIO20_CS_REQ_CUR)
|
||||
if (ctrl_sel == AUDIO20_FU_CTRL_MUTE && p_request->bRequest == AUDIO20_CS_REQ_CUR)
|
||||
{
|
||||
audio20_control_cur_1_t mute1 = { .bCur = mute[request->bChannelNumber] };
|
||||
TU_LOG1("Get channel %u mute %d\r\n", request->bChannelNumber, mute1.bCur);
|
||||
return tud_audio_buffer_and_schedule_control_xfer(rhport, (tusb_control_request_t const *)request, &mute1, sizeof(mute1));
|
||||
audio20_control_cur_1_t mute1 = { .bCur = mute[channel_num] };
|
||||
TU_LOG1("Get channel %u mute %d\r\n", channel_num, mute1.bCur);
|
||||
return tud_audio_buffer_and_schedule_control_xfer(rhport, p_request, &mute1, sizeof(mute1));
|
||||
}
|
||||
else if (request->bControlSelector == AUDIO20_FU_CTRL_VOLUME)
|
||||
else if (ctrl_sel == AUDIO20_FU_CTRL_VOLUME)
|
||||
{
|
||||
if (request->bRequest == AUDIO20_CS_REQ_RANGE)
|
||||
if (p_request->bRequest == AUDIO20_CS_REQ_RANGE)
|
||||
{
|
||||
audio20_control_range_2_n_t(1) range_vol = {
|
||||
.wNumSubRanges = tu_htole16(1),
|
||||
.subrange[0] = { .bMin = tu_htole16(-VOLUME_CTRL_50_DB), tu_htole16(VOLUME_CTRL_0_DB), tu_htole16(256) }
|
||||
};
|
||||
TU_LOG1("Get channel %u volume range (%d, %d, %u) dB\r\n", request->bChannelNumber,
|
||||
TU_LOG1("Get channel %u volume range (%d, %d, %u) dB\r\n", channel_num,
|
||||
range_vol.subrange[0].bMin / 256, range_vol.subrange[0].bMax / 256, range_vol.subrange[0].bRes / 256);
|
||||
return tud_audio_buffer_and_schedule_control_xfer(rhport, (tusb_control_request_t const *)request, &range_vol, sizeof(range_vol));
|
||||
return tud_audio_buffer_and_schedule_control_xfer(rhport, p_request, &range_vol, sizeof(range_vol));
|
||||
}
|
||||
else if (request->bRequest == AUDIO20_CS_REQ_CUR)
|
||||
else if (p_request->bRequest == AUDIO20_CS_REQ_CUR)
|
||||
{
|
||||
audio20_control_cur_2_t cur_vol = { .bCur = tu_htole16(volume[request->bChannelNumber]) };
|
||||
TU_LOG1("Get channel %u volume %d dB\r\n", request->bChannelNumber, cur_vol.bCur / 256);
|
||||
return tud_audio_buffer_and_schedule_control_xfer(rhport, (tusb_control_request_t const *)request, &cur_vol, sizeof(cur_vol));
|
||||
audio20_control_cur_2_t cur_vol = { .bCur = tu_htole16(volume[channel_num]) };
|
||||
TU_LOG1("Get channel %u volume %d dB\r\n", channel_num, cur_vol.bCur / 256);
|
||||
return tud_audio_buffer_and_schedule_control_xfer(rhport, p_request, &cur_vol, sizeof(cur_vol));
|
||||
}
|
||||
}
|
||||
TU_LOG1("Feature unit get request not supported, entity = %u, selector = %u, request = %u\r\n",
|
||||
request->bEntityID, request->bControlSelector, request->bRequest);
|
||||
TU_LOG1("Feature unit get request not supported, selector = %u, request = %u\r\n",
|
||||
ctrl_sel, p_request->bRequest);
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
// Helper for feature unit set requests
|
||||
static bool tud_audio_feature_unit_set_request(uint8_t rhport, audio20_control_request_t const *request, uint8_t const *buf)
|
||||
static bool tud_audio_feature_unit_set_request(uint8_t rhport, tusb_control_request_t const *p_request, uint8_t const *buf)
|
||||
{
|
||||
(void)rhport;
|
||||
|
||||
TU_ASSERT(request->bEntityID == UAC2_ENTITY_SPK_FEATURE_UNIT);
|
||||
TU_VERIFY(request->bRequest == AUDIO20_CS_REQ_CUR);
|
||||
uint8_t const ctrl_sel = TU_U16_HIGH(p_request->wValue);
|
||||
uint8_t const channel_num = TU_U16_LOW(p_request->wValue);
|
||||
|
||||
if (request->bControlSelector == AUDIO20_FU_CTRL_MUTE)
|
||||
TU_VERIFY(p_request->bRequest == AUDIO20_CS_REQ_CUR);
|
||||
|
||||
if (ctrl_sel == AUDIO20_FU_CTRL_MUTE)
|
||||
{
|
||||
TU_VERIFY(request->wLength == sizeof(audio20_control_cur_1_t));
|
||||
TU_VERIFY(p_request->wLength == sizeof(audio20_control_cur_1_t));
|
||||
|
||||
mute[request->bChannelNumber] = ((audio20_control_cur_1_t const *)buf)->bCur;
|
||||
mute[channel_num] = ((audio20_control_cur_1_t const *)buf)->bCur;
|
||||
|
||||
TU_LOG1("Set channel %d Mute: %d\r\n", request->bChannelNumber, mute[request->bChannelNumber]);
|
||||
TU_LOG1("Set channel %d Mute: %d\r\n", channel_num, mute[channel_num]);
|
||||
|
||||
return true;
|
||||
}
|
||||
else if (request->bControlSelector == AUDIO20_FU_CTRL_VOLUME)
|
||||
else if (ctrl_sel == AUDIO20_FU_CTRL_VOLUME)
|
||||
{
|
||||
TU_VERIFY(request->wLength == sizeof(audio20_control_cur_2_t));
|
||||
TU_VERIFY(p_request->wLength == sizeof(audio20_control_cur_2_t));
|
||||
|
||||
volume[request->bChannelNumber] = ((audio20_control_cur_2_t const *)buf)->bCur;
|
||||
volume[channel_num] = ((audio20_control_cur_2_t const *)buf)->bCur;
|
||||
|
||||
TU_LOG1("Set channel %d volume: %d dB\r\n", request->bChannelNumber, volume[request->bChannelNumber] / 256);
|
||||
TU_LOG1("Set channel %d volume: %d dB\r\n", channel_num, volume[channel_num] / 256);
|
||||
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
TU_LOG1("Feature unit set request not supported, entity = %u, selector = %u, request = %u\r\n",
|
||||
request->bEntityID, request->bControlSelector, request->bRequest);
|
||||
TU_LOG1("Feature unit set request not supported, selector = %u, request = %u\r\n",
|
||||
ctrl_sel, p_request->bRequest);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@ -229,32 +233,32 @@ static bool tud_audio_feature_unit_set_request(uint8_t rhport, audio20_control_r
|
||||
|
||||
// Invoked when audio class specific get request received for an entity
|
||||
bool tud_audio_get_req_entity_cb(uint8_t rhport, tusb_control_request_t const *p_request) {
|
||||
audio20_control_request_t const *request = (audio20_control_request_t const *)p_request;
|
||||
uint8_t const entity_id = TU_U16_HIGH(p_request->wIndex);
|
||||
|
||||
if (request->bEntityID == UAC2_ENTITY_CLOCK) {
|
||||
return tud_audio_clock_get_request(rhport, request);
|
||||
if (entity_id == UAC2_ENTITY_CLOCK) {
|
||||
return tud_audio_clock_get_request(rhport, p_request);
|
||||
}
|
||||
if (request->bEntityID == UAC2_ENTITY_SPK_FEATURE_UNIT) {
|
||||
return tud_audio_feature_unit_get_request(rhport, request);
|
||||
if (entity_id == UAC2_ENTITY_SPK_FEATURE_UNIT) {
|
||||
return tud_audio_feature_unit_get_request(rhport, p_request);
|
||||
} else {
|
||||
TU_LOG1("Get request not handled, entity = %d, selector = %d, request = %d\r\n",
|
||||
request->bEntityID, request->bControlSelector, request->bRequest);
|
||||
entity_id, TU_U16_HIGH(p_request->wValue), p_request->bRequest);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
// Invoked when audio class specific set request received for an entity
|
||||
bool tud_audio_set_req_entity_cb(uint8_t rhport, tusb_control_request_t const *p_request, uint8_t *buf) {
|
||||
audio20_control_request_t const *request = (audio20_control_request_t const *)p_request;
|
||||
uint8_t const entity_id = TU_U16_HIGH(p_request->wIndex);
|
||||
|
||||
if (request->bEntityID == UAC2_ENTITY_SPK_FEATURE_UNIT) {
|
||||
return tud_audio_feature_unit_set_request(rhport, request, buf);
|
||||
if (entity_id == UAC2_ENTITY_SPK_FEATURE_UNIT) {
|
||||
return tud_audio_feature_unit_set_request(rhport, p_request, buf);
|
||||
}
|
||||
if (request->bEntityID == UAC2_ENTITY_CLOCK) {
|
||||
return tud_audio_clock_set_request(rhport, request, buf);
|
||||
if (entity_id == UAC2_ENTITY_CLOCK) {
|
||||
return tud_audio_clock_set_request(rhport, p_request, buf);
|
||||
}
|
||||
TU_LOG1("Set request not handled, entity = %d, selector = %d, request = %d\r\n",
|
||||
request->bEntityID, request->bControlSelector, request->bRequest);
|
||||
entity_id, TU_U16_HIGH(p_request->wValue), p_request->bRequest);
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -319,16 +319,16 @@ static bool audio10_get_req_entity(uint8_t rhport, tusb_control_request_t const
|
||||
#if TUD_OPT_HIGH_SPEED
|
||||
|
||||
// Helper for clock get requests
|
||||
static bool audio20_clock_get_request(uint8_t rhport, audio20_control_request_t const *request) {
|
||||
TU_ASSERT(request->bEntityID == UAC2_ENTITY_CLOCK);
|
||||
static bool audio20_clock_get_request(uint8_t rhport, tusb_control_request_t const *p_request) {
|
||||
uint8_t const ctrl_sel = TU_U16_HIGH(p_request->wValue);
|
||||
|
||||
if (request->bControlSelector == AUDIO20_CS_CTRL_SAM_FREQ) {
|
||||
if (request->bRequest == AUDIO20_CS_REQ_CUR) {
|
||||
if (ctrl_sel == AUDIO20_CS_CTRL_SAM_FREQ) {
|
||||
if (p_request->bRequest == AUDIO20_CS_REQ_CUR) {
|
||||
TU_LOG1("Clock get current freq %" PRIu32 "\r\n", current_sample_rate);
|
||||
|
||||
audio20_control_cur_4_t curf = {(int32_t) tu_htole32(current_sample_rate)};
|
||||
return tud_audio_buffer_and_schedule_control_xfer(rhport, (tusb_control_request_t const *) request, &curf, sizeof(curf));
|
||||
} else if (request->bRequest == AUDIO20_CS_REQ_RANGE) {
|
||||
return tud_audio_buffer_and_schedule_control_xfer(rhport, p_request, &curf, sizeof(curf));
|
||||
} else if (p_request->bRequest == AUDIO20_CS_REQ_RANGE) {
|
||||
audio20_control_range_4_n_t(N_SAMPLE_RATES) rangef =
|
||||
{
|
||||
.wNumSubRanges = tu_htole16(N_SAMPLE_RATES)};
|
||||
@ -340,28 +340,29 @@ static bool audio20_clock_get_request(uint8_t rhport, audio20_control_request_t
|
||||
TU_LOG1("Range %d (%d, %d, %d)\r\n", i, (int) rangef.subrange[i].bMin, (int) rangef.subrange[i].bMax, (int) rangef.subrange[i].bRes);
|
||||
}
|
||||
|
||||
return tud_audio_buffer_and_schedule_control_xfer(rhport, (tusb_control_request_t const *) request, &rangef, sizeof(rangef));
|
||||
return tud_audio_buffer_and_schedule_control_xfer(rhport, p_request, &rangef, sizeof(rangef));
|
||||
}
|
||||
} else if (request->bControlSelector == AUDIO20_CS_CTRL_CLK_VALID &&
|
||||
request->bRequest == AUDIO20_CS_REQ_CUR) {
|
||||
} else if (ctrl_sel == AUDIO20_CS_CTRL_CLK_VALID &&
|
||||
p_request->bRequest == AUDIO20_CS_REQ_CUR) {
|
||||
audio20_control_cur_1_t cur_valid = {.bCur = 1};
|
||||
TU_LOG1("Clock get is valid %u\r\n", cur_valid.bCur);
|
||||
return tud_audio_buffer_and_schedule_control_xfer(rhport, (tusb_control_request_t const *) request, &cur_valid, sizeof(cur_valid));
|
||||
return tud_audio_buffer_and_schedule_control_xfer(rhport, p_request, &cur_valid, sizeof(cur_valid));
|
||||
}
|
||||
TU_LOG1("Clock get request not supported, entity = %u, selector = %u, request = %u\r\n",
|
||||
request->bEntityID, request->bControlSelector, request->bRequest);
|
||||
TU_LOG1("Clock get request not supported, selector = %u, request = %u\r\n",
|
||||
ctrl_sel, p_request->bRequest);
|
||||
return false;
|
||||
}
|
||||
|
||||
// Helper for clock set requests
|
||||
static bool audio20_clock_set_request(uint8_t rhport, audio20_control_request_t const *request, uint8_t const *buf) {
|
||||
static bool audio20_clock_set_request(uint8_t rhport, tusb_control_request_t const *p_request, uint8_t const *buf) {
|
||||
(void) rhport;
|
||||
|
||||
TU_ASSERT(request->bEntityID == UAC2_ENTITY_CLOCK);
|
||||
TU_VERIFY(request->bRequest == AUDIO20_CS_REQ_CUR);
|
||||
uint8_t const ctrl_sel = TU_U16_HIGH(p_request->wValue);
|
||||
|
||||
if (request->bControlSelector == AUDIO20_CS_CTRL_SAM_FREQ) {
|
||||
TU_VERIFY(request->wLength == sizeof(audio20_control_cur_4_t));
|
||||
TU_VERIFY(p_request->bRequest == AUDIO20_CS_REQ_CUR);
|
||||
|
||||
if (ctrl_sel == AUDIO20_CS_CTRL_SAM_FREQ) {
|
||||
TU_VERIFY(p_request->wLength == sizeof(audio20_control_cur_4_t));
|
||||
|
||||
current_sample_rate = (uint32_t) ((audio20_control_cur_4_t const *) buf)->bCur;
|
||||
|
||||
@ -369,93 +370,96 @@ static bool audio20_clock_set_request(uint8_t rhport, audio20_control_request_t
|
||||
|
||||
return true;
|
||||
} else {
|
||||
TU_LOG1("Clock set request not supported, entity = %u, selector = %u, request = %u\r\n",
|
||||
request->bEntityID, request->bControlSelector, request->bRequest);
|
||||
TU_LOG1("Clock set request not supported, selector = %u, request = %u\r\n",
|
||||
ctrl_sel, p_request->bRequest);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
// Helper for feature unit get requests
|
||||
static bool audio20_feature_unit_get_request(uint8_t rhport, audio20_control_request_t const *request) {
|
||||
TU_ASSERT(request->bEntityID == UAC2_ENTITY_SPK_FEATURE_UNIT);
|
||||
static bool audio20_feature_unit_get_request(uint8_t rhport, tusb_control_request_t const *p_request) {
|
||||
uint8_t const ctrl_sel = TU_U16_HIGH(p_request->wValue);
|
||||
uint8_t const channel_num = TU_U16_LOW(p_request->wValue);
|
||||
|
||||
if (request->bControlSelector == AUDIO20_FU_CTRL_MUTE && request->bRequest == AUDIO20_CS_REQ_CUR) {
|
||||
audio20_control_cur_1_t mute1 = {.bCur = mute[request->bChannelNumber]};
|
||||
TU_LOG1("Get channel %u mute %d\r\n", request->bChannelNumber, mute1.bCur);
|
||||
return tud_audio_buffer_and_schedule_control_xfer(rhport, (tusb_control_request_t const *) request, &mute1, sizeof(mute1));
|
||||
} else if (request->bControlSelector == AUDIO20_FU_CTRL_VOLUME) {
|
||||
if (request->bRequest == AUDIO20_CS_REQ_RANGE) {
|
||||
if (ctrl_sel == AUDIO20_FU_CTRL_MUTE && p_request->bRequest == AUDIO20_CS_REQ_CUR) {
|
||||
audio20_control_cur_1_t mute1 = {.bCur = mute[channel_num]};
|
||||
TU_LOG1("Get channel %u mute %d\r\n", channel_num, mute1.bCur);
|
||||
return tud_audio_buffer_and_schedule_control_xfer(rhport, p_request, &mute1, sizeof(mute1));
|
||||
} else if (ctrl_sel == AUDIO20_FU_CTRL_VOLUME) {
|
||||
if (p_request->bRequest == AUDIO20_CS_REQ_RANGE) {
|
||||
audio20_control_range_2_n_t(1) range_vol = {
|
||||
.wNumSubRanges = tu_htole16(1),
|
||||
.subrange[0] = {.bMin = tu_htole16(-VOLUME_CTRL_50_DB), tu_htole16(VOLUME_CTRL_0_DB), tu_htole16(256)}};
|
||||
TU_LOG1("Get channel %u volume range (%d, %d, %u) dB\r\n", request->bChannelNumber,
|
||||
TU_LOG1("Get channel %u volume range (%d, %d, %u) dB\r\n", channel_num,
|
||||
range_vol.subrange[0].bMin / 256, range_vol.subrange[0].bMax / 256, range_vol.subrange[0].bRes / 256);
|
||||
return tud_audio_buffer_and_schedule_control_xfer(rhport, (tusb_control_request_t const *) request, &range_vol, sizeof(range_vol));
|
||||
} else if (request->bRequest == AUDIO20_CS_REQ_CUR) {
|
||||
audio20_control_cur_2_t cur_vol = {.bCur = tu_htole16(volume[request->bChannelNumber])};
|
||||
TU_LOG1("Get channel %u volume %d dB\r\n", request->bChannelNumber, cur_vol.bCur / 256);
|
||||
return tud_audio_buffer_and_schedule_control_xfer(rhport, (tusb_control_request_t const *) request, &cur_vol, sizeof(cur_vol));
|
||||
return tud_audio_buffer_and_schedule_control_xfer(rhport, p_request, &range_vol, sizeof(range_vol));
|
||||
} else if (p_request->bRequest == AUDIO20_CS_REQ_CUR) {
|
||||
audio20_control_cur_2_t cur_vol = {.bCur = tu_htole16(volume[channel_num])};
|
||||
TU_LOG1("Get channel %u volume %d dB\r\n", channel_num, cur_vol.bCur / 256);
|
||||
return tud_audio_buffer_and_schedule_control_xfer(rhport, p_request, &cur_vol, sizeof(cur_vol));
|
||||
}
|
||||
}
|
||||
TU_LOG1("Feature unit get request not supported, entity = %u, selector = %u, request = %u\r\n",
|
||||
request->bEntityID, request->bControlSelector, request->bRequest);
|
||||
TU_LOG1("Feature unit get request not supported, selector = %u, request = %u\r\n",
|
||||
ctrl_sel, p_request->bRequest);
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
// Helper for feature unit set requests
|
||||
static bool audio20_feature_unit_set_request(uint8_t rhport, audio20_control_request_t const *request, uint8_t const *buf) {
|
||||
static bool audio20_feature_unit_set_request(uint8_t rhport, tusb_control_request_t const *p_request, uint8_t const *buf) {
|
||||
(void) rhport;
|
||||
|
||||
TU_ASSERT(request->bEntityID == UAC2_ENTITY_SPK_FEATURE_UNIT);
|
||||
TU_VERIFY(request->bRequest == AUDIO20_CS_REQ_CUR);
|
||||
uint8_t const ctrl_sel = TU_U16_HIGH(p_request->wValue);
|
||||
uint8_t const channel_num = TU_U16_LOW(p_request->wValue);
|
||||
|
||||
if (request->bControlSelector == AUDIO20_FU_CTRL_MUTE) {
|
||||
TU_VERIFY(request->wLength == sizeof(audio20_control_cur_1_t));
|
||||
TU_VERIFY(p_request->bRequest == AUDIO20_CS_REQ_CUR);
|
||||
|
||||
mute[request->bChannelNumber] = ((audio20_control_cur_1_t const *) buf)->bCur;
|
||||
if (ctrl_sel == AUDIO20_FU_CTRL_MUTE) {
|
||||
TU_VERIFY(p_request->wLength == sizeof(audio20_control_cur_1_t));
|
||||
|
||||
TU_LOG1("Set channel %d Mute: %d\r\n", request->bChannelNumber, mute[request->bChannelNumber]);
|
||||
mute[channel_num] = ((audio20_control_cur_1_t const *) buf)->bCur;
|
||||
|
||||
TU_LOG1("Set channel %d Mute: %d\r\n", channel_num, mute[channel_num]);
|
||||
|
||||
return true;
|
||||
} else if (request->bControlSelector == AUDIO20_FU_CTRL_VOLUME) {
|
||||
TU_VERIFY(request->wLength == sizeof(audio20_control_cur_2_t));
|
||||
} else if (ctrl_sel == AUDIO20_FU_CTRL_VOLUME) {
|
||||
TU_VERIFY(p_request->wLength == sizeof(audio20_control_cur_2_t));
|
||||
|
||||
volume[request->bChannelNumber] = ((audio20_control_cur_2_t const *) buf)->bCur;
|
||||
volume[channel_num] = ((audio20_control_cur_2_t const *) buf)->bCur;
|
||||
|
||||
TU_LOG1("Set channel %d volume: %d dB\r\n", request->bChannelNumber, volume[request->bChannelNumber] / 256);
|
||||
TU_LOG1("Set channel %d volume: %d dB\r\n", channel_num, volume[channel_num] / 256);
|
||||
|
||||
return true;
|
||||
} else {
|
||||
TU_LOG1("Feature unit set request not supported, entity = %u, selector = %u, request = %u\r\n",
|
||||
request->bEntityID, request->bControlSelector, request->bRequest);
|
||||
TU_LOG1("Feature unit set request not supported, selector = %u, request = %u\r\n",
|
||||
ctrl_sel, p_request->bRequest);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
static bool audio20_get_req_entity(uint8_t rhport, tusb_control_request_t const *p_request) {
|
||||
audio20_control_request_t const *request = (audio20_control_request_t const *) p_request;
|
||||
uint8_t const entity_id = TU_U16_HIGH(p_request->wIndex);
|
||||
|
||||
if (request->bEntityID == UAC2_ENTITY_CLOCK)
|
||||
return audio20_clock_get_request(rhport, request);
|
||||
if (request->bEntityID == UAC2_ENTITY_SPK_FEATURE_UNIT)
|
||||
return audio20_feature_unit_get_request(rhport, request);
|
||||
if (entity_id == UAC2_ENTITY_CLOCK)
|
||||
return audio20_clock_get_request(rhport, p_request);
|
||||
if (entity_id == UAC2_ENTITY_SPK_FEATURE_UNIT)
|
||||
return audio20_feature_unit_get_request(rhport, p_request);
|
||||
else {
|
||||
TU_LOG1("Get request not handled, entity = %d, selector = %d, request = %d\r\n",
|
||||
request->bEntityID, request->bControlSelector, request->bRequest);
|
||||
entity_id, TU_U16_HIGH(p_request->wValue), p_request->bRequest);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
static bool audio20_set_req_entity(uint8_t rhport, tusb_control_request_t const *p_request, uint8_t *buf) {
|
||||
audio20_control_request_t const *request = (audio20_control_request_t const *) p_request;
|
||||
uint8_t const entity_id = TU_U16_HIGH(p_request->wIndex);
|
||||
|
||||
if (request->bEntityID == UAC2_ENTITY_SPK_FEATURE_UNIT)
|
||||
return audio20_feature_unit_set_request(rhport, request, buf);
|
||||
if (request->bEntityID == UAC2_ENTITY_CLOCK)
|
||||
return audio20_clock_set_request(rhport, request, buf);
|
||||
if (entity_id == UAC2_ENTITY_SPK_FEATURE_UNIT)
|
||||
return audio20_feature_unit_set_request(rhport, p_request, buf);
|
||||
if (entity_id == UAC2_ENTITY_CLOCK)
|
||||
return audio20_clock_set_request(rhport, p_request, buf);
|
||||
TU_LOG1("Set request not handled, entity = %d, selector = %d, request = %d\r\n",
|
||||
request->bEntityID, request->bControlSelector, request->bRequest);
|
||||
entity_id, TU_U16_HIGH(p_request->wValue), p_request->bRequest);
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -315,16 +315,16 @@ const uint32_t sample_rates[] = {44100, 48000, 88200, 96000};
|
||||
|
||||
#define N_SAMPLE_RATES TU_ARRAY_SIZE(sample_rates)
|
||||
|
||||
static bool audio20_clock_get_request(uint8_t rhport, audio20_control_request_t const *request) {
|
||||
TU_ASSERT(request->bEntityID == UAC2_ENTITY_CLOCK);
|
||||
static bool audio20_clock_get_request(uint8_t rhport, tusb_control_request_t const *p_request) {
|
||||
uint8_t const ctrl_sel = TU_U16_HIGH(p_request->wValue);
|
||||
|
||||
if (request->bControlSelector == AUDIO20_CS_CTRL_SAM_FREQ) {
|
||||
if (request->bRequest == AUDIO20_CS_REQ_CUR) {
|
||||
if (ctrl_sel == AUDIO20_CS_CTRL_SAM_FREQ) {
|
||||
if (p_request->bRequest == AUDIO20_CS_REQ_CUR) {
|
||||
TU_LOG1("Clock get current freq %" PRIu32 "\r\n", current_sample_rate);
|
||||
|
||||
audio20_control_cur_4_t curf = {(int32_t) tu_htole32(current_sample_rate)};
|
||||
return tud_audio_buffer_and_schedule_control_xfer(rhport, (tusb_control_request_t const *) request, &curf, sizeof(curf));
|
||||
} else if (request->bRequest == AUDIO20_CS_REQ_RANGE) {
|
||||
return tud_audio_buffer_and_schedule_control_xfer(rhport, p_request, &curf, sizeof(curf));
|
||||
} else if (p_request->bRequest == AUDIO20_CS_REQ_RANGE) {
|
||||
audio20_control_range_4_n_t(N_SAMPLE_RATES) rangef =
|
||||
{
|
||||
.wNumSubRanges = tu_htole16(N_SAMPLE_RATES)};
|
||||
@ -336,25 +336,26 @@ static bool audio20_clock_get_request(uint8_t rhport, audio20_control_request_t
|
||||
TU_LOG1("Range %d (%d, %d, %d)\r\n", i, (int) rangef.subrange[i].bMin, (int) rangef.subrange[i].bMax, (int) rangef.subrange[i].bRes);
|
||||
}
|
||||
|
||||
return tud_audio_buffer_and_schedule_control_xfer(rhport, (tusb_control_request_t const *) request, &rangef, sizeof(rangef));
|
||||
return tud_audio_buffer_and_schedule_control_xfer(rhport, p_request, &rangef, sizeof(rangef));
|
||||
}
|
||||
} else if (request->bControlSelector == AUDIO20_CS_CTRL_CLK_VALID &&
|
||||
request->bRequest == AUDIO20_CS_REQ_CUR) {
|
||||
} else if (ctrl_sel == AUDIO20_CS_CTRL_CLK_VALID &&
|
||||
p_request->bRequest == AUDIO20_CS_REQ_CUR) {
|
||||
audio20_control_cur_1_t cur_valid = {.bCur = 1};
|
||||
TU_LOG1("Clock get is valid %u\r\n", cur_valid.bCur);
|
||||
return tud_audio_buffer_and_schedule_control_xfer(rhport, (tusb_control_request_t const *) request, &cur_valid, sizeof(cur_valid));
|
||||
return tud_audio_buffer_and_schedule_control_xfer(rhport, p_request, &cur_valid, sizeof(cur_valid));
|
||||
}
|
||||
TU_LOG1("Clock get request not supported, entity = %u, selector = %u, request = %u\r\n",
|
||||
request->bEntityID, request->bControlSelector, request->bRequest);
|
||||
TU_LOG1("Clock get request not supported, selector = %u, request = %u\r\n",
|
||||
ctrl_sel, p_request->bRequest);
|
||||
return false;
|
||||
}
|
||||
|
||||
static bool audio20_clock_set_request(audio20_control_request_t const *request, uint8_t const *buf) {
|
||||
TU_ASSERT(request->bEntityID == UAC2_ENTITY_CLOCK);
|
||||
TU_VERIFY(request->bRequest == AUDIO20_CS_REQ_CUR);
|
||||
static bool audio20_clock_set_request(tusb_control_request_t const *p_request, uint8_t const *buf) {
|
||||
uint8_t const ctrl_sel = TU_U16_HIGH(p_request->wValue);
|
||||
|
||||
if (request->bControlSelector == AUDIO20_CS_CTRL_SAM_FREQ) {
|
||||
TU_VERIFY(request->wLength == sizeof(audio20_control_cur_4_t));
|
||||
TU_VERIFY(p_request->bRequest == AUDIO20_CS_REQ_CUR);
|
||||
|
||||
if (ctrl_sel == AUDIO20_CS_CTRL_SAM_FREQ) {
|
||||
TU_VERIFY(p_request->wLength == sizeof(audio20_control_cur_4_t));
|
||||
|
||||
current_sample_rate = (uint32_t) ((audio20_control_cur_4_t const *) buf)->bCur;
|
||||
|
||||
@ -362,89 +363,92 @@ static bool audio20_clock_set_request(audio20_control_request_t const *request,
|
||||
|
||||
return true;
|
||||
} else {
|
||||
TU_LOG1("Clock set request not supported, entity = %u, selector = %u, request = %u\r\n",
|
||||
request->bEntityID, request->bControlSelector, request->bRequest);
|
||||
TU_LOG1("Clock set request not supported, selector = %u, request = %u\r\n",
|
||||
ctrl_sel, p_request->bRequest);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
static bool audio20_feature_unit_get_request(uint8_t rhport, audio20_control_request_t const *request) {
|
||||
TU_ASSERT(request->bEntityID == UAC2_ENTITY_FEATURE_UNIT);
|
||||
static bool audio20_feature_unit_get_request(uint8_t rhport, tusb_control_request_t const *p_request) {
|
||||
uint8_t const ctrl_sel = TU_U16_HIGH(p_request->wValue);
|
||||
uint8_t const channel_num = TU_U16_LOW(p_request->wValue);
|
||||
|
||||
if (request->bControlSelector == AUDIO20_FU_CTRL_MUTE && request->bRequest == AUDIO20_CS_REQ_CUR) {
|
||||
audio20_control_cur_1_t mute1 = {.bCur = mute[request->bChannelNumber]};
|
||||
TU_LOG1("Get channel %u mute %d\r\n", request->bChannelNumber, mute1.bCur);
|
||||
return tud_audio_buffer_and_schedule_control_xfer(rhport, (tusb_control_request_t const *) request, &mute1, sizeof(mute1));
|
||||
} else if (request->bControlSelector == AUDIO20_FU_CTRL_VOLUME) {
|
||||
if (request->bRequest == AUDIO20_CS_REQ_RANGE) {
|
||||
if (ctrl_sel == AUDIO20_FU_CTRL_MUTE && p_request->bRequest == AUDIO20_CS_REQ_CUR) {
|
||||
audio20_control_cur_1_t mute1 = {.bCur = mute[channel_num]};
|
||||
TU_LOG1("Get channel %u mute %d\r\n", channel_num, mute1.bCur);
|
||||
return tud_audio_buffer_and_schedule_control_xfer(rhport, p_request, &mute1, sizeof(mute1));
|
||||
} else if (ctrl_sel == AUDIO20_FU_CTRL_VOLUME) {
|
||||
if (p_request->bRequest == AUDIO20_CS_REQ_RANGE) {
|
||||
audio20_control_range_2_n_t(1) range_vol = {
|
||||
.wNumSubRanges = tu_htole16(1),
|
||||
.subrange[0] = {.bMin = tu_htole16(-VOLUME_CTRL_50_DB), tu_htole16(VOLUME_CTRL_0_DB), tu_htole16(256)}};
|
||||
TU_LOG1("Get channel %u volume range (%d, %d, %u) dB\r\n", request->bChannelNumber,
|
||||
TU_LOG1("Get channel %u volume range (%d, %d, %u) dB\r\n", channel_num,
|
||||
range_vol.subrange[0].bMin / 256, range_vol.subrange[0].bMax / 256, range_vol.subrange[0].bRes / 256);
|
||||
return tud_audio_buffer_and_schedule_control_xfer(rhport, (tusb_control_request_t const *) request, &range_vol, sizeof(range_vol));
|
||||
} else if (request->bRequest == AUDIO20_CS_REQ_CUR) {
|
||||
audio20_control_cur_2_t cur_vol = {.bCur = tu_htole16(volume[request->bChannelNumber])};
|
||||
TU_LOG1("Get channel %u volume %d dB\r\n", request->bChannelNumber, cur_vol.bCur / 256);
|
||||
return tud_audio_buffer_and_schedule_control_xfer(rhport, (tusb_control_request_t const *) request, &cur_vol, sizeof(cur_vol));
|
||||
return tud_audio_buffer_and_schedule_control_xfer(rhport, p_request, &range_vol, sizeof(range_vol));
|
||||
} else if (p_request->bRequest == AUDIO20_CS_REQ_CUR) {
|
||||
audio20_control_cur_2_t cur_vol = {.bCur = tu_htole16(volume[channel_num])};
|
||||
TU_LOG1("Get channel %u volume %d dB\r\n", channel_num, cur_vol.bCur / 256);
|
||||
return tud_audio_buffer_and_schedule_control_xfer(rhport, p_request, &cur_vol, sizeof(cur_vol));
|
||||
}
|
||||
}
|
||||
TU_LOG1("Feature unit get request not supported, entity = %u, selector = %u, request = %u\r\n",
|
||||
request->bEntityID, request->bControlSelector, request->bRequest);
|
||||
TU_LOG1("Feature unit get request not supported, selector = %u, request = %u\r\n",
|
||||
ctrl_sel, p_request->bRequest);
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
static bool audio20_feature_unit_set_request(audio20_control_request_t const *request, uint8_t const *buf) {
|
||||
TU_ASSERT(request->bEntityID == UAC2_ENTITY_FEATURE_UNIT);
|
||||
TU_VERIFY(request->bRequest == AUDIO20_CS_REQ_CUR);
|
||||
static bool audio20_feature_unit_set_request(tusb_control_request_t const *p_request, uint8_t const *buf) {
|
||||
uint8_t const ctrl_sel = TU_U16_HIGH(p_request->wValue);
|
||||
uint8_t const channel_num = TU_U16_LOW(p_request->wValue);
|
||||
|
||||
if (request->bControlSelector == AUDIO20_FU_CTRL_MUTE) {
|
||||
TU_VERIFY(request->wLength == sizeof(audio20_control_cur_1_t));
|
||||
TU_VERIFY(p_request->bRequest == AUDIO20_CS_REQ_CUR);
|
||||
|
||||
mute[request->bChannelNumber] = ((audio20_control_cur_1_t const *) buf)->bCur;
|
||||
if (ctrl_sel == AUDIO20_FU_CTRL_MUTE) {
|
||||
TU_VERIFY(p_request->wLength == sizeof(audio20_control_cur_1_t));
|
||||
|
||||
TU_LOG1("Set channel %d Mute: %d\r\n", request->bChannelNumber, mute[request->bChannelNumber]);
|
||||
mute[channel_num] = ((audio20_control_cur_1_t const *) buf)->bCur;
|
||||
|
||||
TU_LOG1("Set channel %d Mute: %d\r\n", channel_num, mute[channel_num]);
|
||||
|
||||
return true;
|
||||
} else if (request->bControlSelector == AUDIO20_FU_CTRL_VOLUME) {
|
||||
TU_VERIFY(request->wLength == sizeof(audio20_control_cur_2_t));
|
||||
} else if (ctrl_sel == AUDIO20_FU_CTRL_VOLUME) {
|
||||
TU_VERIFY(p_request->wLength == sizeof(audio20_control_cur_2_t));
|
||||
|
||||
volume[request->bChannelNumber] = ((audio20_control_cur_2_t const *) buf)->bCur;
|
||||
volume[channel_num] = ((audio20_control_cur_2_t const *) buf)->bCur;
|
||||
|
||||
TU_LOG1("Set channel %d volume: %d dB\r\n", request->bChannelNumber, volume[request->bChannelNumber] / 256);
|
||||
TU_LOG1("Set channel %d volume: %d dB\r\n", channel_num, volume[channel_num] / 256);
|
||||
|
||||
return true;
|
||||
} else {
|
||||
TU_LOG1("Feature unit set request not supported, entity = %u, selector = %u, request = %u\r\n",
|
||||
request->bEntityID, request->bControlSelector, request->bRequest);
|
||||
TU_LOG1("Feature unit set request not supported, selector = %u, request = %u\r\n",
|
||||
ctrl_sel, p_request->bRequest);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
static bool audio20_get_req_entity(uint8_t rhport, tusb_control_request_t const *p_request) {
|
||||
audio20_control_request_t const *request = (audio20_control_request_t const *) p_request;
|
||||
uint8_t const entity_id = TU_U16_HIGH(p_request->wIndex);
|
||||
|
||||
if (request->bEntityID == UAC2_ENTITY_CLOCK)
|
||||
return audio20_clock_get_request(rhport, request);
|
||||
if (request->bEntityID == UAC2_ENTITY_FEATURE_UNIT)
|
||||
return audio20_feature_unit_get_request(rhport, request);
|
||||
if (entity_id == UAC2_ENTITY_CLOCK)
|
||||
return audio20_clock_get_request(rhport, p_request);
|
||||
if (entity_id == UAC2_ENTITY_FEATURE_UNIT)
|
||||
return audio20_feature_unit_get_request(rhport, p_request);
|
||||
else {
|
||||
TU_LOG1("Get request not handled, entity = %d, selector = %d, request = %d\r\n",
|
||||
request->bEntityID, request->bControlSelector, request->bRequest);
|
||||
entity_id, TU_U16_HIGH(p_request->wValue), p_request->bRequest);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
static bool audio20_set_req_entity(tusb_control_request_t const *p_request, uint8_t *buf) {
|
||||
audio20_control_request_t const *request = (audio20_control_request_t const *) p_request;
|
||||
uint8_t const entity_id = TU_U16_HIGH(p_request->wIndex);
|
||||
|
||||
if (request->bEntityID == UAC2_ENTITY_FEATURE_UNIT)
|
||||
return audio20_feature_unit_set_request(request, buf);
|
||||
if (request->bEntityID == UAC2_ENTITY_CLOCK)
|
||||
return audio20_clock_set_request(request, buf);
|
||||
if (entity_id == UAC2_ENTITY_FEATURE_UNIT)
|
||||
return audio20_feature_unit_set_request(p_request, buf);
|
||||
if (entity_id == UAC2_ENTITY_CLOCK)
|
||||
return audio20_clock_set_request(p_request, buf);
|
||||
TU_LOG1("Set request not handled, entity = %d, selector = %d, request = %d\r\n",
|
||||
request->bEntityID, request->bControlSelector, request->bRequest);
|
||||
entity_id, TU_U16_HIGH(p_request->wValue), p_request->bRequest);
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -490,10 +490,19 @@ typedef struct TU_ATTR_PACKED {
|
||||
uint8_t bDescriptorType; ///< Descriptor Type. Value: TUSB_DESC_ENDPOINT.
|
||||
uint8_t bEndpointAddress;///< The address of the endpoint on the USB device described by this descriptor.
|
||||
struct TU_ATTR_PACKED {
|
||||
#if (TU_BITFIELD_ORDER == TU_BITFIELD_LE)
|
||||
uint8_t xfer : 2; // Control, ISO, Bulk, Interrupt
|
||||
uint8_t sync : 2; // None, Asynchronous, Adaptive, Synchronous
|
||||
uint8_t usage : 2; // Data, Feedback, Implicit feedback
|
||||
uint8_t : 2;
|
||||
#elif (TU_BITFIELD_ORDER == TU_BITFIELD_BE)
|
||||
uint8_t : 2;
|
||||
uint8_t usage : 2; // Data, Feedback, Implicit feedback
|
||||
uint8_t sync : 2; // None, Asynchronous, Adaptive, Synchronous
|
||||
uint8_t xfer : 2; // Control, ISO, Bulk, Interrupt
|
||||
#else
|
||||
#error "Please define TU_BITFIELD_ORDER as TU_BITFIELD_LE or TU_BITFIELD_BE"
|
||||
#endif
|
||||
} bmAttributes;
|
||||
uint16_t wMaxPacketSize; ///< Maximum packet size this endpoint is capable of sending or receiving when this configuration is selected.
|
||||
uint8_t bInterval; ///< Interval for polling endpoint for data transfers.
|
||||
@ -1177,29 +1186,6 @@ typedef struct TU_ATTR_PACKED {
|
||||
uint16_t wLockDelay; ///< Indicates the time it takes this endpoint to reliably lock its internal clock recovery circuitry. Units used depend on the value of the bLockDelayUnits field.
|
||||
} audio20_desc_cs_as_iso_data_ep_t;
|
||||
|
||||
// 5.2.2 Control Request Layout
|
||||
typedef struct TU_ATTR_PACKED {
|
||||
union {
|
||||
struct TU_ATTR_PACKED {
|
||||
uint8_t recipient : 5;///< Recipient type tusb_request_recipient_t.
|
||||
uint8_t type : 2; ///< Request type tusb_request_type_t.
|
||||
uint8_t direction : 1;///< Direction type. tusb_dir_t
|
||||
} bmRequestType_bit;
|
||||
|
||||
uint8_t bmRequestType;
|
||||
};
|
||||
|
||||
uint8_t bRequest;///< Request type audio_cs_req_t
|
||||
uint8_t bChannelNumber;
|
||||
uint8_t bControlSelector;
|
||||
union {
|
||||
uint8_t bInterface;
|
||||
uint8_t bEndpoint;
|
||||
};
|
||||
uint8_t bEntityID;
|
||||
uint16_t wLength;
|
||||
} audio20_control_request_t;
|
||||
|
||||
//// 5.2.3 Control Request Parameter Block Layout
|
||||
|
||||
// 5.2.3.1 1-byte Control CUR Parameter Block
|
||||
|
||||
Reference in New Issue
Block a user