summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--demo/audio_v1_mic_multichan_template.c2
-rw-r--r--demo/audio_v1_mic_speaker_multichan_template.c2
-rw-r--r--demo/audio_v2_mic_multichan_template.c20
-rw-r--r--demo/audio_v2_mic_speaker_multichan_template.c18
-rw-r--r--demo/audio_v2_speaker_multichan_template.c2
5 files changed, 39 insertions, 5 deletions
diff --git a/demo/audio_v1_mic_multichan_template.c b/demo/audio_v1_mic_multichan_template.c
index 94ca950c..8c759086 100644
--- a/demo/audio_v1_mic_multichan_template.c
+++ b/demo/audio_v1_mic_multichan_template.c
@@ -301,6 +301,8 @@ struct audio_entity_info audio_entity_table[] = {
.ep = AUDIO_IN_EP },
};
+// In windows, audio driver cannot remove auto, so when you modify any descriptor information, please modify string descriptors too.
+
void audio_v1_init(uint8_t busid, uintptr_t reg_base)
{
#ifdef CONFIG_USBDEV_ADVANCE_DESC
diff --git a/demo/audio_v1_mic_speaker_multichan_template.c b/demo/audio_v1_mic_speaker_multichan_template.c
index 5ff5684c..a39cb05b 100644
--- a/demo/audio_v1_mic_speaker_multichan_template.c
+++ b/demo/audio_v1_mic_speaker_multichan_template.c
@@ -393,6 +393,8 @@ struct audio_entity_info audio_entity_table[] = {
.ep = AUDIO_OUT_EP },
};
+// In windows, audio driver cannot remove auto, so when you modify any descriptor information, please modify string descriptors too.
+
void audio_v1_init(uint8_t busid, uintptr_t reg_base)
{
#ifdef CONFIG_USBDEV_ADVANCE_DESC
diff --git a/demo/audio_v2_mic_multichan_template.c b/demo/audio_v2_mic_multichan_template.c
index cd6e9b15..93982970 100644
--- a/demo/audio_v2_mic_multichan_template.c
+++ b/demo/audio_v2_mic_multichan_template.c
@@ -22,7 +22,7 @@
#define AUDIO_IN_CLOCK_ID 0x01
#define AUDIO_IN_FU_ID 0x03
-#define AUDIO_IN_MAX_FREQ 16000
+#define AUDIO_IN_MAX_FREQ 96000
#define HALF_WORD_BYTES 2 //2 half word (one channel)
#define SAMPLE_BITS 16 //16 bit per channel
@@ -225,10 +225,22 @@ const uint8_t audio_v2_descriptor[] = {
#endif
static const uint8_t mic_default_sampling_freq_table[] = {
- AUDIO_SAMPLE_FREQ_NUM(1),
+ AUDIO_SAMPLE_FREQ_NUM(5),
+ AUDIO_SAMPLE_FREQ_4B(8000),
+ AUDIO_SAMPLE_FREQ_4B(8000),
+ AUDIO_SAMPLE_FREQ_4B(0x00),
AUDIO_SAMPLE_FREQ_4B(16000),
AUDIO_SAMPLE_FREQ_4B(16000),
- AUDIO_SAMPLE_FREQ_4B(0x00)
+ AUDIO_SAMPLE_FREQ_4B(0x00),
+ AUDIO_SAMPLE_FREQ_4B(32000),
+ AUDIO_SAMPLE_FREQ_4B(32000),
+ AUDIO_SAMPLE_FREQ_4B(0x00),
+ AUDIO_SAMPLE_FREQ_4B(48000),
+ AUDIO_SAMPLE_FREQ_4B(48000),
+ AUDIO_SAMPLE_FREQ_4B(0x00),
+ AUDIO_SAMPLE_FREQ_4B(96000),
+ AUDIO_SAMPLE_FREQ_4B(96000),
+ AUDIO_SAMPLE_FREQ_4B(0x00),
};
USB_NOCACHE_RAM_SECTION USB_MEM_ALIGNX uint8_t write_buffer[AUDIO_IN_PACKET];
@@ -323,6 +335,8 @@ struct audio_entity_info audio_entity_table[] = {
.ep = AUDIO_IN_EP },
};
+// In windows, audio driver cannot remove auto, so when you modify any descriptor information, please modify string descriptors too.
+
void audio_v2_init(uint8_t busid, uintptr_t reg_base)
{
#ifdef CONFIG_USBDEV_ADVANCE_DESC
diff --git a/demo/audio_v2_mic_speaker_multichan_template.c b/demo/audio_v2_mic_speaker_multichan_template.c
index ce77c302..4b1eda53 100644
--- a/demo/audio_v2_mic_speaker_multichan_template.c
+++ b/demo/audio_v2_mic_speaker_multichan_template.c
@@ -31,7 +31,7 @@
#define AUDIO_IN_FU_ID 0x07
#define AUDIO_OUT_MAX_FREQ 96000
-#define AUDIO_IN_MAX_FREQ 16000
+#define AUDIO_IN_MAX_FREQ 96000
#define HALF_WORD_BYTES 2 //2 half word (one channel)
#define SAMPLE_BITS 16 //16 bit per channel
@@ -330,9 +330,21 @@ static const uint8_t speaker_default_sampling_freq_table[] = {
};
static const uint8_t mic_default_sampling_freq_table[] = {
- AUDIO_SAMPLE_FREQ_NUM(1),
+ AUDIO_SAMPLE_FREQ_NUM(5),
+ AUDIO_SAMPLE_FREQ_4B(8000),
+ AUDIO_SAMPLE_FREQ_4B(8000),
+ AUDIO_SAMPLE_FREQ_4B(0x00),
AUDIO_SAMPLE_FREQ_4B(16000),
AUDIO_SAMPLE_FREQ_4B(16000),
+ AUDIO_SAMPLE_FREQ_4B(0x00),
+ AUDIO_SAMPLE_FREQ_4B(32000),
+ AUDIO_SAMPLE_FREQ_4B(32000),
+ AUDIO_SAMPLE_FREQ_4B(0x00),
+ AUDIO_SAMPLE_FREQ_4B(48000),
+ AUDIO_SAMPLE_FREQ_4B(48000),
+ AUDIO_SAMPLE_FREQ_4B(0x00),
+ AUDIO_SAMPLE_FREQ_4B(96000),
+ AUDIO_SAMPLE_FREQ_4B(96000),
AUDIO_SAMPLE_FREQ_4B(0x00)
};
@@ -501,6 +513,8 @@ struct audio_entity_info audio_entity_table[] = {
.ep = AUDIO_IN_EP },
};
+// In windows, audio driver cannot remove auto, so when you modify any descriptor information, please modify string descriptors too.
+
void audio_v2_init(uint8_t busid, uintptr_t reg_base)
{
#ifdef CONFIG_USBDEV_ADVANCE_DESC
diff --git a/demo/audio_v2_speaker_multichan_template.c b/demo/audio_v2_speaker_multichan_template.c
index e89c8808..5d89575d 100644
--- a/demo/audio_v2_speaker_multichan_template.c
+++ b/demo/audio_v2_speaker_multichan_template.c
@@ -397,6 +397,8 @@ struct audio_entity_info audio_entity_table[] = {
.ep = AUDIO_OUT_EP },
};
+// In windows, audio driver cannot remove auto, so when you modify any descriptor information, please modify string descriptors too.
+
void audio_v2_init(uint8_t busid, uintptr_t reg_base)
{
#ifdef CONFIG_USBDEV_ADVANCE_DESC