From 26d22b67fbf7243070a309c93cab347d57c8793a Mon Sep 17 00:00:00 2001 From: Gatsby Van Date: Mon, 22 Jan 2024 16:12:10 +0800 Subject: [PATCH] simplified naming. --- datalink814_ge/src/linklayer/linklayer814.h | 2 +- datalink814_ge/src/main.c | 4 +-- datalink814_ge/src/time_ctrl/time_ctrl.c | 28 ++++++++--------- datalink814_ge/src/time_ctrl/time_ctrl.h | 30 +++++++++---------- .../unit_test/linklayer_emulate_unit_test.c | 4 +-- .../unit_test/tmc_board_unit_test.c | 4 +-- .../unit_test/tmc_emulate_unit_test.c | 4 +-- 7 files changed, 38 insertions(+), 38 deletions(-) diff --git a/datalink814_ge/src/linklayer/linklayer814.h b/datalink814_ge/src/linklayer/linklayer814.h index bf7b5d7..242e427 100644 --- a/datalink814_ge/src/linklayer/linklayer814.h +++ b/datalink814_ge/src/linklayer/linklayer814.h @@ -53,7 +53,7 @@ typedef struct uint8_t bkpHeadId; uint8_t netScale; PHY_INST *phyInstPtr; - TIMECTRL_INST *tmcInstPtr; + TMC_INST *tmcInstPtr; } L2_CONFIG; typedef struct diff --git a/datalink814_ge/src/main.c b/datalink814_ge/src/main.c index c2a9bea..d4fcff6 100644 --- a/datalink814_ge/src/main.c +++ b/datalink814_ge/src/main.c @@ -49,7 +49,7 @@ L2_CONFIG l2Config = { .phyInstPtr = NULL, .tmcInstPtr = NULL}; -TIMECTRL_CONFIG tmcConfig = { +TMC_CONFIG tmcConfig = { .baseAddr = TIME_CONTROLLER_BASEADDR, .reset = 10}; @@ -73,7 +73,7 @@ void MPC_IntrHandler(void *callBackRef); #endif /*********************** Driver Instance Definitions **************************/ -TIMECTRL_INST *tmcInstPtr = NULL; +TMC_INST *tmcInstPtr = NULL; PHY_INST *phyInstPtr = NULL; L2_INST *linkInstPtr = NULL; static XScuGic gicInst; // General interrupt controller intance diff --git a/datalink814_ge/src/time_ctrl/time_ctrl.c b/datalink814_ge/src/time_ctrl/time_ctrl.c index b4981ad..1baff99 100644 --- a/datalink814_ge/src/time_ctrl/time_ctrl.c +++ b/datalink814_ge/src/time_ctrl/time_ctrl.c @@ -51,12 +51,12 @@ * FAILURE Initialization failed * ******************************************************************************/ -int32_t TimeCtrl_Init(TIMECTRL_INST **instPtr, TIMECTRL_CONFIG *config) +int32_t TimeCtrl_Init(TMC_INST **instPtr, TMC_CONFIG *config) { ASSERT(config != NULL); ASSERT(instPtr != NULL); - (*instPtr) = malloc(sizeof(TIMECTRL_INST)); - memcpy(&((*instPtr)->config), config, sizeof(TIMECTRL_CONFIG)); + (*instPtr) = malloc(sizeof(TMC_INST)); + memcpy(&((*instPtr)->config), config, sizeof(TMC_CONFIG)); (*instPtr)->modelVer = TMC_Read((*instPtr), VERSION_REG); return SUCCESS; } @@ -70,7 +70,7 @@ int32_t TimeCtrl_Init(TIMECTRL_INST **instPtr, TIMECTRL_CONFIG *config) * @return NONE * ******************************************************************************/ -void TimeCtrl_Destroy(TIMECTRL_INST *instPtr) +void TimeCtrl_Destroy(TMC_INST *instPtr) { free(instPtr); } @@ -84,7 +84,7 @@ void TimeCtrl_Destroy(TIMECTRL_INST *instPtr) * @return timer controller version. * ******************************************************************************/ -uint32_t TimeCtrl_GetVersion(TIMECTRL_INST *instPtr) +uint32_t TimeCtrl_GetVersion(TMC_INST *instPtr) { ASSERT(instPtr != NULL); return TMC_Read(instPtr, VERSION_REG); @@ -100,7 +100,7 @@ uint32_t TimeCtrl_GetVersion(TIMECTRL_INST *instPtr) * FAILURE Initialization failed * ******************************************************************************/ -void TimeCtrl_Reset(TIMECTRL_INST *instPtr) +void TimeCtrl_Reset(TMC_INST *instPtr) { ASSERT(instPtr != NULL); TMC_Write(instPtr, CNTSTEP_OPT, TM_RESET_CODE); @@ -115,7 +115,7 @@ void TimeCtrl_Reset(TIMECTRL_INST *instPtr) * @return NONE * ******************************************************************************/ -void TimeCtrl_ResetHigh(TIMECTRL_INST *instPtr) +void TimeCtrl_ResetHigh(TMC_INST *instPtr) { ASSERT(instPtr != NULL); // TODO: @@ -130,7 +130,7 @@ void TimeCtrl_ResetHigh(TIMECTRL_INST *instPtr) * @return NONE * ******************************************************************************/ -void TimeCtrl_ResetLow(TIMECTRL_INST *instPtr) +void TimeCtrl_ResetLow(TMC_INST *instPtr) { ASSERT(instPtr != NULL); // TODO: @@ -145,7 +145,7 @@ void TimeCtrl_ResetLow(TIMECTRL_INST *instPtr) * @return integer value * ******************************************************************************/ -inline TIME_INT TimeCtrl_GetIntCnt(TIMECTRL_INST *instPtr) +inline TIME_INT TimeCtrl_GetIntCnt(TMC_INST *instPtr) { ASSERT(instPtr != NULL); return TMC_Read(instPtr, TIME_INT_REG); @@ -160,7 +160,7 @@ inline TIME_INT TimeCtrl_GetIntCnt(TIMECTRL_INST *instPtr) * @return fractional value * ******************************************************************************/ -inline TIME_FRAC TimeCtrl_GetFracCnt(TIMECTRL_INST *instPtr) +inline TIME_FRAC TimeCtrl_GetFracCnt(TMC_INST *instPtr) { ASSERT(instPtr != NULL); return TMC_Read(instPtr, TIME_FRAC_REG); @@ -176,7 +176,7 @@ inline TIME_FRAC TimeCtrl_GetFracCnt(TIMECTRL_INST *instPtr) * @return NONE * ******************************************************************************/ -void TimeCtrl_GetCurrentTime(TIMECTRL_INST *instPtr, TIME_WORD *tmWord) +void TimeCtrl_GetCurrentTime(TMC_INST *instPtr, TIME_WORD *tmWord) { ASSERT(instPtr != NULL); ASSERT(tmWord != NULL); @@ -194,7 +194,7 @@ void TimeCtrl_GetCurrentTime(TIMECTRL_INST *instPtr, TIME_WORD *tmWord) * @return NONE. * ******************************************************************************/ -void TimeCtrl_GetCurrentStep(TIMECTRL_INST *instPtr, TIME_FRAC *tmFrac) +void TimeCtrl_GetCurrentStep(TMC_INST *instPtr, TIME_FRAC *tmFrac) { ASSERT(instPtr != NULL); ASSERT(tmFrac != NULL); @@ -212,7 +212,7 @@ void TimeCtrl_GetCurrentStep(TIMECTRL_INST *instPtr, TIME_FRAC *tmFrac) * @return NONE. * ******************************************************************************/ -void TimeCtrl_TimeAdjust(TIMECTRL_INST *instPtr, const TIME_WORD *tmWord, TIMECTRL_ADJ_TYPE type) +void TimeCtrl_TimeAdjust(TMC_INST *instPtr, const TIME_WORD *tmWord, TIMECTRL_ADJ_TYPE type) { ASSERT(instPtr != NULL); ASSERT(tmWord != NULL); @@ -243,7 +243,7 @@ void TimeCtrl_TimeAdjust(TIMECTRL_INST *instPtr, const TIME_WORD *tmWord, TIMECT * @return NONE. * ******************************************************************************/ -void TimeCtrl_SetOptimizeStep(TIMECTRL_INST *instPtr, TIME_FRAC *tmFrac) +void TimeCtrl_SetOptimizeStep(TMC_INST *instPtr, TIME_FRAC *tmFrac) { ASSERT(instPtr != NULL); ASSERT(tmFrac != NULL); diff --git a/datalink814_ge/src/time_ctrl/time_ctrl.h b/datalink814_ge/src/time_ctrl/time_ctrl.h index 6d94f52..7b529b3 100644 --- a/datalink814_ge/src/time_ctrl/time_ctrl.h +++ b/datalink814_ge/src/time_ctrl/time_ctrl.h @@ -45,30 +45,30 @@ typedef struct { uintptr_t baseAddr; uint32_t reset; // time for reset (unit: us) -} TIMECTRL_CONFIG; +} TMC_CONFIG; typedef struct { - TIMECTRL_CONFIG config; + TMC_CONFIG config; uint32_t modelVer; -} TIMECTRL_INST; +} TMC_INST; /************************** Function Prototypes ******************************/ -int32_t TimeCtrl_Init(TIMECTRL_INST **instPtr, TIMECTRL_CONFIG *config); -uint32_t TimeCtrl_GetVersion(TIMECTRL_INST *instPtr); -void TimeCtrl_Destroy(TIMECTRL_INST *instPtr); -void TimeCtrl_Reset(TIMECTRL_INST *instPtr); -void TimeCtrl_ResetLow(TIMECTRL_INST *instPtr); -void TimeCtrl_ResetHigh(TIMECTRL_INST *instPtr); +int32_t TimeCtrl_Init(TMC_INST **instPtr, TMC_CONFIG *config); +uint32_t TimeCtrl_GetVersion(TMC_INST *instPtr); +void TimeCtrl_Destroy(TMC_INST *instPtr); +void TimeCtrl_Reset(TMC_INST *instPtr); +void TimeCtrl_ResetLow(TMC_INST *instPtr); +void TimeCtrl_ResetHigh(TMC_INST *instPtr); -TIME_INT TimeCtrl_GetIntCnt(TIMECTRL_INST *instPtr); -TIME_FRAC TimeCtrl_GetFracCnt(TIMECTRL_INST *instPtr); +TIME_INT TimeCtrl_GetIntCnt(TMC_INST *instPtr); +TIME_FRAC TimeCtrl_GetFracCnt(TMC_INST *instPtr); -void TimeCtrl_GetCurrentTime(TIMECTRL_INST *instPtr, TIME_WORD *tmWord); -void TimeCtrl_GetCurrentStep(TIMECTRL_INST *instPtr, TIME_FRAC *tmFrac); +void TimeCtrl_GetCurrentTime(TMC_INST *instPtr, TIME_WORD *tmWord); +void TimeCtrl_GetCurrentStep(TMC_INST *instPtr, TIME_FRAC *tmFrac); -void TimeCtrl_SetOptimizeStep(TIMECTRL_INST *instPtr, TIME_FRAC *tmFrac); -void TimeCtrl_TimeAdjust(TIMECTRL_INST *instPtr, const TIME_WORD *tmWord, TIMECTRL_ADJ_TYPE type); +void TimeCtrl_SetOptimizeStep(TMC_INST *instPtr, TIME_FRAC *tmFrac); +void TimeCtrl_TimeAdjust(TMC_INST *instPtr, const TIME_WORD *tmWord, TIMECTRL_ADJ_TYPE type); void TimeCtrl_CalculateTimeGap(const TIME_WORD *a, const TIME_WORD *b, TIME_WORD *gap); #endif /* TIME_SYNC_H_ */ diff --git a/datalink814_ge/unit_test/linklayer_emulate_unit_test.c b/datalink814_ge/unit_test/linklayer_emulate_unit_test.c index 48b2186..3b6b288 100644 --- a/datalink814_ge/unit_test/linklayer_emulate_unit_test.c +++ b/datalink814_ge/unit_test/linklayer_emulate_unit_test.c @@ -15,7 +15,7 @@ #define TIME_ADJ_TRIG (0x00000024 >> 2) #define CNTSTEP_OPT (0x00000028 >> 2) -TIMECTRL_INST *tmcInstPtr = NULL; +TMC_INST *tmcInstPtr = NULL; PHY_INST *phyInstPtr = NULL; L2_INST *linkInstPtr = NULL; @@ -197,7 +197,7 @@ PHY_CONFIG l1Config = .baseAddr = (uintptr_t)phycReg }; -TIMECTRL_CONFIG tmcConfig = +TMC_CONFIG tmcConfig = { .baseAddr = (uintptr_t)tmcReg, .reset = 10 diff --git a/datalink814_ge/unit_test/tmc_board_unit_test.c b/datalink814_ge/unit_test/tmc_board_unit_test.c index 73a2e8c..540b207 100644 --- a/datalink814_ge/unit_test/tmc_board_unit_test.c +++ b/datalink814_ge/unit_test/tmc_board_unit_test.c @@ -7,11 +7,11 @@ #define HARDWARE_VERSION 0x00000001 #define MAX_OPT_DELAY 100 // 1us = 100*10ns -TIMECTRL_CONFIG tmcConfig = { +TMC_CONFIG tmcConfig = { .baseAddr = 0 /*TODO: fill withe real base address*/, .reset = 10}; -TIMECTRL_INST *tmcInstPtr = NULL; +TMC_INST *tmcInstPtr = NULL; void tmc_setup(void) { diff --git a/datalink814_ge/unit_test/tmc_emulate_unit_test.c b/datalink814_ge/unit_test/tmc_emulate_unit_test.c index f5ec7b9..7624fc7 100644 --- a/datalink814_ge/unit_test/tmc_emulate_unit_test.c +++ b/datalink814_ge/unit_test/tmc_emulate_unit_test.c @@ -11,11 +11,11 @@ uint32_t tmcReg[32] = {0}; -TIMECTRL_CONFIG tmcConfig = { +TMC_CONFIG tmcConfig = { .baseAddr = 0, .reset = 10}; -TIMECTRL_INST *tmcInstPtr = NULL; +TMC_INST *tmcInstPtr = NULL; void tmc_setup(void) {