Skip to content

Commit

Permalink
minor corrections in comments and error output
Browse files Browse the repository at this point in the history
  • Loading branch information
boulis committed Mar 10, 2017
1 parent 16154b2 commit 8908c97
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Castalia/src/node/communication/mac/VirtualMac.cc
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ void VirtualMac::initialize()
resMgrModule = check_and_cast <ResourceManager*>(getParentModule()->getParentModule()->getSubmodule("ResourceManager"));

if (!resMgrModule || !radioModule)
opp_error("\n Virtual Routing init: Error in geting a valid reference module(s).");
opp_error("\n Virtual Mac init: Error in geting a valid reference module(s).");

setTimerDrift(resMgrModule->getCPUClockDrift());
pktHistory.clear();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,7 @@ void BaselineBANMac::fromRadioLayer(cPacket *pkt, double rssi, double lqi) {
// schedule a timer to wake up for the next beacon (it might be m periods away
setTimer(WAKEUP_FOR_BEACON, beaconPeriodLength * scheduledAccessPeriod * allocationSlotLength - beaconTxTime - GUARD_TIME );

// if we have a schedule that does not start after RAP, or our schedule
// if we have a schedule that does not start immediately after RAP, or our schedule
// is not assigned yet, then go to sleep after RAP.
if ((scheduledTxAccessStart == UNCONNECTED && RAP1Length < beaconPeriodLength)
|| (scheduledTxAccessStart-1 > RAP1Length)) {
Expand Down
2 changes: 1 addition & 1 deletion Castalia/src/node/communication/radio/Radio.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1056,7 +1056,7 @@ void Radio::parseRadioParameterFile(const char *fileName)
if (section == 1) {
// parsing lines in the following format:
// Name, dataRate(kbps), modulationType, bitsPerSymbol, bandwidth(MHz),
// noiseBandwidth(MHz), noiseFloor(dBm), sensitivity(dBm), powerConsumed(mW)
// noiseBandwidth(KHz), noiseFloor(dBm), sensitivity(dBm), powerConsumed(mW)

RXmode_type rxmode;
cStringTokenizer t(s.c_str(), ", \t");
Expand Down

0 comments on commit 8908c97

Please sign in to comment.