qieyuan/yb_arm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_ck_v2.1_feature_enhancement#1370#' into 'dev_ck_v2.1'

Browse Source 
update Feature Enhancement#1296 to dev_ck_v2.1

See merge request ucp/driver/ucp4008_platform_arm!38
This commit is contained in:
Xianfeng Du 2023-12-14 01:51:59 +00:00
commit 401863dc47
2 changed files with 695 additions and 694 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osp/inc/ospCfgToBin.h
View File

@ -4,6 +4,7 @@
#define APE_CFG_FILE_NAME_LEN (32) //(64) /* 为节省内存开销，文件名长度由64->32字节 */ #define APE_CFG_FILE_NAME_LEN (32) //(64) /* 为节省内存开销，文件名长度由64->32字节 */
#define APE_CFG_FILE_NUM (64) #define APE_CFG_FILE_NUM (64)
#define APE_SPE_CFG_FILE_NUM (128) #define APE_SPE_CFG_FILE_NUM (128)
#define APE_SPE_CFG_FILE_NAME_LEN (64)
typedef struct OSP_CFG_FILE_REG typedef struct OSP_CFG_FILE_REG
{ {
@ -15,7 +16,7 @@ typedef struct OSP_CFG_FILE_REG
typedef struct OSP_SPE_CFG_FILE_REG typedef struct OSP_SPE_CFG_FILE_REG
{ {
char name[APE_CFG_FILE_NAME_LEN]; char name[APE_SPE_CFG_FILE_NAME_LEN];
uint64_t vir_addr; uint64_t vir_addr;
uint32_t len; uint32_t len;
}osp_spe_cfg_file_reg; }osp_spe_cfg_file_reg;

12
osp/src/ospCfgToBin.c
View File

@ -352,10 +352,10 @@ int32_t osp_read_spe_cfg_to_bin(char* in_path)
uint8_t osp_cfg_file_idx = 0; /* 文件个数 */ uint8_t osp_cfg_file_idx = 0; /* 文件个数 */
uint32_t value = 0; uint32_t value = 0;
char *p_line_file_name = NULL; char *p_line_file_name = NULL;
char line_file_name_full[APE_CFG_FILE_NAME_LEN*2] = {0}; char line_file_name_full[APE_SPE_CFG_FILE_NAME_LEN*2] = {0};
char write_file_name[APE_CFG_FILE_NAME_LEN] = {0}; char write_file_name[APE_SPE_CFG_FILE_NAME_LEN] = {0};
char line_buf[100] = {0}; char line_buf[100] = {0};
char cmd_string[APE_CFG_FILE_NAME_LEN*2] = {0}; char cmd_string[APE_SPE_CFG_FILE_NAME_LEN*2] = {0};
if (NULL == in_path) if (NULL == in_path)
{ {
@ -439,8 +439,8 @@ int32_t osp_spe_bin_cfg_file_to_ddr()
{ {
char *p_line_file_name = NULL; char *p_line_file_name = NULL;
char *p_line_file_name_begin = NULL; char *p_line_file_name_begin = NULL;
char line_file_full_name[2*APE_CFG_FILE_NAME_LEN]={0}; char line_file_full_name[2*APE_SPE_CFG_FILE_NAME_LEN]={0};
char file_name[APE_CFG_FILE_NAME_LEN] = {0}; char file_name[APE_SPE_CFG_FILE_NAME_LEN] = {0};
uint32_t len = 0; uint32_t len = 0;
uint32_t tmp_len = 0; uint32_t tmp_len = 0;
@ -578,7 +578,7 @@ int32_t osp_get_cfg_file(char* name, uint64_t *paddr, uint32_t *psize)
{ {
uint16_t loop = 0; uint16_t loop = 0;
osp_spe_cfg_file_reg *head = NULL; osp_spe_cfg_file_reg *head = NULL;
if (strlen(name) > APE_CFG_FILE_NAME_LEN) if (strlen(name) > APE_SPE_CFG_FILE_NAME_LEN)
{ {
UCP_PRINT_ERROR("[osp_get_cfg_file]: name too long\r\n"); UCP_PRINT_ERROR("[osp_get_cfg_file]: name too long\r\n");
return OSP_ERROR; return OSP_ERROR;