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

wait codec config is done

Browse Source
This commit is contained in:
Steven Dan
2026-03-26 18:25:22 +08:00
parent 93a74910bf
commit 17ad9324de
3 changed files with 38 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sw_usb_audio/app_usb_aud_phaten_golden_6ch/CMakeLists.txt
View File

@@ -79,7 +79,7 @@ LINK_DIRECTORIES(${CMAKE_CURRENT_LIST_DIR}/../../lib_dnr/lib_dnr)
set(APP_COMPILER_FLAGS_f5_music_uac1 ${SW_USB_AUDIO_FLAGS} -DI2S_CHANS_DAC=2 set(APP_COMPILER_FLAGS_f5_music_uac1 ${SW_USB_AUDIO_FLAGS} -DI2S_CHANS_DAC=2
-DI2S_CHANS_ADC=2 -DI2S_CHANS_ADC=2
-DAUDIO_CLASS=1 -DAUDIO_CLASS=1
-DMIN_FREQ=48000 -DMIN_FREQ=48000
-DMAX_FREQ=48000 -DMAX_FREQ=48000
-DUAC1_MODE=1 -DUAC1_MODE=1
@@ -154,7 +154,7 @@ set(APP_COMPILER_FLAGS_f1_music_uac2 ${SW_USB_AUDIO_FLAGS} -DI2S_CHANS_DAC
-DMIN_VOLUME=0xE000 -DMIN_VOLUME=0xE000
-DINPUT_VOLUME_CONTROL=1 -DINPUT_VOLUME_CONTROL=1
-DOUTPUT_VOLUME_CONTROL=1 -DOUTPUT_VOLUME_CONTROL=1
-DDEBUG_MEMORY_LOG_ENABLED=1 #-DDEBUG_MEMORY_LOG_ENABLED=1
-DXUA_DFU_EN=1 -DXUA_DFU_EN=1
#-DIR_SWITCHING_MODE #-DIR_SWITCHING_MODE
-DHID_CONTROLS=1) -DHID_CONTROLS=1)

2
sw_usb_audio/app_usb_aud_phaten_golden_6ch/src/core/xua_conf.h
View File

@@ -113,7 +113,7 @@
#if defined(F1_MUSIC_UAC2) #if defined(F1_MUSIC_UAC2)
#define MCLK_441 (1024*44100) /* 44.1, 88.2 etc */ #define MCLK_441 (1024*44100) /* 44.1, 88.2 etc */
#else #else
#define MCLK_441 (256*48000) /* 44.1, 88.2 etc */ #define MCLK_441 (256*44100) /* 44.1, 88.2 etc */
#endif #endif
#endif #endif

55
sw_usb_audio/app_usb_aud_phaten_golden_6ch/src/extensions/audiohw.xc
View File

@@ -743,27 +743,41 @@ void button_task(chanend c_hidSendData, chanend cc_mic_level, chanend c_uac_vol,
c_audiohw_rx :> new_dsd_mode; c_audiohw_rx :> new_dsd_mode;
debug_printf("SampRate->tile0: %uHz dsd=%u\n", new_samfreq, new_dsd_mode); debug_printf("SampRate->tile0: %uHz dsd=%u\n", new_samfreq, new_dsd_mode);
switch (new_samfreq) { unsafe {
case 192000: switch (new_samfreq) {
case 176400: case 192000:
unsafe { NAU88C22_REGWRITE(0x0003, 0x00D0, (client interface i2c_master_if)i_i2c_client); } case 176400:
unsafe { NAU88C22_REGWRITE(0x002B, 0x4000, (client interface i2c_master_if)i_i2c_client); } NAU88C22_REGWRITE(0x0003, 0x00D0, (client interface i2c_master_if)i_i2c_client);
unsafe { NAU88C22_REGWRITE(0x002C, 0x0082, (client interface i2c_master_if)i_i2c_client); } NAU88C22_REGWRITE(0x002B, 0x4000, (client interface i2c_master_if)i_i2c_client);
break;
case 96000: NAU88C22_REGWRITE(0x002C, 0x0082, (client interface i2c_master_if)i_i2c_client);
case 88200: break;
unsafe { NAU88C22_REGWRITE(0x0003, 0x0092, (client interface i2c_master_if)i_i2c_client); } case 96000:
unsafe { NAU88C22_REGWRITE(0x002B, 0x4001, (client interface i2c_master_if)i_i2c_client); } case 88200:
unsafe { NAU88C22_REGWRITE(0x002C, 0x0082, (client interface i2c_master_if)i_i2c_client); } NAU88C22_REGWRITE(0x0003, 0x0092, (client interface i2c_master_if)i_i2c_client);
break; NAU88C22_REGWRITE(0x002B, 0x4001, (client interface i2c_master_if)i_i2c_client);
case 44100: NAU88C22_REGWRITE(0x002C, 0x0082, (client interface i2c_master_if)i_i2c_client);
case 48000: break;
default: case 44100:
unsafe { NAU88C22_REGWRITE(0x0003, 0x0053, (client interface i2c_master_if)i_i2c_client); } case 48000:
unsafe { NAU88C22_REGWRITE(0x002B, 0x4002, (client interface i2c_master_if)i_i2c_client); } default:
unsafe { NAU88C22_REGWRITE(0x002C, 0x0082, (client interface i2c_master_if)i_i2c_client); } NAU88C22_REGWRITE(0x0003, 0x0053, (client interface i2c_master_if)i_i2c_client);
break; NAU88C22_REGWRITE(0x002B, 0x4002, (client interface i2c_master_if)i_i2c_client);
NAU88C22_REGWRITE(0x002C, 0x0082, (client interface i2c_master_if)i_i2c_client);
break;
}
#if 0
unsigned val;
NAU88C22_REGREAD(0x0003, val, (client interface i2c_master_if)i_i2c_client);
debug_printf("NAU88C22_REGREAD(0x0003): 0x%08x\n", val);
NAU88C22_REGREAD(0x002B, val, (client interface i2c_master_if)i_i2c_client);
debug_printf("NAU88C22_REGREAD(0x002B): 0x%08x\n", val);
NAU88C22_REGREAD(0x002C, val, (client interface i2c_master_if)i_i2c_client);
debug_printf("NAU88C22_REGREAD(0x002C): 0x%08x\n", val);
#endif
} }
c_audiohw_rx <: 0xff;
#if HID_CONTROLS > 0 #if HID_CONTROLS > 0
g_hid_status_report_data[0] = 0x77; g_hid_status_report_data[0] = 0x77;
@@ -1635,4 +1649,5 @@ void AudioHwConfig(unsigned samFreq, unsigned mClk, unsigned dsdMode, unsigned s
debug_printf("don't unmute at boot\n"); debug_printf("don't unmute at boot\n");
} }
unsafe {uc_audiohw :> dsdMode; }
} }