Transceiver52M: Add more complete specification of GPRS types
Submitted by: Ivan Kluchnikov <kluchnikovi@gmail.com> Signed-off-by: Thomas Tsou <tom@tsou.cc> git-svn-id: http://wush.net/svn/range/software/public/openbts/trunk@5690 19bc5d8c-e614-43d4-8b26-e1612bc8e597
This commit is contained in:
parent
258855c758
commit
fc40a84d9b
|
@ -214,6 +214,9 @@ void Transceiver::setModulus(int timeslot)
|
|||
case VII:
|
||||
fillerModulus[timeslot] = 102;
|
||||
break;
|
||||
case XIII:
|
||||
fillerModulus[timeslot] = 52;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
@ -268,15 +271,22 @@ Transceiver::CorrType Transceiver::expectedCorrType(GSM::Time currTime)
|
|||
else
|
||||
return TSC;
|
||||
break;
|
||||
case XIII: {
|
||||
int mod52 = burstFN % 52;
|
||||
if ((mod52 == 12) || (mod52 == 38))
|
||||
return RACH;
|
||||
else if ((mod52 == 25) || (mod52 == 51))
|
||||
return IDLE;
|
||||
else
|
||||
return TSC;
|
||||
break;
|
||||
}
|
||||
case LOOPBACK:
|
||||
if ((burstFN % 51 <= 50) && (burstFN % 51 >=48))
|
||||
return IDLE;
|
||||
else
|
||||
return TSC;
|
||||
break;
|
||||
case XIII:
|
||||
return TSC;
|
||||
break;
|
||||
default:
|
||||
return OFF;
|
||||
break;
|
||||
|
|
|
@ -86,12 +86,14 @@ private:
|
|||
V, ///< FCCH+SCH+CCCH+BCCH+SDCCH/4+SACCH/4, uplink RACH+SDCCH/4
|
||||
VI, ///< CCCH+BCCH, uplink RACH
|
||||
VII, ///< SDCCH/8 + SACCH/8
|
||||
VIII, ///< TCH/F + FACCH/F + SACCH/M
|
||||
IX, ///< TCH/F + SACCH/M
|
||||
X, ///< TCH/FD + SACCH/MD
|
||||
XI, ///< PBCCH+PCCCH+PDTCH+PACCH+PTCCH
|
||||
XII, ///< PCCCH+PDTCH+PACCH+PTCCH
|
||||
XIII, ///< PDTCH+PACCH+PTCCH
|
||||
NONE, ///< Channel is inactive, default
|
||||
LOOPBACK, ///< similar go VII, used in loopback testing
|
||||
X,
|
||||
XI,
|
||||
XII,
|
||||
XIII
|
||||
LOOPBACK ///< similar go VII, used in loopback testing
|
||||
} ChannelCombination;
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue