Steven/3d_audio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

udpate pids

Browse Source
This commit is contained in:
Steven Dan
2026-05-15 12:10:18 +08:00
parent 917def34d9
commit 2172775553
5 changed files with 121 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sw_usb_audio/app_usb_aud_fosi_c1/CMakeLists.txt
View File

@@ -182,7 +182,7 @@ set(APP_COMPILER_FLAGS_fps_uac2 ${SW_USB_AUDIO_FLAGS} -DXUA_SPD
-DHID_CONTROLS=1 -DHID_CONTROLS=1
-DDNR_50MS=1 -DDNR_50MS=1
-ldnr_50ms -ldnr_50ms
#-DDEBUG_MEMORY_LOG_ENABLED=1 -DDEBUG_MEMORY_LOG_ENABLED=1
-DNO_LOG_TIMESTAPS=0 -DNO_LOG_TIMESTAPS=0
-DI2S_CHANS_ADC=2) -DI2S_CHANS_ADC=2)
@@ -220,7 +220,7 @@ set(APP_COMPILER_FLAGS_br_uac2 ${SW_USB_A
-DEQ_EN=1 -DEQ_EN=1
-DDNR_50MS=1 -DDNR_50MS=1
-ldnr_50ms -ldnr_50ms
#-DDEBUG_MEMORY_LOG_ENABLED=1 -DDEBUG_MEMORY_LOG_ENABLED=1
-DNO_LOG_TIMESTAPS=0 -DNO_LOG_TIMESTAPS=0
-DI2S_CHANS_ADC=2) -DI2S_CHANS_ADC=2)

46
sw_usb_audio/app_usb_aud_fosi_c1/src/core/xua_conf.h
View File

@@ -117,17 +117,14 @@
#define MCLK_48 (1024*48000) /* 48, 96 etc */ #define MCLK_48 (1024*48000) /* 48, 96 etc */
#endif #endif
/* Maximum frequency device runs at */ /* Minumum sample frequency device runs at */
#ifndef MAX_FREQ
#define MAX_FREQ (768000)
#endif
#ifndef MIN_FREQ #ifndef MIN_FREQ
#define MIN_FREQ (44100) #define MIN_FREQ (48000) //(44100)
#endif #endif
#ifndef DEFAULT_FREQ /* Maximum sample frequency device runs at */
#define DEFAULT_FREQ (48000) #ifndef MAX_FREQ
#define MAX_FREQ (48000)
#endif #endif
/*** Defines relating to feature placement regarding tiles ***/ /*** Defines relating to feature placement regarding tiles ***/
@@ -142,16 +139,39 @@
/*** Defines relating to USB descriptor strings and ID's ***/ /*** Defines relating to USB descriptor strings and ID's ***/
#define VENDOR_ID (0x152A) /* XMOS VID */ #define VENDOR_ID (0x152A) /* XMOS VID */
#ifndef PID_AUDIO_2
#if XMOS_FPS_EN==1 #if defined(FPS_UAC2)
#define PID_AUDIO_2 (0x889E) #define PID_AUDIO_2 (0x899E)
#else
#define PID_AUDIO_2 (0x889C)
#endif #endif
#if defined(BYPASS_UAC2)
#define PID_AUDIO_2 (0x899C)
#endif
#if defined(BR_UAC2)
#define PID_AUDIO_2 (0x899A)
#endif
#if defined(V71_UAC2)
#define PID_AUDIO_2 (0x899F)
#endif
#if defined(FPS_UAC1)
#define PID_AUDIO_1 (0x889A)
#endif
#if defined(V71_UAC1)
#define PID_AUDIO_1 (0x889B)
#endif
#ifndef PID_AUDIO_2
#define PID_AUDIO_2 (0x889C)
#endif #endif
#ifndef PID_AUDIO_1 #ifndef PID_AUDIO_1
#define PID_AUDIO_1 (0x889D) #define PID_AUDIO_1 (0x889D)
#endif #endif
#define PRODUCT_STR_A2 "Fosi Audio C1" #define PRODUCT_STR_A2 "Fosi Audio C1"
#define PRODUCT_STR_A1 "Fosi Audio C1" #define PRODUCT_STR_A1 "Fosi Audio C1"

46
sw_usb_audio/app_usb_aud_fosi_c1_lp/src/core/xua_conf.h
View File

