Merge branch 'dev_ck_v2.1_bug#1373#' into 'dev_ck_v2.1'

merge dev_ck_v2.1_bug#1373# to dev_ck_v2.1

See merge request ucp/driver/ucp4008_platform_spu!72
This commit is contained in:
Xianfeng Du 2023-12-11 02:03:09 +00:00
commit d99240c51f
2 changed files with 3614 additions and 3612 deletions

View File

@ -3,7 +3,7 @@
#include "osp_type_def.h" #include "osp_type_def.h"
#define APE_CFG_FILE_NAME_LEN (64) #define APE_CFG_FILE_NAME_LEN (32) //(64) /* 为节省内存开销文件名长度由64->32字节 */
#define APE_CFG_FILE_NUM (64) #define APE_CFG_FILE_NUM (64)
#define OSP_CFG_FLAG_START (0xB0B0B0B0) /* 默认Flag表示等待读配置文件 */ #define OSP_CFG_FLAG_START (0xB0B0B0B0) /* 默认Flag表示等待读配置文件 */

View File

@ -3588,23 +3588,25 @@ void HeaderTxRam_init(uint32_t vendor)
__ucps2_synch(f_SM); __ucps2_synch(f_SM);
do_write(&gVendorFlag,vendor); do_write(&gVendorFlag,vendor);
} }
uint8_t SECTION_ALIGNED g_rru_msg_data[CPRI_RRU_MSG_LEN]; uint8_t SECTION_ALIGNED g_rru_msg_data[CPRI_RRU_MSG_LEN];
uint8_t g_rru_msg_data[CPRI_RRU_MSG_LEN];
int32_t set_cpri_rru_msg(CpriRruMsg_t rru_msg) int32_t set_cpri_rru_msg(CpriRruMsg_t rru_msg)
{ {
if ((0 == rru_msg.msg_addr) || (0 == rru_msg.msg_len)) if((0 == rru_msg.msg_addr) || (0 == rru_msg.msg_len))
{ {
return -1; return -1;
} }
for(int i=0; i<41; i++) for(int i=0; i<41; i++)
{ {
*((uint32_t *)&g_rru_msg_data[0] + i) = SWAP32(*((uint32_t *)rru_msg.msg_addr + i)); *((uint32_t *)&g_rru_msg_data[0] + i) = SWAP32(do_read_volatile(rru_msg.msg_addr + i*4));
} }
// memcpy_ucp(&g_rru_msg_data, (uint8_t*)rru_msg.msg_addr, rru_msg.msg_len);
return 0; return 0;
} }
uint32_t get_cpri_rru_msg_addr() uint32_t get_cpri_rru_msg_addr()
{ {
return (uint32_t)g_rru_msg_data; return (uint32_t)g_rru_msg_data;