Skip to content

Commit 5153312

Browse files
authored
Merge pull request #3197 from hathach/fix-audio-typo
fix tud_audio_set_itf_close_EP_cb() typo
2 parents 87d9e05 + d9aa4c6 commit 5153312

File tree

8 files changed

+13
-10
lines changed

8 files changed

+13
-10
lines changed

examples/device/audio_test/src/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ bool tud_audio_get_req_entity_cb(uint8_t rhport, tusb_control_request_t const *p
386386
return false;// Yet not implemented
387387
}
388388

389-
bool tud_audio_set_itf_close_EP_cb(uint8_t rhport, tusb_control_request_t const *p_request) {
389+
bool tud_audio_set_itf_close_ep_cb(uint8_t rhport, tusb_control_request_t const *p_request) {
390390
(void) rhport;
391391
(void) p_request;
392392
startVal = 0;

examples/device/audio_test_freertos/src/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ bool tud_audio_get_req_entity_cb(uint8_t rhport, tusb_control_request_t const *p
457457
return false;// Yet not implemented
458458
}
459459

460-
bool tud_audio_set_itf_close_EP_cb(uint8_t rhport, tusb_control_request_t const *p_request) {
460+
bool tud_audio_set_itf_close_ep_cb(uint8_t rhport, tusb_control_request_t const *p_request) {
461461
(void) rhport;
462462
(void) p_request;
463463
startVal = 0;

examples/device/audio_test_multi_rate/src/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ bool tud_audio_get_req_entity_cb(uint8_t rhport, tusb_control_request_t const *p
455455
return false;// Yet not implemented
456456
}
457457

458-
bool tud_audio_set_itf_close_EP_cb(uint8_t rhport, tusb_control_request_t const *p_request) {
458+
bool tud_audio_set_itf_close_ep_cb(uint8_t rhport, tusb_control_request_t const *p_request) {
459459
(void) rhport;
460460
(void) p_request;
461461
startVal = 0;

examples/device/cdc_uac2/src/uac2_app.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ bool tud_audio_set_req_entity_cb(uint8_t rhport, tusb_control_request_t const *p
257257
return false;
258258
}
259259

260-
bool tud_audio_set_itf_close_EP_cb(uint8_t rhport, tusb_control_request_t const * p_request)
260+
bool tud_audio_set_itf_close_ep_cb(uint8_t rhport, tusb_control_request_t const * p_request)
261261
{
262262
(void)rhport;
263263

examples/device/uac2_headset/src/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ bool tud_audio_set_req_entity_cb(uint8_t rhport, tusb_control_request_t const *p
291291
return false;
292292
}
293293

294-
bool tud_audio_set_itf_close_EP_cb(uint8_t rhport, tusb_control_request_t const *p_request) {
294+
bool tud_audio_set_itf_close_ep_cb(uint8_t rhport, tusb_control_request_t const *p_request) {
295295
(void) rhport;
296296

297297
uint8_t const itf = tu_u16_low(tu_le16toh(p_request->wIndex));

examples/device/uac2_speaker_fb/src/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ bool tud_audio_set_req_entity_cb(uint8_t rhport, tusb_control_request_t const *p
299299
return false;
300300
}
301301

302-
bool tud_audio_set_itf_close_EP_cb(uint8_t rhport, tusb_control_request_t const *p_request) {
302+
bool tud_audio_set_itf_close_ep_cb(uint8_t rhport, tusb_control_request_t const *p_request) {
303303
(void) rhport;
304304

305305
uint8_t const itf = tu_u16_low(tu_le16toh(p_request->wIndex));

src/class/audio/audio_device.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ TU_ATTR_WEAK bool tud_audio_set_itf_cb(uint8_t rhport, tusb_control_request_t co
402402
}
403403

404404
// Invoked when audio set interface request received which closes an EP
405-
TU_ATTR_WEAK bool tud_audio_set_itf_close_EP_cb(uint8_t rhport, tusb_control_request_t const *p_request) {
405+
TU_ATTR_WEAK bool tud_audio_set_itf_close_ep_cb(uint8_t rhport, tusb_control_request_t const *p_request) {
406406
(void) rhport;
407407
(void) p_request;
408408
return true;
@@ -1078,7 +1078,7 @@ static bool audiod_set_interface(uint8_t rhport, tusb_control_request_t const *p
10781078
tu_fifo_clear(&audio->ep_in_ff);
10791079

10801080
// Invoke callback - can be used to stop data sampling
1081-
TU_VERIFY(tud_audio_set_itf_close_EP_cb(rhport, p_request));
1081+
TU_VERIFY(tud_audio_set_itf_close_ep_cb(rhport, p_request));
10821082

10831083
audio->ep_in = 0;// Necessary?
10841084

@@ -1101,7 +1101,7 @@ static bool audiod_set_interface(uint8_t rhport, tusb_control_request_t const *p
11011101
tu_fifo_clear(&audio->ep_out_ff);
11021102

11031103
// Invoke callback - can be used to stop data sampling
1104-
TU_VERIFY(tud_audio_set_itf_close_EP_cb(rhport, p_request));
1104+
TU_VERIFY(tud_audio_set_itf_close_ep_cb(rhport, p_request));
11051105

11061106
audio->ep_out = 0;// Necessary?
11071107

src/class/audio/audio_device.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,10 @@ void tud_audio_int_done_cb(uint8_t rhport);
381381
bool tud_audio_set_itf_cb(uint8_t rhport, tusb_control_request_t const * p_request);
382382

383383
// Invoked when audio set interface request received which closes an EP
384-
bool tud_audio_set_itf_close_EP_cb(uint8_t rhport, tusb_control_request_t const * p_request);
384+
bool tud_audio_set_itf_close_ep_cb(uint8_t rhport, tusb_control_request_t const * p_request);
385+
386+
// backward compatible for typo
387+
#define tud_audio_set_itf_close_EP_cb tud_audio_set_itf_close_ep_cb
385388

386389
// Invoked when audio class specific set request received for an EP
387390
bool tud_audio_set_req_ep_cb(uint8_t rhport, tusb_control_request_t const * p_request, uint8_t *pBuff);

0 commit comments

Comments
 (0)