trim trailing space
This commit is contained in:
@@ -25,7 +25,7 @@ L2_INST *linkInstPtr = NULL;
|
|||||||
uint32_t tmcReg[32] = {0};
|
uint32_t tmcReg[32] = {0};
|
||||||
uint32_t phycReg[512] = {0};
|
uint32_t phycReg[512] = {0};
|
||||||
|
|
||||||
L2_CONFIG l2Config =
|
L2_CONFIG l2Config =
|
||||||
{
|
{
|
||||||
.myType = L2_NODE_HEAD,
|
.myType = L2_NODE_HEAD,
|
||||||
.isInterHead = false,
|
.isInterHead = false,
|
||||||
@@ -38,7 +38,7 @@ L2_CONFIG l2Config =
|
|||||||
.tmcInstPtr = NULL
|
.tmcInstPtr = NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
PHY_CONFIG l1Config =
|
PHY_CONFIG l1Config =
|
||||||
{
|
{
|
||||||
.devId = 0,
|
.devId = 0,
|
||||||
.txBramId = 0,
|
.txBramId = 0,
|
||||||
@@ -48,7 +48,7 @@ PHY_CONFIG l1Config =
|
|||||||
.baseAddr = (uintptr_t)phycReg
|
.baseAddr = (uintptr_t)phycReg
|
||||||
};
|
};
|
||||||
|
|
||||||
TMC_CONFIG tmcConfig =
|
TMC_CONFIG tmcConfig =
|
||||||
{
|
{
|
||||||
.baseAddr = (uintptr_t)tmcReg,
|
.baseAddr = (uintptr_t)tmcReg,
|
||||||
.reset = 10
|
.reset = 10
|
||||||
@@ -68,7 +68,7 @@ void linklayer_setup(void)
|
|||||||
ASSERT_EQUAL(SUCCESS, Status);
|
ASSERT_EQUAL(SUCCESS, Status);
|
||||||
Status = TimeCtrl_Init(&tmcInstPtr, &tmcConfig);
|
Status = TimeCtrl_Init(&tmcInstPtr, &tmcConfig);
|
||||||
ASSERT_EQUAL(SUCCESS, Status);
|
ASSERT_EQUAL(SUCCESS, Status);
|
||||||
Status = Phy_InstInit(&phyInstPtr, &l1Config);
|
Status = Phy_Init(&phyInstPtr, &l1Config);
|
||||||
ASSERT_EQUAL(SUCCESS, Status);
|
ASSERT_EQUAL(SUCCESS, Status);
|
||||||
|
|
||||||
// Update l2 config
|
// Update l2 config
|
||||||
@@ -87,7 +87,7 @@ void linklayer_teardown(void)
|
|||||||
SysMonitor_Destroy();
|
SysMonitor_Destroy();
|
||||||
}
|
}
|
||||||
|
|
||||||
void forge_adv_frame(uint8_t *buff, uint8_t srcId, uint8_t destId,
|
void forge_adv_frame(uint8_t *buff, uint8_t srcId, uint8_t destId,
|
||||||
uint32_t frameNum, uint32_t slotNum, uint32_t netStartTime)
|
uint32_t frameNum, uint32_t slotNum, uint32_t netStartTime)
|
||||||
{
|
{
|
||||||
uint8_t type = L2_ADV_FRAME;
|
uint8_t type = L2_ADV_FRAME;
|
||||||
@@ -188,13 +188,13 @@ TEST(linklayer_master_routine)
|
|||||||
|
|
||||||
if (L2_GetCurrentFrameType(linkInstPtr) == L2_CFM_FRAME && slotNum % 4 == 1)
|
if (L2_GetCurrentFrameType(linkInstPtr) == L2_CFM_FRAME && slotNum % 4 == 1)
|
||||||
{
|
{
|
||||||
forge_cfm_frame((uint8_t *)phyInstPtr->recvDataAddr, 2, 1,
|
forge_cfm_frame((uint8_t *)phyInstPtr->recvDataAddr, 2, 1,
|
||||||
L2_GetCurrentFrameNum(linkInstPtr), L2_GetCurrentSlotNum(linkInstPtr) - 4);
|
L2_GetCurrentFrameNum(linkInstPtr), L2_GetCurrentSlotNum(linkInstPtr) - 4);
|
||||||
PhyWrite(phyInstPtr, TXRX_STATE, 0x01010101);
|
PhyWrite(phyInstPtr, TXRX_STATE, 0x01010101);
|
||||||
PhyWrite(phyInstPtr, RECVDATA_STATE, L2_CMF_PACK_LEN);
|
PhyWrite(phyInstPtr, RECVDATA_STATE, L2_CMF_PACK_LEN);
|
||||||
PhyWrite(phyInstPtr, COASE_FREQEST, COASE_TYPE_40KBPS_20MS);
|
PhyWrite(phyInstPtr, COASE_FREQEST, COASE_TYPE_40KBPS_20MS);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (L2_GetCurrentFrameType(linkInstPtr) == L2_SVC_FRAME && slotNum % 4 == 1)
|
if (L2_GetCurrentFrameType(linkInstPtr) == L2_SVC_FRAME && slotNum % 4 == 1)
|
||||||
{
|
{
|
||||||
forge_svc_frame((uint8_t *)phyInstPtr->recvDataAddr, 2, 1,
|
forge_svc_frame((uint8_t *)phyInstPtr->recvDataAddr, 2, 1,
|
||||||
@@ -283,13 +283,13 @@ TEST(linklayer_slave_netsetup)
|
|||||||
PhyWrite(phyInstPtr, FSTIME_H, frameSyncSlot);
|
PhyWrite(phyInstPtr, FSTIME_H, frameSyncSlot);
|
||||||
PhyWrite(phyInstPtr, FSTIME_L, Phy_GetTimeComp(L1_10KBPS_20MS_FRAME));
|
PhyWrite(phyInstPtr, FSTIME_L, Phy_GetTimeComp(L1_10KBPS_20MS_FRAME));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (L2_GetCurrentFrameType(linkInstPtr) == L2_CFM_FRAME && slotNum % 4 == 1)
|
if (L2_GetCurrentFrameType(linkInstPtr) == L2_CFM_FRAME && slotNum % 4 == 1)
|
||||||
{
|
{
|
||||||
frameSyncSlot = L2_GetCurrentFrameNum(linkInstPtr) * L2_SLOTS_PER_FRAME
|
frameSyncSlot = L2_GetCurrentFrameNum(linkInstPtr) * L2_SLOTS_PER_FRAME
|
||||||
+ L2_GetCurrentSlotNum(linkInstPtr) - 4;
|
+ L2_GetCurrentSlotNum(linkInstPtr) - 4;
|
||||||
|
|
||||||
forge_cfm_frame((uint8_t *)phyInstPtr->recvDataAddr, 1, 2,
|
forge_cfm_frame((uint8_t *)phyInstPtr->recvDataAddr, 1, 2,
|
||||||
frameSyncSlot/L2_SLOTS_PER_FRAME, frameSyncSlot%L2_SLOTS_PER_FRAME);
|
frameSyncSlot/L2_SLOTS_PER_FRAME, frameSyncSlot%L2_SLOTS_PER_FRAME);
|
||||||
|
|
||||||
PhyWrite(phyInstPtr, TXRX_STATE, 0x01010101);
|
PhyWrite(phyInstPtr, TXRX_STATE, 0x01010101);
|
||||||
@@ -301,10 +301,10 @@ TEST(linklayer_slave_netsetup)
|
|||||||
|
|
||||||
if (L2_GetCurrentFrameType(linkInstPtr) == L2_SVC_FRAME && slotNum % 4 == 1)
|
if (L2_GetCurrentFrameType(linkInstPtr) == L2_SVC_FRAME && slotNum % 4 == 1)
|
||||||
{
|
{
|
||||||
frameSyncSlot = L2_GetCurrentFrameNum(linkInstPtr) * L2_SLOTS_PER_FRAME
|
frameSyncSlot = L2_GetCurrentFrameNum(linkInstPtr) * L2_SLOTS_PER_FRAME
|
||||||
+ L2_GetCurrentSlotNum(linkInstPtr) - 4;
|
+ L2_GetCurrentSlotNum(linkInstPtr) - 4;
|
||||||
|
|
||||||
forge_svc_frame((uint8_t *)phyInstPtr->recvDataAddr, 1, 2,
|
forge_svc_frame((uint8_t *)phyInstPtr->recvDataAddr, 1, 2,
|
||||||
frameSyncSlot/L2_SLOTS_PER_FRAME, frameSyncSlot%L2_SLOTS_PER_FRAME);
|
frameSyncSlot/L2_SLOTS_PER_FRAME, frameSyncSlot%L2_SLOTS_PER_FRAME);
|
||||||
|
|
||||||
PhyWrite(phyInstPtr, TXRX_STATE, 0x01010101);
|
PhyWrite(phyInstPtr, TXRX_STATE, 0x01010101);
|
||||||
@@ -327,7 +327,7 @@ TEST(linklayer_slave_netsetup)
|
|||||||
|
|
||||||
// 2ms interrupt
|
// 2ms interrupt
|
||||||
if (tmcReg[TIME_FRAC_REG] == 200000)
|
if (tmcReg[TIME_FRAC_REG] == 200000)
|
||||||
{
|
{
|
||||||
Status = Linklayer_Proc(linkInstPtr);
|
Status = Linklayer_Proc(linkInstPtr);
|
||||||
if ((tmcReg[TIME_INT_REG] + 1) / 200 < linkInstPtr->netStartTime)
|
if ((tmcReg[TIME_INT_REG] + 1) / 200 < linkInstPtr->netStartTime)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user