From 56cf9b6c4e00080799335e4177a7a9041166ca82 Mon Sep 17 00:00:00 2001 From: Steven Dan Date: Mon, 18 May 2026 15:46:55 +0800 Subject: [PATCH] udpate v71 program --- .../app_usb_aud_fosi_c1/CMakeLists.txt | 2 +- .../src/extensions/lfs_services.c | 20 +++++++++++++++++++ .../src/extensions/program_key.c | 5 +++-- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/sw_usb_audio/app_usb_aud_fosi_c1/CMakeLists.txt b/sw_usb_audio/app_usb_aud_fosi_c1/CMakeLists.txt index 8f64fbb..a15c82f 100644 --- a/sw_usb_audio/app_usb_aud_fosi_c1/CMakeLists.txt +++ b/sw_usb_audio/app_usb_aud_fosi_c1/CMakeLists.txt @@ -213,7 +213,7 @@ set(APP_COMPILER_FLAGS_br_uac2 ${SW_USB_A -DDEFAULT_FREQ=\(48000\) -DUAC1=1 -DTHREE_AUDIO=1 - -lxmos_fps + #-lxmos_fps -DHID_CONTROLS=1 -DBR_ALGO=1 -lbr diff --git a/sw_usb_audio/app_usb_aud_fosi_c1_v71/src/extensions/lfs_services.c b/sw_usb_audio/app_usb_aud_fosi_c1_v71/src/extensions/lfs_services.c index 602cf01..1a63d49 100644 --- a/sw_usb_audio/app_usb_aud_fosi_c1_v71/src/extensions/lfs_services.c +++ b/sw_usb_audio/app_usb_aud_fosi_c1_v71/src/extensions/lfs_services.c @@ -11,6 +11,10 @@ #include "rtos_qspi_flash.h" #include "swlock.h" #include "debug_print.h" +#include "uac_hwresources.h" +#if HID_DFU_EN +#include "dfu_upgrade.h" +#endif // variables used by the filesystem lfs_t lfs; lfs_file_t file; @@ -167,6 +171,14 @@ int lfs_format_all(void) { #pragma stackfunction 1500 void lfs_read_config(unsigned char * config, unsigned char * buffer, unsigned size) { + // 改动原因:升级过程中禁止Flash读操作 +#if HID_DFU_EN + if (firmware_upgrade_get_state() != UPGRADE_IDLE) { + debug_printf("lfs_read_config blocked during firmware upgrade\n"); + return; + } +#endif + debug_printf("lfs_read_config: %s, size: %d\n", config, size); int result = lfs_file_open(&lfs, &file, config, LFS_O_RDWR | LFS_O_CREAT); debug_printf("lfs_read_config: %s, result: %d\n", config, result); @@ -189,6 +201,14 @@ void lfs_read_config(unsigned char * config, unsigned char * buffer, unsigned si #pragma stackfunction 1500 void lfs_write_config(unsigned char * config, unsigned char * buffer, unsigned size) { + // 改动原因:升级过程中禁止Flash写操作 +#if HID_DFU_EN + if (firmware_upgrade_get_state() != UPGRADE_IDLE) { + debug_printf("lfs_write_config blocked during firmware upgrade\n"); + return; + } +#endif + debug_printf("lfs_write_config: %s, size: %d\n", config, size); int result = lfs_file_open(&lfs, &file, config, LFS_O_RDWR | LFS_O_CREAT); if (result != 0) { diff --git a/sw_usb_audio/app_usb_aud_fosi_c1_v71/src/extensions/program_key.c b/sw_usb_audio/app_usb_aud_fosi_c1_v71/src/extensions/program_key.c index 588ddc7..d041cde 100644 --- a/sw_usb_audio/app_usb_aud_fosi_c1_v71/src/extensions/program_key.c +++ b/sw_usb_audio/app_usb_aud_fosi_c1_v71/src/extensions/program_key.c @@ -4,6 +4,7 @@ #include #include #include +#include "uac_hwresources.h" #include "hmac.h" #include "xua_conf.h" #include "swlock.h" @@ -87,7 +88,7 @@ fl_QSPIPorts p_opt_tile0 = XS1_PORT_1B, XS1_PORT_1C, XS1_PORT_4B, - XS1_CLKBLK_3 + CLKBLK_FLASHLIB }; fl_QSPIPorts p_opt_tile1 = @@ -95,7 +96,7 @@ fl_QSPIPorts p_opt_tile1 = XS1_PORT_1F, XS1_PORT_1G, XS1_PORT_4D, - XS1_CLKBLK_3 + CLKBLK_FLASHLIB }; #define KEY_ADDRESS 0xFFFD0