diff --git a/datalink814_ge/src/main.c b/datalink814_ge/src/main.c index d4fcff6..291c816 100644 --- a/datalink814_ge/src/main.c +++ b/datalink814_ge/src/main.c @@ -223,7 +223,7 @@ void MPC_IntrHandler(void *callBackRef) void PhysicalIntr_Handler(void *callBackRef) { Phy_UpdateState(phyInstPtr); - if (phyInstPtr->TOR.curr == PHY_TOR_TX) + if (phyInstPtr->tor.curr == PHY_TOR_TX) { switch (phyInstPtr->frameType.curr) { @@ -255,7 +255,7 @@ void PhysicalIntr_Handler(void *callBackRef) break; } } - if (phyInstPtr->TOR.last == PHY_TOR_RX && phyInstPtr->isFrameSync) + if (phyInstPtr->tor.last == PHY_TOR_RX && phyInstPtr->isFrameSync) { switch (phyInstPtr->frameType.last) { diff --git a/datalink814_ge/src/phy_ctrl/phy_ctrl.c b/datalink814_ge/src/phy_ctrl/phy_ctrl.c index 8909c59..2f80a1d 100644 --- a/datalink814_ge/src/phy_ctrl/phy_ctrl.c +++ b/datalink814_ge/src/phy_ctrl/phy_ctrl.c @@ -308,7 +308,7 @@ int32_t Phy_InstInit(PHY_INST **instPtr, PHY_CONFIG *phyConfig) (*instPtr)->sendDataOffset = 0; Phy_AntConfigInit(&((*instPtr)->antConfig)); - memset(&((*instPtr))->TOR, PHY_TOR_SUSPEND, sizeof(PHY_RCD)); + memset(&((*instPtr))->tor, PHY_TOR_SUSPEND, sizeof(PHY_RCD)); memset(&((*instPtr)->frameType), L1_NONE_FRAME, sizeof(PHY_RCD)); memset(&((*instPtr)->antNo), (int32_t)L1_INIT_BEAM_NO, sizeof(PHY_RCD)); memset(&((*instPtr)->beamNo), (int32_t)L1_INIT_ANT_NO, sizeof(PHY_RCD)); @@ -643,7 +643,7 @@ int32_t Phy_SetupNextSlot(PHY_INST *instPtr, PHY_TOR_TYPE txrxMode, // Indicate physical layer that all the configurations were done. PhyWrite(instPtr, SLOT_CMD, SLOT_CMD_KEY); - Phy_RcdShift(&(instPtr->TOR), txrxMode); + Phy_RcdShift(&(instPtr->tor), txrxMode); Phy_RcdShift(&(instPtr->frameType), frameType); // TODO: Phy_RcdShift(&(instPtr->antNo), L1_INIT_ANT_NO); diff --git a/datalink814_ge/src/phy_ctrl/phy_ctrl.h b/datalink814_ge/src/phy_ctrl/phy_ctrl.h index c333c38..978fbb7 100644 --- a/datalink814_ge/src/phy_ctrl/phy_ctrl.h +++ b/datalink814_ge/src/phy_ctrl/phy_ctrl.h @@ -221,7 +221,7 @@ typedef struct PHY_RCD antNo; // antenna number record PHY_RCD beamNo; // beam number record PHY_RCD beamWd; // beam width record - PHY_RCD TOR; // tx rx state record + PHY_RCD tor; // tx rx state record PHY_RCD frameType; // frame type record uint32_t sendDataOffset; // antenna configuration bram offset (to implement ping-pong data flow) uint32_t antConfigOffset; // antenna configuration bram offset (to implement ping-pong data flow)