@@ -117,17 +117,14 @@
#define MCLK_48 (1024*48000) /* 48, 96 etc */ #define MCLK_48 (1024*48000) /* 48, 96 etc */
#endif #endif
/* Maximum frequency device runs at */ /* Minumum sample frequency device runs at */
#ifndef MAX_FREQ
#define MAX_FREQ (768000)
#endif
#ifndef MIN_FREQ #ifndef MIN_FREQ
#define MIN_FREQ (44100) #define MIN_FREQ (48000) //(44100)
#endif #endif
#ifndef DEFAULT_FREQ /* Maximum sample frequency device runs at */
#define DEFAULT_FREQ (48000) #ifndef MAX_FREQ
#define MAX_FREQ (48000)
#endif #endif
/*** Defines relating to feature placement regarding tiles ***/ /*** Defines relating to feature placement regarding tiles ***/
@@ -142,16 +139,39 @@
/*** Defines relating to USB descriptor strings and ID's ***/ /*** Defines relating to USB descriptor strings and ID's ***/
#define VENDOR_ID (0x152A) /* XMOS VID */ #define VENDOR_ID (0x152A) /* XMOS VID */
#ifndef PID_AUDIO_2
#if XMOS_FPS_EN==1 #if defined(FPS_UAC2)
#define PID_AUDIO_2 (0x889E) #define PID_AUDIO_2 (0x899E)
#else
#define PID_AUDIO_2 (0x889C)
#endif #endif
#if defined(BYPASS_UAC2)
#define PID_AUDIO_2 (0x899C)
#endif
#if defined(BR_UAC2)
#define PID_AUDIO_2 (0x899A)
#endif
#if defined(V71_UAC2)
#define PID_AUDIO_2 (0x899F)
#endif
#if defined(FPS_UAC1)
#define PID_AUDIO_1 (0x889A)
#endif
#if defined(V71_UAC1)
#define PID_AUDIO_1 (0x889B)
#endif
#ifndef PID_AUDIO_2
#define PID_AUDIO_2 (0x889C)
#endif #endif
#ifndef PID_AUDIO_1 #ifndef PID_AUDIO_1
#define PID_AUDIO_1 (0x889D) #define PID_AUDIO_1 (0x889D)
#endif #endif
#define PRODUCT_STR_A2 "Fosi Audio C1" #define PRODUCT_STR_A2 "Fosi Audio C1"
#define PRODUCT_STR_A1 "Fosi Audio C1" #define PRODUCT_STR_A1 "Fosi Audio C1"

2
sw_usb_audio/app_usb_aud_fosi_c1_v71/CMakeLists.txt
View File

