transceiver: rename getting radio vector time to getTime()
Small name change to match setTime for a get/set pair.
Signed-off-by: Thomas Tsou <ttsou@vt.edu>
git-svn-id: http://wush.net/svn/range/software/public/openbts/trunk@2673 19bc5d8c-e614-43d4-8b26-e1612bc8e597
diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp
index 77577e1..20c6aad 100644
--- a/Transceiver52M/Transceiver.cpp
+++ b/Transceiver52M/Transceiver.cpp
@@ -149,7 +149,7 @@
// Even if the burst is stale, put it in the fillter table.
// (It might be an idle pattern.)
LOG(NOTICE) << "dumping STALE burst in TRX->USRP interface";
- const GSM::Time& nextTime = staleBurst->time();
+ const GSM::Time& nextTime = staleBurst->getTime();
int TN = nextTime.TN();
int modFN = nextTime.FN() % fillerModulus[TN];
delete fillerTable[modFN][TN];
@@ -282,11 +282,11 @@
if (!rxBurst) return NULL;
- LOG(DEBUG) << "receiveFIFO: read radio vector at time: " << rxBurst->time() << ", new size: " << mReceiveFIFO->size();
+ LOG(DEBUG) << "receiveFIFO: read radio vector at time: " << rxBurst->getTime() << ", new size: " << mReceiveFIFO->size();
- int timeslot = rxBurst->time().TN();
+ int timeslot = rxBurst->getTime().TN();
- CorrType corrType = expectedCorrType(rxBurst->time());
+ CorrType corrType = expectedCorrType(rxBurst->getTime());
if ((corrType==OFF) || (corrType==IDLE)) {
delete rxBurst;
@@ -299,26 +299,26 @@
float TOA = 0.0;
float avgPwr = 0.0;
if (!energyDetect(*vectorBurst,20*mSamplesPerSymbol,mEnergyThreshold,&avgPwr)) {
- LOG(DEBUG) << "Estimated Energy: " << sqrt(avgPwr) << ", at time " << rxBurst->time();
- double framesElapsed = rxBurst->time()-prevFalseDetectionTime;
+ LOG(DEBUG) << "Estimated Energy: " << sqrt(avgPwr) << ", at time " << rxBurst->getTime();
+ double framesElapsed = rxBurst->getTime()-prevFalseDetectionTime;
if (framesElapsed > 50) { // if we haven't had any false detections for a while, lower threshold
mEnergyThreshold -= 10.0/10.0;
if (mEnergyThreshold < 0.0)
mEnergyThreshold = 0.0;
- prevFalseDetectionTime = rxBurst->time();
+ prevFalseDetectionTime = rxBurst->getTime();
}
delete rxBurst;
return NULL;
}
- LOG(DEBUG) << "Estimated Energy: " << sqrt(avgPwr) << ", at time " << rxBurst->time();
+ LOG(DEBUG) << "Estimated Energy: " << sqrt(avgPwr) << ", at time " << rxBurst->getTime();
// run the proper correlator
bool success = false;
if (corrType==TSC) {
- LOG(DEBUG) << "looking for TSC at time: " << rxBurst->time();
+ LOG(DEBUG) << "looking for TSC at time: " << rxBurst->getTime();
signalVector *channelResp;
- double framesElapsed = rxBurst->time()-channelEstimateTime[timeslot];
+ double framesElapsed = rxBurst->getTime()-channelEstimateTime[timeslot];
bool estimateChannel = false;
if ((framesElapsed > 50) || (channelResponse[timeslot]==NULL)) {
if (channelResponse[timeslot]) delete channelResponse[timeslot];
@@ -353,15 +353,15 @@
chanRespAmplitude[timeslot] = amplitude;
scaleVector(*channelResp, complex(1.0,0.0)/amplitude);
designDFE(*channelResp, SNRestimate[timeslot], 7, &DFEForward[timeslot], &DFEFeedback[timeslot]);
- channelEstimateTime[timeslot] = rxBurst->time();
+ channelEstimateTime[timeslot] = rxBurst->getTime();
LOG(DEBUG) << "SNR: " << SNRestimate[timeslot] << ", DFE forward: " << *DFEForward[timeslot] << ", DFE backward: " << *DFEFeedback[timeslot];
}
}
else {
- double framesElapsed = rxBurst->time()-prevFalseDetectionTime;
- LOG(DEBUG) << "wTime: " << rxBurst->time() << ", pTime: " << prevFalseDetectionTime << ", fElapsed: " << framesElapsed;
+ double framesElapsed = rxBurst->getTime()-prevFalseDetectionTime;
+ LOG(DEBUG) << "wTime: " << rxBurst->getTime() << ", pTime: " << prevFalseDetectionTime << ", fElapsed: " << framesElapsed;
mEnergyThreshold += 10.0F/10.0F*exp(-framesElapsed);
- prevFalseDetectionTime = rxBurst->time();
+ prevFalseDetectionTime = rxBurst->getTime();
channelResponse[timeslot] = NULL;
}
}
@@ -379,9 +379,9 @@
channelResponse[timeslot] = NULL;
}
else {
- double framesElapsed = rxBurst->time()-prevFalseDetectionTime;
+ double framesElapsed = rxBurst->getTime()-prevFalseDetectionTime;
mEnergyThreshold += (1.0F/10.0F)*exp(-framesElapsed);
- prevFalseDetectionTime = rxBurst->time();
+ prevFalseDetectionTime = rxBurst->getTime();
}
}
LOG(DEBUG) << "energy Threshold = " << mEnergyThreshold;
@@ -403,7 +403,7 @@
*DFEForward[timeslot],
*DFEFeedback[timeslot]);
}
- wTime = rxBurst->time();
+ wTime = rxBurst->getTime();
RSSI = (int) floor(20.0*log10(rxFullScale/amplitude.abs()));
LOG(DEBUG) << "RSSI: " << RSSI;
timingOffset = (int) round(TOA*256.0/mSamplesPerSymbol);
diff --git a/Transceiver52M/radioVector.cpp b/Transceiver52M/radioVector.cpp
index fd4e5a7..f20d97a 100644
--- a/Transceiver52M/radioVector.cpp
+++ b/Transceiver52M/radioVector.cpp
@@ -26,7 +26,7 @@
{
}
-GSM::Time radioVector::time() const
+GSM::Time radioVector::getTime() const
{
return mTime;
}
@@ -64,7 +64,7 @@
while (mQ.size()==0)
mWriteSignal.wait(mLock);
- retVal = mQ.top()->time();
+ retVal = mQ.top()->getTime();
mLock.unlock();
return retVal;
@@ -78,7 +78,7 @@
return NULL;
}
- if (mQ.top()->time() < targTime) {
+ if (mQ.top()->getTime() < targTime) {
radioVector* retVal = mQ.top();
mQ.pop();
mLock.unlock();
@@ -97,7 +97,7 @@
return NULL;
}
- if (mQ.top()->time() == targTime) {
+ if (mQ.top()->getTime() == targTime) {
radioVector* retVal = mQ.top();
mQ.pop();
mLock.unlock();
diff --git a/Transceiver52M/radioVector.h b/Transceiver52M/radioVector.h
index 37970ae..2975a73 100644
--- a/Transceiver52M/radioVector.h
+++ b/Transceiver52M/radioVector.h
@@ -28,7 +28,7 @@
class radioVector : public signalVector {
public:
radioVector(const signalVector& wVector, GSM::Time& wTime);
- GSM::Time time() const;
+ GSM::Time getTime() const;
void setTime(const GSM::Time& wTime);
bool operator>(const radioVector& other) const;