From f3695ab492fd475501192a0df2923564cf9e57bb Mon Sep 17 00:00:00 2001 From: "huanfeng.wang" Date: Mon, 4 Dec 2023 19:45:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96shellIM=E7=A9=BA=E9=97=B4?= =?UTF-8?q?=EF=BC=8C=E5=91=BD=E4=BB=A4=E5=AD=97=E9=95=BF=E5=BA=A6=E6=9C=80?= =?UTF-8?q?=E5=A4=A712=E5=AD=97=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- osp/inc/ospShell.h | 4 ++-- osp/src/ospShell.c | 4 ++-- test/case4/src/testcase.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/osp/inc/ospShell.h b/osp/inc/ospShell.h index d5643b6..b09c483 100644 --- a/osp/inc/ospShell.h +++ b/osp/inc/ospShell.h @@ -50,7 +50,7 @@ typedef struct tag_Osp_Ape_Send_Count typedef struct tagOspCmdRtn { - char cmd[64]; + char cmd[12]; OSP_FUNCPTR wrapper; OSP_FUNCPTR routine; char descption[128]; @@ -59,7 +59,7 @@ typedef struct tagOspCmdRtn typedef struct tagOspCmdExt { - char cmd[32]; + char cmd[12]; // char desc[32]; uint32_t argnum; uint32_t num; diff --git a/osp/src/ospShell.c b/osp/src/ospShell.c index 9a18239..c4e87e0 100644 --- a/osp/src/ospShell.c +++ b/osp/src/ospShell.c @@ -1557,7 +1557,7 @@ void osp_show_queue_ul_info() for (i = 0; i < MAX_INSTANCE_NUM; i++) { 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%-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); } } @@ -1578,7 +1578,7 @@ void osp_show_queue_dl_info() for (i = 0; i < MAX_INSTANCE_NUM; i++) { 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%-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); } } diff --git a/test/case4/src/testcase.c b/test/case4/src/testcase.c index 8c57608..27d5e4a 100644 --- a/test/case4/src/testcase.c +++ b/test/case4/src/testcase.c @@ -146,9 +146,9 @@ uint32_t rx_callback_oam_spu(const char* buf,uint32_t payloadSize) break; case SPU_OAM_BASE_DELAY_QRY_RSP: 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->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; case SPU_OAM_FIBER_DELAY_QRY_RSP: 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() { - uint32_t size = 24; + uint32_t size = 32; char* buf; uint32_t availableSize,offset; OamMsgTransferHeader_t stOamMsg; From 45993d40f224871d4bb95014ddea481024d8e63a Mon Sep 17 00:00:00 2001 From: "huanfeng.wang" Date: Tue, 5 Dec 2023 08:50:51 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9ul,dl=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- osp/src/ospShell.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/osp/src/ospShell.c b/osp/src/ospShell.c index c4e87e0..4ef36c9 100644 --- a/osp/src/ospShell.c +++ b/osp/src/ospShell.c @@ -1553,11 +1553,11 @@ void osp_show_queue_ul_info() uint32_t len = 0; 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 (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; 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 (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); } }