@@ -53,6 +53,7 @@ set(APP_COMPILER_FLAGS_v71_uac2 ${SW_USB_AUDIO_FLAGS} -DI2S_CHANS_DAC=2
-ldnr_50ms -ldnr_50ms
-llib_ex3d_all -llib_ex3d_all
-DEQ_EN=0 -DEQ_EN=0
-DV71_UAC2=1
#-DDNR_ENABLE=1 #-DDNR_ENABLE=1
-DSTREAM_FORMAT_OUTPUT_1_RESOLUTION_BITS=16 -DSTREAM_FORMAT_OUTPUT_1_RESOLUTION_BITS=16
-DSTREAM_FORMAT_INPUT_1_RESOLUTION_BITS=16 -DSTREAM_FORMAT_INPUT_1_RESOLUTION_BITS=16
@@ -85,6 +86,7 @@ set(APP_COMPILER_FLAGS_v71_uac1 ${SW_USB_AUDIO_FLAGS} -DI2S_CHANS_DAC=2
-ldnr_50ms -ldnr_50ms
-llib_ex3d_all -llib_ex3d_all
-DEQ_EN=0 -DEQ_EN=0
-DV71_UAC1=1
#-DDNR_ENABLE=1 #-DDNR_ENABLE=1
-DSTREAM_FORMAT_OUTPUT_1_RESOLUTION_BITS=32 -DSTREAM_FORMAT_OUTPUT_1_RESOLUTION_BITS=32
-DSTREAM_FORMAT_INPUT_1_RESOLUTION_BITS=32 -DSTREAM_FORMAT_INPUT_1_RESOLUTION_BITS=32

80
sw_usb_audio/app_usb_aud_fosi_c1_v71/src/core/xua_conf.h
View File

@@ -135,44 +135,46 @@
#define MIDI_TILE (1) #define MIDI_TILE (1)
/*** Defines relating to USB descriptor strings and ID's ***/ /*** Defines relating to USB descriptor strings and ID's ***/
/* SY102 PID assignment (per product spec mode.png): #define VENDOR_ID (0x152A) /* XMOS VID */
* F1 Music UAC2 Windows PID 0x2000
* F3/F4 FPS UAC2 Windows PID 0x2001 (F2/F3/F4 share, mode key distinguishes) #if defined(FPS_UAC2)
* F5 Music UAC1 Non-Windows PID 0x2002 #define PID_AUDIO_2 (0x899E)
* F6/F7 FPS UAC1 Non-Windows PID 0x2003 (F6/F7 share, mode key distinguishes) #endif
* VID 0x20B1 across all modes
*/ #if defined(BYPASS_UAC2)
#define VENDOR_ID (0x20B1) #define PID_AUDIO_2 (0x899C)
#endif
#if defined(BR_UAC2)
#define PID_AUDIO_2 (0x899A)
#endif
#if defined(V71_UAC2)
#define PID_AUDIO_2 (0x899F)
#endif
#if defined(FPS_UAC1)
#define PID_AUDIO_1 (0x889A)
#endif
#if defined(V71_UAC1)
#define PID_AUDIO_1 (0x889B)
#endif
#ifndef PID_AUDIO_2 #ifndef PID_AUDIO_2
#if defined(F1_MUSIC_UAC2) #define PID_AUDIO_2 (0x889C)
#define PID_AUDIO_2 (0x2000) /* F1: Music, UAC2, Windows */
#elif defined(F3_F4_FPS_UAC2)
#define PID_AUDIO_2 (0x2001) /* F3/F4: FPS/AI7.1, UAC2, Windows */
#else
#define PID_AUDIO_2 (0x2000)
#endif #endif
#endif
#ifndef PID_AUDIO_1 #ifndef PID_AUDIO_1
#if defined(F5_MUSIC_UAC1) #define PID_AUDIO_1 (0x889D)
#define PID_AUDIO_1 (0x2002) /* F5: Music, UAC1, Non-Windows */
#elif defined(F6_F7_FPS_UAC1)
#define PID_AUDIO_1 (0x2003) /* F6/F7: FPS/AI7.1, UAC1, Non-Windows */
#else
#define PID_AUDIO_1 (0x2002)
#endif
#endif #endif
#if defined(F1_MUSIC_UAC2) || defined(F5_MUSIC_UAC1) #define PRODUCT_STR_A2 "Fosi Audio C1"
#define PRODUCT_STR_A2 "SY102 Music" #define PRODUCT_STR_A1 "Fosi Audio C1"
#define PRODUCT_STR_A1 "SY102 Music"
#elif defined(F3_F4_FPS_UAC2) || defined(F6_F7_FPS_UAC1)
#define PRODUCT_STR_A2 "SY102 AI Game" #ifndef AUDIO_CLASS_FALLBACK
#define PRODUCT_STR_A1 "SY102 AI Game" #define AUDIO_CLASS_FALLBACK (1)
#else
#define PRODUCT_STR_A2 "SY102"
#define PRODUCT_STR_A1 "SY102"
#endif #endif
/* Board power source - Default is bus-powered */ /* Board power source - Default is bus-powered */
@@ -189,6 +191,20 @@
#define HID_CONTROLS (0) #define HID_CONTROLS (0)
#endif #endif
#ifndef OUTPUT_VOLUME_CONTROL
#define OUTPUT_VOLUME_CONTROL (0)
#endif
#ifndef INPUT_VOLUME_CONTROL
#define INPUT_VOLUME_CONTROL (0)
#endif
#ifndef OUT_VOLUME_IN_MIXER
#define OUT_VOLUME_IN_MIXER (0)
#endif
#ifndef IN_VOLUME_IN_MIXER
#define IN_VOLUME_IN_MIXER (0)
#endif
#define EXCLUDE_USB_AUDIO_MAIN (1) #define EXCLUDE_USB_AUDIO_MAIN (1)
/* /*
* New spispec for QF60 board * New spispec for QF60 board