From 6f98baf09688af47ea017ad1c26b623699134d90 Mon Sep 17 00:00:00 2001 From: Gatsby Van Date: Mon, 25 Dec 2023 17:23:06 +0800 Subject: [PATCH] change COUNTE_FRAC_MAX -> TIME_FRAC_MAX --- datalink814_ge/src/linklayer/time_sync.c | 14 +++++++------- datalink814_ge/src/time_ctrl/time_ctrl.c | 8 ++++---- datalink814_ge/src/time_ctrl/time_ctrl.h | 2 +- datalink814_ge/unit_test/tmc_board_unit_test.c | 16 ++++++++-------- datalink814_ge/unit_test/tmc_emulate_unit_test.c | 2 +- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/datalink814_ge/src/linklayer/time_sync.c b/datalink814_ge/src/linklayer/time_sync.c index 1c59dde..46fc28c 100644 --- a/datalink814_ge/src/linklayer/time_sync.c +++ b/datalink814_ge/src/linklayer/time_sync.c @@ -68,17 +68,17 @@ int32_t L2_TimeAlign(L2_INST* instPtr, uint32_t frameNum, uint32_t slotNum){ uint64_t currTime, expctTime; int64_t timeDiff; TIME_WORD timeStamp, slotTimerAdjmet; - expctTime = ((uint64_t)(frameNum*L2_SLOTS_PER_FRAME + slotNum))*COUNTE_FRAC_MAX; + expctTime = ((uint64_t)(frameNum*L2_SLOTS_PER_FRAME + slotNum))*TIME_FRAC_MAX; expctTime += Phy_GetTimeComp(lastRecvdFrame); Phy_GetFrameSyncTimeStamp(instPtr->config.phyInstPtr, &timeStamp); currTime = (uint64_t)timeStamp.frac_part; - currTime += ((uint64_t)timeStamp.int_part) * COUNTE_FRAC_MAX; + currTime += ((uint64_t)timeStamp.int_part) * TIME_FRAC_MAX; timeDiff = (int64_t)(expctTime - currTime); - slotTimerAdjmet.int_part = (uint32_t)(timeDiff / COUNTE_FRAC_MAX); - slotTimerAdjmet.frac_part = (uint32_t)(timeDiff % COUNTE_FRAC_MAX); + slotTimerAdjmet.int_part = (uint32_t)(timeDiff / TIME_FRAC_MAX); + slotTimerAdjmet.frac_part = (uint32_t)(timeDiff % TIME_FRAC_MAX); TimeCtrl_TimeAdjust(instPtr->config.tmcInstPtr, &slotTimerAdjmet, TM_ADJ_ADD); return SUCCESS; } @@ -164,13 +164,13 @@ void RTT_GetFrameStart(L2_INST* instPtr, TIME_WORD *tmStamp, L2_TOR_TYPE torType int64_t timeDiff; Phy_GetFrameSyncTimeStamp(phyRef, &timeStamp); timeDiff = (uint64_t) timeStamp.frac_part; - timeDiff += ((uint64_t)timeStamp.int_part) * COUNTE_FRAC_MAX; + timeDiff += ((uint64_t)timeStamp.int_part) * TIME_FRAC_MAX; Phy_GetLastSlotStartTimeStamp(phyRef, tmStamp); - timeDiff -= ((uint64_t) tmStamp->int_part) * COUNTE_FRAC_MAX; + timeDiff -= ((uint64_t) tmStamp->int_part) * TIME_FRAC_MAX; timeDiff -= (uint64_t) tmStamp->frac_part; timeDiff = (int64_t)Phy_GetTimeComp(L2_L2frame2L1frame(L2_GetLastFrameType(instPtr))) - timeDiff; if (timeDiff < 0) { - timeDiff += COUNTE_FRAC_MAX; + timeDiff += TIME_FRAC_MAX; tmStamp->int_part--; _nop_(); } diff --git a/datalink814_ge/src/time_ctrl/time_ctrl.c b/datalink814_ge/src/time_ctrl/time_ctrl.c index fe7fb1f..968f22b 100644 --- a/datalink814_ge/src/time_ctrl/time_ctrl.c +++ b/datalink814_ge/src/time_ctrl/time_ctrl.c @@ -239,9 +239,9 @@ void TimeCtrl_CalculateTimeGap(const TIME_WORD *a, const TIME_WORD *b, TIME_WORD ASSERT(gap != NULL); uint64_t timeDiff; timeDiff = (uint64_t) b->frac_part; - timeDiff += ((uint64_t)b->int_part) * COUNTE_FRAC_MAX; - timeDiff -= ((uint64_t)a->int_part) * COUNTE_FRAC_MAX; + timeDiff += ((uint64_t)b->int_part) * TIME_FRAC_MAX; + timeDiff -= ((uint64_t)a->int_part) * TIME_FRAC_MAX; timeDiff -= (uint64_t) a->frac_part; - gap->frac_part = (TIME_FRAC)(timeDiff % COUNTE_FRAC_MAX); - gap->frac_part = (TIME_INT)(timeDiff / COUNTE_FRAC_MAX); + gap->frac_part = (TIME_FRAC)(timeDiff % TIME_FRAC_MAX); + gap->frac_part = (TIME_INT)(timeDiff / TIME_FRAC_MAX); } \ No newline at end of file diff --git a/datalink814_ge/src/time_ctrl/time_ctrl.h b/datalink814_ge/src/time_ctrl/time_ctrl.h index f0e88b9..6f223c9 100644 --- a/datalink814_ge/src/time_ctrl/time_ctrl.h +++ b/datalink814_ge/src/time_ctrl/time_ctrl.h @@ -21,7 +21,7 @@ /***************************** Include Files *********************************/ #include /************************** Constant Definitions *****************************/ -#define COUNTE_FRAC_MAX 500000 // how many 10ns in a 5ms +#define TIME_FRAC_MAX 500000 // how many 10ns in a 5ms /***************** Macros (Inline Functions) Definitions *********************/ /**************************** Type Definitions *******************************/ typedef enum { diff --git a/datalink814_ge/unit_test/tmc_board_unit_test.c b/datalink814_ge/unit_test/tmc_board_unit_test.c index 4288df2..3b2261d 100644 --- a/datalink814_ge/unit_test/tmc_board_unit_test.c +++ b/datalink814_ge/unit_test/tmc_board_unit_test.c @@ -45,7 +45,7 @@ TEST(tmc_read_time) { } else { ASSERT_EQUAL(timeH, timeStamp.int_part+1); - ASSERT_TRUE(timeL + COUNTE_FRAC_MAX - timeStamp.frac_part < MAX_OPT_DELAY); + ASSERT_TRUE(timeL + TIME_FRAC_MAX - timeStamp.frac_part < MAX_OPT_DELAY); } } @@ -69,14 +69,14 @@ TEST(tmc_adjustment) { ASSERT_EQUAL(timeAdj.int_part, timeStampPost.int_part); ASSERT_TRUE(timeStampPost.frac_part < MAX_OPT_DELAY); - timeAdj.frac_part = COUNTE_FRAC_MAX; + timeAdj.frac_part = TIME_FRAC_MAX; timeAdj.int_part = 0x00000203; TimeCtrl_TimeAdjust(tmcInstPtr, &timeAdj, TM_ADJ_SET); TimeCtrl_GetCurrentTime(tmcInstPtr, &timeStampPost); ASSERT_EQUAL(timeAdj.int_part, timeStampPost.int_part+1); ASSERT_TRUE(timeStampPost.frac_part < MAX_OPT_DELAY); - timeAdj.frac_part = COUNTE_FRAC_MAX*2; + timeAdj.frac_part = TIME_FRAC_MAX*2; timeAdj.int_part = 0x00000203; TimeCtrl_GetCurrentTime(tmcInstPtr, &timeStampPre); TimeCtrl_TimeAdjust(tmcInstPtr, &timeAdj, TM_ADJ_SET); @@ -87,7 +87,7 @@ TEST(tmc_adjustment) { } else { ASSERT_EQUAL(timeStampPost.int_part, timeStampPre.int_part + 1); - ASSERT_TRUE(timeStampPost.frac_part + COUNTE_FRAC_MAX - timeStampPre.frac_part < MAX_OPT_DELAY); + ASSERT_TRUE(timeStampPost.frac_part + TIME_FRAC_MAX - timeStampPre.frac_part < MAX_OPT_DELAY); } // Adjustment -- add @@ -96,9 +96,9 @@ TEST(tmc_adjustment) { TimeCtrl_GetCurrentTime(tmcInstPtr, &timeStampPre); TimeCtrl_TimeAdjust(tmcInstPtr, &timeAdj, TM_ADJ_ADD); TimeCtrl_GetCurrentTime(tmcInstPtr, &timeStampPost); - if(timeStampPre.frac_part + timeAdj.frac_part > COUNTE_FRAC_MAX) { + if(timeStampPre.frac_part + timeAdj.frac_part > TIME_FRAC_MAX) { ASSERT_TRUE(timeStampPost.int_part <= timeStampPre.int_part + timeAdj.int_part + 2); - ASSERT_TRUE(timeStampPost.frac_part + COUNTE_FRAC_MAX - timeStampPre.frac_part + ASSERT_TRUE(timeStampPost.frac_part + TIME_FRAC_MAX - timeStampPre.frac_part < MAX_OPT_DELAY + timeAdj.frac_part); } @@ -107,9 +107,9 @@ TEST(tmc_adjustment) { TimeCtrl_GetCurrentTime(tmcInstPtr, &timeStampPre); TimeCtrl_TimeAdjust(tmcInstPtr, &timeAdj, TM_ADJ_ADD); TimeCtrl_GetCurrentTime(tmcInstPtr, &timeStampPost); - if(timeStampPre.frac_part + timeAdj.frac_part > COUNTE_FRAC_MAX) { + if(timeStampPre.frac_part + timeAdj.frac_part > TIME_FRAC_MAX) { ASSERT_TRUE(timeStampPost.int_part <= timeStampPre.int_part + timeAdj.int_part + 2); - ASSERT_TRUE(timeStampPost.frac_part + COUNTE_FRAC_MAX - timeStampPre.frac_part + ASSERT_TRUE(timeStampPost.frac_part + TIME_FRAC_MAX - timeStampPre.frac_part < MAX_OPT_DELAY + timeAdj.frac_part); } } diff --git a/datalink814_ge/unit_test/tmc_emulate_unit_test.c b/datalink814_ge/unit_test/tmc_emulate_unit_test.c index dface93..d223ca3 100644 --- a/datalink814_ge/unit_test/tmc_emulate_unit_test.c +++ b/datalink814_ge/unit_test/tmc_emulate_unit_test.c @@ -57,7 +57,7 @@ TEST(tmc_basic_operations) { } else { ASSERT_EQUAL(timeH, timeStamp.int_part+1); - ASSERT_TRUE(timeL + COUNTE_FRAC_MAX - timeStamp.frac_part < MAX_OPT_DELAY); + ASSERT_TRUE(timeL + TIME_FRAC_MAX - timeStamp.frac_part < MAX_OPT_DELAY); } TIME_FRAC stepOpt;