From dfecadac568de4ccd7b0e478372b73c4364a1e8c Mon Sep 17 00:00:00 2001 From: Gatsby Van Date: Thu, 7 Mar 2024 11:35:14 +0800 Subject: [PATCH] omit redundant code --- .../src/networking/link_layer/link_layer.c | 4 ++-- df_datalink_sp/src/systembus/systembus.c | 17 +++-------------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/df_datalink_sp/src/networking/link_layer/link_layer.c b/df_datalink_sp/src/networking/link_layer/link_layer.c index 651e985..fbe8005 100644 --- a/df_datalink_sp/src/networking/link_layer/link_layer.c +++ b/df_datalink_sp/src/networking/link_layer/link_layer.c @@ -660,10 +660,10 @@ int32_t Linklayer_Init(L2_INST **instPtr, const L2_CONFIG *config) DBG_ERROR("Allocate memory for L2_InstPtr failed.\n"); return ENOMEM; } + + // Clear random content memset(*instPtr, 0x00, sizeof(L2_INST)); memcpy(&((*instPtr)->config), config, sizeof(L2_CONFIG)); - // Clear log - memset(&((*instPtr)->log), 0x00, sizeof((*instPtr)->log)); // Packet buffer (*instPtr)->sendPktData = calloc(L2_PACK_LEN_MAX / sizeof(uint64_t), sizeof(uint64_t)); diff --git a/df_datalink_sp/src/systembus/systembus.c b/df_datalink_sp/src/systembus/systembus.c index 63986b2..9db952e 100644 --- a/df_datalink_sp/src/systembus/systembus.c +++ b/df_datalink_sp/src/systembus/systembus.c @@ -420,7 +420,7 @@ int32_t SystemBus_HandleCmd(SYSBUS *instPtr) } else { - // Do not response + // Ignore current command DBG_ERROR("Unexpected config command 0x%02X:0x%02X", WD_MODE_CMD, data[WD_MODE_CMD]); Status = EPARAM; @@ -453,19 +453,8 @@ int32_t SystemBus_HandleCmd(SYSBUS *instPtr) Phy_SetupNextSlot(phyRef, PHY_TOR_RX, L1_10KBPS_10MS_FRAME, NULL); break; } - else - { - // Do not response - DBG_ERROR("Unexpected config command 0x%02X:0x%02X", - WD_EN_CMD, data[WD_EN_CMD]); - Status = EPARAM; - break; - } - if (reconfig == true) - { - Linklayer_Reconfig(linkInstPtr, &linkConfig); - Linklayer_Start(linkInstPtr); - } + + Linklayer_Start(linkInstPtr); instPtr->sysbusLog.lastConfig[0] = data[WD_MODE_CMD]; instPtr->sysbusLog.lastConfig[1] = data[WD_EN_CMD]; Status = SUCCESS;