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#1360' into 'dev_ck_v2.1'

Browse Source 
优化spu侧IM空间将shell命令字最大长度改为12字节，arm侧同步修改命令字最大长度12字节#feature_enhancement#1360

See merge request ucp/driver/ucp4008_platform_arm!36
This commit is contained in:
Xianfeng Du 2023-12-06 01:55:21 +00:00
commit 9ffdfa7326
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osp/inc/ospShell.h
View File

@ -50,7 +50,7 @@ typedef struct tag_Osp_Ape_Send_Count
typedef struct tagOspCmdRtn typedef struct tagOspCmdRtn
{ {
char cmd[64]; char cmd[12];
OSP_FUNCPTR wrapper; OSP_FUNCPTR wrapper;
OSP_FUNCPTR routine; OSP_FUNCPTR routine;
char descption[128]; char descption[128];
@ -59,7 +59,7 @@ typedef struct tagOspCmdRtn
typedef struct tagOspCmdExt typedef struct tagOspCmdExt
{ {
char cmd[32]; char cmd[12];
// char desc[32]; // char desc[32];
uint32_t argnum; uint32_t argnum;
uint32_t num; uint32_t num;

8
osp/src/ospShell.c
View File

@ -1553,11 +1553,11 @@ void osp_show_queue_ul_info()
uint32_t len = 0; uint32_t len = 0;
char pbuf[2048]; char pbuf[2048];
len = sprintf(pbuf,"\ninst_id\tque_id\t\ttype_id\t\talloc\t\tape_tx_num\t\tarm_rx_num\n\r"); len = sprintf(pbuf,"\ninst_id\tque_id\t\ttype_id\t\talloc\t\t\tape_tx_num\t\t\tarm_rx_num\n\r");
for (i = 0; i < MAX_INSTANCE_NUM; i++) { for (i = 0; i < MAX_INSTANCE_NUM; i++) {
for (j = 0; j < UCP4008_TRAFFIC_MAX_NUM; j++) { for (j = 0; j < UCP4008_TRAFFIC_MAX_NUM; j++) {
len += sprintf(pbuf +len,"%d %d\t\t%-4d\t\t%4d\t\t%4d\t\t\t%4d\n", i, j, pPetSmLocalMgt->pQueueCfg[i][j]->handler.type_id, pPetSmLocalMgt->pUlQueue[i][j]->alloc, pPetSmLocalMgt->pUlQueue[i][j]->in, pPetSmLocalMgt->pUlQueue[i][j]->out); len += sprintf(pbuf +len,"%d %d\t\t%-4d\t\t%-10d\t\t%10d\t\t\t%10d\n", i, j, pPetSmLocalMgt->pQueueCfg[i][j]->handler.type_id, pPetSmLocalMgt->pUlQueue[i][j]->alloc, pPetSmLocalMgt->pUlQueue[i][j]->in, pPetSmLocalMgt->pUlQueue[i][j]->out);
} }
} }
@ -1574,11 +1574,11 @@ void osp_show_queue_dl_info()
uint32_t len = 0; uint32_t len = 0;
char pbuf[2048]; char pbuf[2048];
len = sprintf(pbuf,"\ninst_id\tque_id\t\ttype_id\t\talloc\t\tarm_tx_num\t\tape_rx_num\n\r"); len = sprintf(pbuf,"\ninst_id\tque_id\t\ttype_id\t\talloc\t\t\tarm_tx_num\t\t\tape_rx_num\n\r");
for (i = 0; i < MAX_INSTANCE_NUM; i++) { for (i = 0; i < MAX_INSTANCE_NUM; i++) {
for (j = 0; j < UCP4008_TRAFFIC_MAX_NUM; j++) { for (j = 0; j < UCP4008_TRAFFIC_MAX_NUM; j++) {
len += sprintf(pbuf +len, "%d %d\t\t%-4d\t\t%4d\t\t%4d\t\t\t%4d\n", i, j, pPetSmLocalMgt->pQueueCfg[i][j]->handler.type_id, pPetSmLocalMgt->pDlQueue[i][j]->alloc, pPetSmLocalMgt->pDlQueue[i][j]->in, pPetSmLocalMgt->pDlQueue[i][j]->out); len += sprintf(pbuf +len, "%d %d\t\t%-4d\t\t%-10d\t\t%10d\t\t\t%10d\n", i, j, pPetSmLocalMgt->pQueueCfg[i][j]->handler.type_id, pPetSmLocalMgt->pDlQueue[i][j]->alloc, pPetSmLocalMgt->pDlQueue[i][j]->in, pPetSmLocalMgt->pDlQueue[i][j]->out);
} }
} }

6
test/case4/src/testcase.c
View File

@ -146,9 +146,9 @@ uint32_t rx_callback_oam_spu(const char* buf,uint32_t payloadSize)
break; break;
case SPU_OAM_BASE_DELAY_QRY_RSP: case SPU_OAM_BASE_DELAY_QRY_RSP:
oam_base_delay_qry_rsp_ptr = (SpuOamBaseDelayQryRsp_t *)(buf+sizeof(OamMsgTransferHeader_t)); oam_base_delay_qry_rsp_ptr = (SpuOamBaseDelayQryRsp_t *)(buf+sizeof(OamMsgTransferHeader_t));
printf("u8fiber_port:%u u8result:%u u32dl_frame_offset:0x%x u32ul_frame_offset:0x%x\n", \ printf("u8fiber_port:%u u8result:%u u32dl_frame_offset:0x%x u32ul_frame_offset:0x%x u32ul_data_frame_offset:0x%x\n", \
oam_base_delay_qry_rsp_ptr->u8fiber_port, oam_base_delay_qry_rsp_ptr->u8result, \ oam_base_delay_qry_rsp_ptr->u8fiber_port, oam_base_delay_qry_rsp_ptr->u8result, \
oam_base_delay_qry_rsp_ptr->u32dl_frame_offset, oam_base_delay_qry_rsp_ptr->u32ul_frame_offset); oam_base_delay_qry_rsp_ptr->u32dl_frame_offset, oam_base_delay_qry_rsp_ptr->u32ul_frame_offset, oam_base_delay_qry_rsp_ptr->u32ul_data_frame_offset);
break; break;
case SPU_OAM_FIBER_DELAY_QRY_RSP: case SPU_OAM_FIBER_DELAY_QRY_RSP:
oam_fiber_delay_qry_rsp_ptr = (SpuOamFiberDelayQryRsp_t *)(buf+sizeof(OamMsgTransferHeader_t)); oam_fiber_delay_qry_rsp_ptr = (SpuOamFiberDelayQryRsp_t *)(buf+sizeof(OamMsgTransferHeader_t));
@ -282,7 +282,7 @@ static inline void msg_transfer_queue_polling(void)
void oam_msg_base_delay_set_test() void oam_msg_base_delay_set_test()
{ {
uint32_t size = 24; uint32_t size = 32;
char* buf; char* buf;
uint32_t availableSize,offset; uint32_t availableSize,offset;
OamMsgTransferHeader_t stOamMsg; OamMsgTransferHeader_t stOamMsg;