Skip to content

Commit 76b915b

Browse files
levylevy
committed
Gptp: Fixed typo.
1 parent 34bdd1b commit 76b915b

2 files changed

Lines changed: 20 additions & 20 deletions

File tree

‎src/inet/linklayer/ieee8021as/Gptp.cc‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -255,8 +255,8 @@ void Gptp::sendFollowUp(int portId)
255255
}
256256
else if (gptpNodeType == BRIDGE_NODE) {
257257
followUp->setSequenceId(syncReceiverProcess.sync->getSequenceId());
258-
clocktime_t upstreamTxTime = syncReceiverProcess.syncReceptionStartUnsychronized - pdelay / neighborRateRatio;
259-
clocktime_t residenceTime = process.syncTransmissionStartUnsychronized - upstreamTxTime;
258+
clocktime_t upstreamTxTime = syncReceiverProcess.syncReceptionStartUnsynchronized - pdelay / neighborRateRatio;
259+
clocktime_t residenceTime = process.syncTransmissionStartUnsynchronized - upstreamTxTime;
260260
ASSERT(residenceTime >= 0);
261261
ASSERT(pdelay >= 0);
262262
followUp->setCorrectionField(syncReceiverProcess.followUp->getCorrectionField() + gmRateRatio * residenceTime);
@@ -299,7 +299,7 @@ void Gptp::sendPdelayResp(int portId)
299299
pdelayResp->setDomainNumber(domainNumber);
300300
pdelayResp->setRequestingPortIdentity(process.pdelayReq->getSourcePortIdentity());
301301
pdelayResp->setSequenceId(process.pdelayReq->getSequenceId());
302-
pdelayResp->setRequestReceiptTimestamp(process.pdelayReqReceptionStartUnsychronized);
302+
pdelayResp->setRequestReceiptTimestamp(process.pdelayReqReceptionStartUnsynchronized);
303303
process.pdelayResp = pdelayResp->dup();
304304
auto packet = new Packet("GptpPdelayResp");
305305
packet->addTag<MacAddressReq>()->setDestAddress(GPTP_MULTICAST_ADDRESS);
@@ -315,7 +315,7 @@ void Gptp::sendPdelayRespFollowUp(int portId, const GptpPdelayResp *resp)
315315
ASSERT(process.state == PdelayMeasurementResponderProcess::State::PDELAY_RESP_TRANSMISSION_ENDED);
316316
auto pdelayRespFollowUp = makeShared<GptpPdelayRespFollowUp>();
317317
pdelayRespFollowUp->setDomainNumber(domainNumber);
318-
pdelayRespFollowUp->setResponseOriginTimestamp(process.pdelayRespTransmissionStartUnsychronized);
318+
pdelayRespFollowUp->setResponseOriginTimestamp(process.pdelayRespTransmissionStartUnsynchronized);
319319
pdelayRespFollowUp->setRequestingPortIdentity(resp->getRequestingPortIdentity());
320320
pdelayRespFollowUp->setSequenceId(resp->getSequenceId());
321321
process.pdelayRespFollowUp = pdelayRespFollowUp->dup();
@@ -419,7 +419,7 @@ void Gptp::computeGmRateRatio()
419419
ASSERT(syncReceiverProcess.state == SyncReceiverProcess::State::FOLLOW_UP_RECEPTION_ENDED);
420420
ASSERT(pdelay >= 0);
421421
clocktime_t sourceTime = syncReceiverProcess.followUp->getPreciseOriginTimestamp() + syncReceiverProcess.followUp->getCorrectionField() + pdelay;
422-
clocktime_t localTime = syncReceiverProcess.syncReceptionStartUnsychronized;
422+
clocktime_t localTime = syncReceiverProcess.syncReceptionStartUnsynchronized;
423423
if (previousSourceTime != -1 && previousLocalTime != -1) {
424424
// IEEE 802.1AS-2020 Section 10.2.11.2.1, index N is previous, 0 is last
425425
clocktime_t sourceTimeDifference = sourceTime - previousSourceTime;
@@ -441,7 +441,7 @@ void Gptp::computeNeighborRateRatio()
441441
// NOTE: the standard defines the usage of the correction field for the following two timestamps
442442
// however, these contain fractional nanoseconds, which we do not use in INET
443443
clocktime_t correctedResponderEventTimestamp = process.pdelayRespFollowUp->getResponseOriginTimestamp();
444-
clocktime_t pdelayRespEventIngressTimestamp = process.pdelayRespReceptionStartUnsychronized;
444+
clocktime_t pdelayRespEventIngressTimestamp = process.pdelayRespReceptionStartUnsynchronized;
445445
if (previousCorrectedResponderEventTimestamp != -1 && previousPdelayRespEventIngressTimestamp != -1) {
446446
// IEEE 802.1AS-2020 Section 11.2.19.3.3, index N is previous, 0 is last
447447
clocktime_t correctedResponderEventTimestampDifference = correctedResponderEventTimestamp - previousCorrectedResponderEventTimestamp;
@@ -460,10 +460,10 @@ void Gptp::computePropTime()
460460
{
461461
auto& process = pdelayMeasurementRequesterProcesses[slavePortId];
462462
ASSERT(process.state == PdelayMeasurementRequesterProcess::State::PDELAY_RESP_FOLLOW_UP_RECEPTION_ENDED);
463-
clocktime_t t1 = process.pdelayReqTransmissionStartUnsychronized;
463+
clocktime_t t1 = process.pdelayReqTransmissionStartUnsynchronized;
464464
clocktime_t t2 = process.pdelayResp->getRequestReceiptTimestamp();
465465
clocktime_t t3 = process.pdelayRespFollowUp->getResponseOriginTimestamp();
466-
clocktime_t t4 = process.pdelayRespReceptionStartUnsychronized;
466+
clocktime_t t4 = process.pdelayRespReceptionStartUnsynchronized;
467467
ASSERT(t1 >= 0);
468468
ASSERT(t2 >= 0);
469469
ASSERT(t3 >= 0);
@@ -533,14 +533,14 @@ void Gptp::receiveSignal(cComponent *source, simsignal_t simSignal, cObject *obj
533533
process = PdelayMeasurementResponderProcess();
534534
ASSERT(process.state == PdelayMeasurementResponderProcess::State::INITIALIZED);
535535
process.state = PdelayMeasurementResponderProcess::State::PDELAY_REQ_RECEPTION_STARTED;
536-
process.pdelayReqReceptionStartUnsychronized = localClock->getClockTime();
536+
process.pdelayReqReceptionStartUnsynchronized = localClock->getClockTime();
537537
break;
538538
}
539539
case GPTPTYPE_PDELAY_RESP: {
540540
auto& process = pdelayMeasurementRequesterProcesses[portId];
541541
ASSERT(process.state == PdelayMeasurementRequesterProcess::State::PDELAY_REQ_TRANSMISSION_ENDED);
542542
process.state = PdelayMeasurementRequesterProcess::State::PDELAY_RESP_RECEPTION_STARTED;
543-
process.pdelayRespReceptionStartUnsychronized = localClock->getClockTime();
543+
process.pdelayRespReceptionStartUnsynchronized = localClock->getClockTime();
544544
break;
545545
}
546546
case GPTPTYPE_PDELAY_RESP_FOLLOW_UP: {
@@ -553,7 +553,7 @@ void Gptp::receiveSignal(cComponent *source, simsignal_t simSignal, cObject *obj
553553
ASSERT(syncReceiverProcess.state == SyncReceiverProcess::State::INITIALIZED);
554554
syncReceiverProcess.state = SyncReceiverProcess::State::SYNC_RECEPTION_STARTED;
555555
syncReceiverProcess.syncReceptionStartSynchronized = clock->getClockTime();
556-
syncReceiverProcess.syncReceptionStartUnsychronized = localClock->getClockTime();
556+
syncReceiverProcess.syncReceptionStartUnsynchronized = localClock->getClockTime();
557557
break;
558558
}
559559
case GPTPTYPE_FOLLOW_UP: {
@@ -608,14 +608,14 @@ void Gptp::receiveSignal(cComponent *source, simsignal_t simSignal, cObject *obj
608608
auto& process = pdelayMeasurementRequesterProcesses[portId];
609609
ASSERT(process.state == PdelayMeasurementRequesterProcess::State::INITIALIZED);
610610
process.state = PdelayMeasurementRequesterProcess::State::PDELAY_REQ_TRANSMISSION_STARTED;
611-
process.pdelayReqTransmissionStartUnsychronized = localClock->getClockTime();
611+
process.pdelayReqTransmissionStartUnsynchronized = localClock->getClockTime();
612612
break;
613613
}
614614
case GPTPTYPE_PDELAY_RESP: {
615615
auto& process = pdelayMeasurementResponderProcesses[portId];
616616
ASSERT(process.state == PdelayMeasurementResponderProcess::State::PDELAY_REQ_RECEPTION_ENDED);
617617
process.state = PdelayMeasurementResponderProcess::State::PDELAY_RESP_TRANSMISSION_STARTED;
618-
process.pdelayRespTransmissionStartUnsychronized = localClock->getClockTime();
618+
process.pdelayRespTransmissionStartUnsynchronized = localClock->getClockTime();
619619
break;
620620
}
621621
case GPTPTYPE_PDELAY_RESP_FOLLOW_UP: {
@@ -628,7 +628,7 @@ void Gptp::receiveSignal(cComponent *source, simsignal_t simSignal, cObject *obj
628628
auto& process = syncSenderProcesses[portId];
629629
ASSERT(process.state == SyncSenderProcess::State::INITIALIZED);
630630
process.state = SyncSenderProcess::State::SYNC_TRANSMISSION_STARTED;
631-
process.syncTransmissionStartUnsychronized = localClock->getClockTime();
631+
process.syncTransmissionStartUnsynchronized = localClock->getClockTime();
632632
process.syncTransmissionStartSynchronized = clock->getClockTime();
633633
if (gptpNodeType == MASTER_NODE)
634634
sendFollowUp(portId);

‎src/inet/linklayer/ieee8021as/Gptp.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ class INET_API Gptp : public ClockUserModuleBase, public cListener
4141
State state = State::INITIALIZED;
4242

4343
// measured by reading the unsynchronized local clock on notification from the physical layer
44-
clocktime_t pdelayReqTransmissionStartUnsychronized = -1;
45-
clocktime_t pdelayRespReceptionStartUnsychronized = -1;
44+
clocktime_t pdelayReqTransmissionStartUnsynchronized = -1;
45+
clocktime_t pdelayRespReceptionStartUnsynchronized = -1;
4646

4747
// messages sent or received by Gptp
4848
GptpPdelayReq *pdelayReq = nullptr;
@@ -72,8 +72,8 @@ class INET_API Gptp : public ClockUserModuleBase, public cListener
7272
State state = State::INITIALIZED;
7373

7474
// measured by reading the unsynchronized local clock on notification from the physical layer
75-
clocktime_t pdelayReqReceptionStartUnsychronized = -1;
76-
clocktime_t pdelayRespTransmissionStartUnsychronized = -1;
75+
clocktime_t pdelayReqReceptionStartUnsynchronized = -1;
76+
clocktime_t pdelayRespTransmissionStartUnsynchronized = -1;
7777

7878
// messages sent or received by Gptp
7979
GptpPdelayReq *pdelayReq = nullptr;
@@ -101,7 +101,7 @@ class INET_API Gptp : public ClockUserModuleBase, public cListener
101101
State state = State::INITIALIZED;
102102

103103
// measured by reading the unsynchronized local clock on notification from the physical layer
104-
clocktime_t syncTransmissionStartUnsychronized = -1;
104+
clocktime_t syncTransmissionStartUnsynchronized = -1;
105105

106106
// measured by reading the synchronized clock on notification from the physical layer
107107
clocktime_t syncTransmissionStartSynchronized = -1;
@@ -130,7 +130,7 @@ class INET_API Gptp : public ClockUserModuleBase, public cListener
130130
State state = State::INITIALIZED;
131131

132132
// measured by reading the unsynchronized local clock on notification from the physical layer
133-
clocktime_t syncReceptionStartUnsychronized = -1;
133+
clocktime_t syncReceptionStartUnsynchronized = -1;
134134

135135
// measured by reading the synchronized clock on notification from the physical layer
136136
clocktime_t syncReceptionStartSynchronized = -1;

0 commit comments

Comments
 (0)