From 5abe9e347fed00f4a8ccfc2a3373576f79feeec6 Mon Sep 17 00:00:00 2001 From: Josh Gao Date: Wed, 11 Jun 2025 10:31:58 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E6=97=B6=E9=9A=99?= =?UTF-8?q?=E8=A1=A8=E4=B8=AA=E6=95=B0,=20=E7=94=A8=E4=BA=8E=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E4=B8=8A=E4=BD=8D=E6=9C=BA=E9=85=8D=E7=BD=AE=E5=88=87?= =?UTF-8?q?=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/networking/link_layer/link_layer.c | 4 ++-- src/networking/link_layer/link_layer.h | 2 +- src/networking/link_layer/link_layer_types.h | 2 ++ src/networking/link_layer/routine_table.c | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/networking/link_layer/link_layer.c b/src/networking/link_layer/link_layer.c index e2ba200..9a4d81b 100644 --- a/src/networking/link_layer/link_layer.c +++ b/src/networking/link_layer/link_layer.c @@ -890,8 +890,8 @@ int32_t Linklayer_EventHandler(L2_INST *instPtr, const L2_EVENT *l2Event) else if (instPtr->nextState == L2_NORMAL_STATE) { UpdateMainSate(instPtr, L2_NORMAL_STATE); - instPtr->rtneConfig.rtneTable = normalTable; - instPtr->rtneConfig.rtnePrd = ARRAY_SIZE(normalTable); + instPtr->rtneConfig.rtneTable = normalTable[L2_DEFAULT_NORMAL_TABLE]; + instPtr->rtneConfig.rtnePrd = ARRAY_SIZE(normalTable[L2_DEFAULT_NORMAL_TABLE]); } else { diff --git a/src/networking/link_layer/link_layer.h b/src/networking/link_layer/link_layer.h index 6856bde..4d09700 100644 --- a/src/networking/link_layer/link_layer.h +++ b/src/networking/link_layer/link_layer.h @@ -129,7 +129,7 @@ typedef struct /************************** Variable Definitions *****************************/ extern L2_RTNE_TABLE_ENTRY *initTable[L2_INIT_RTNE_PERIOD]; -extern L2_RTNE_TABLE_ENTRY *normalTable[L2_NORMAL_RTNE_PERIOD]; +extern L2_RTNE_TABLE_ENTRY *normalTable[L2_NORMAL_RTNE_PERIOD][L2_NORMAL_RTNE_NUM]; /************************** Function Prototypes ******************************/ /** * @defgroup LinkLayer_Main diff --git a/src/networking/link_layer/link_layer_types.h b/src/networking/link_layer/link_layer_types.h index dfe6fd3..b69acf2 100644 --- a/src/networking/link_layer/link_layer_types.h +++ b/src/networking/link_layer/link_layer_types.h @@ -41,6 +41,8 @@ // Routine configure #define L2_INIT_RTNE_PERIOD 1 #define L2_NORMAL_RTNE_PERIOD 1 +#define L2_NORMAL_RTNE_NUM 3 +#define L2_DEFAULT_NORMAL_TABLE 0 // Common slot number definition #define L2_SLOTNO_NONE 0 diff --git a/src/networking/link_layer/routine_table.c b/src/networking/link_layer/routine_table.c index db77ac0..7f614ba 100644 --- a/src/networking/link_layer/routine_table.c +++ b/src/networking/link_layer/routine_table.c @@ -305,9 +305,9 @@ L2_RTNE_TABLE_ENTRY *initTable[L2_INIT_RTNE_PERIOD] = innerScanSubT }; -L2_RTNE_TABLE_ENTRY *normalTable[L2_NORMAL_RTNE_PERIOD] = +L2_RTNE_TABLE_ENTRY *normalTable[L2_NORMAL_RTNE_NUM][L2_NORMAL_RTNE_PERIOD] = { - innerScanSubT + innerScanSubT, innerScanSubT, innerScanSubT }; /** @} RoutineTable*/