diff options
| author | sakimisu <[email protected]> | 2023-04-22 14:06:12 +0800 |
|---|---|---|
| committer | sakimisu <[email protected]> | 2023-04-22 14:06:12 +0800 |
| commit | 8f56dbdff4a9553d863cc81ca839822913f301ba (patch) | |
| tree | 54a25b107bff3ccdc01f37c133015a5764af80b9 | |
| parent | 31a86ac578dc58f3c5db4026094b4be9db92ba13 (diff) | |
update audio test
| -rw-r--r-- | demo/audio_v1_mic_multichan_template.c | 9 | ||||
| -rw-r--r-- | demo/audio_v1_mic_speaker_multichan_template.c | 25 |
2 files changed, 17 insertions, 17 deletions
diff --git a/demo/audio_v1_mic_multichan_template.c b/demo/audio_v1_mic_multichan_template.c index 60d0de51..8bb1711b 100644 --- a/demo/audio_v1_mic_multichan_template.c +++ b/demo/audio_v1_mic_multichan_template.c @@ -188,16 +188,19 @@ void audio_init() usbd_initialize(); } -USB_NOCACHE_RAM_SECTION USB_MEM_ALIGNX uint8_t write_buffer[2048]; +USB_NOCACHE_RAM_SECTION USB_MEM_ALIGNX uint8_t write_buffer[AUDIO_IN_PACKET]; void audio_test() { while (1) { if (tx_flag) { - memset(write_buffer, 'a', 2048); + memset(write_buffer, 'a', AUDIO_IN_PACKET); ep_tx_busy_flag = true; - usbd_ep_start_write(AUDIO_IN_EP, write_buffer, 2048); + usbd_ep_start_write(AUDIO_IN_EP, write_buffer, AUDIO_IN_PACKET); while (ep_tx_busy_flag) { + if (tx_flag == false) { + break; + } } } } diff --git a/demo/audio_v1_mic_speaker_multichan_template.c b/demo/audio_v1_mic_speaker_multichan_template.c index bbbba9f4..4bb73b4d 100644 --- a/demo/audio_v1_mic_speaker_multichan_template.c +++ b/demo/audio_v1_mic_speaker_multichan_template.c @@ -59,9 +59,9 @@ const uint8_t audio_descriptor[] = { AUDIO_AC_INPUT_TERMINAL_DESCRIPTOR_INIT(0x04, AUDIO_TERMINAL_STREAMING, 0x02, 0x0003), AUDIO_AC_FEATURE_UNIT_DESCRIPTOR_INIT(0x05, 0x04, 0x01, 0x03, 0x00, 0x00), AUDIO_AC_OUTPUT_TERMINAL_DESCRIPTOR_INIT(0x06, AUDIO_OUTTERM_SPEAKER, 0x05), - AUDIO_AS_DESCRIPTOR_INIT(0x01, 0x04, 0x02, AUDIO_SPEAKER_FRAME_SIZE_BYTE, AUDIO_SPEAKER_RESOLUTION_BIT, AUDIO_OUT_EP, AUDIO_OUT_PACKET,\ + AUDIO_AS_DESCRIPTOR_INIT(0x01, 0x04, 0x02, AUDIO_SPEAKER_FRAME_SIZE_BYTE, AUDIO_SPEAKER_RESOLUTION_BIT, AUDIO_OUT_EP, AUDIO_OUT_PACKET, EP_INTERVAL, AUDIO_SAMPLE_FREQ_3B(AUDIO_SPEAKER_FREQ)), - AUDIO_AS_DESCRIPTOR_INIT(0x02, 0x03, 0x02, AUDIO_MIC_FRAME_SIZE_BYTE, AUDIO_MIC_RESOLUTION_BIT, AUDIO_IN_EP, AUDIO_IN_PACKET,\ + AUDIO_AS_DESCRIPTOR_INIT(0x02, 0x03, 0x02, AUDIO_MIC_FRAME_SIZE_BYTE, AUDIO_MIC_RESOLUTION_BIT, AUDIO_IN_EP, AUDIO_IN_PACKET, EP_INTERVAL, AUDIO_SAMPLE_FREQ_3B(AUDIO_MIC_FREQ)), /////////////////////////////////////// /// string0 descriptor @@ -137,7 +137,7 @@ const uint8_t audio_descriptor[] = { 0x00 }; -USB_NOCACHE_RAM_SECTION USB_MEM_ALIGNX uint8_t write_buffer[2048]; +USB_NOCACHE_RAM_SECTION USB_MEM_ALIGNX uint8_t write_buffer[AUDIO_IN_PACKET]; USB_NOCACHE_RAM_SECTION USB_MEM_ALIGNX uint8_t out_buffer[AUDIO_OUT_PACKET]; volatile bool tx_flag = 0; @@ -166,12 +166,6 @@ void usbd_audio_close(uint8_t intf) } } -#ifdef CONFIG_USB_HS -#define AUDIO_OUT_EP_MPS 512 -#else -#define AUDIO_OUT_EP_MPS 64 -#endif - volatile bool ep_tx_busy_flag = false; void usbd_configure_done_callback(void) @@ -223,11 +217,14 @@ void audio_test() { while (1) { if (tx_flag) { - // memset(write_buffer, 'a', 2048); - // ep_tx_busy_flag = true; - // usbd_ep_start_write(AUDIO_IN_EP, write_buffer, 2048); - // while (ep_tx_busy_flag) { - // } + memset(write_buffer, 'a', AUDIO_IN_PACKET); + ep_tx_busy_flag = true; + usbd_ep_start_write(AUDIO_IN_EP, write_buffer, AUDIO_IN_PACKET); + while (ep_tx_busy_flag) { + if (tx_flag == false) { + break; + } + } } } } |