cellular-infrastructure
/
osmo-trx
mirror of https://gerrit.osmocom.org/osmo-trx
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

mcbts: Fix maximum number in channels in multicarrier config 

Maximum number of carriers is fixed to 3 channels on a single
physical RF channel.

Fixes: Coverity CID 149353t
Signed-off-by: Tom Tsou <tom.tsou@ettus.com>
This commit is contained in:
Tom Tsou 2016-10-04 12:04:40 -07:00
parent 49792aa1f7
commit 1535052873
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Transceiver52M/osmo-trx.cpp
View File

@ -60,6 +60,9 @@
#define DEFAULT_DIVERSITY false
#define DEFAULT_CHANS 1
/* Max number of channels in multi-carrier configuration */
#define MAX_MCHANS 3
struct trx_config {
std::string log_level;
std::string addr;
@ -167,7 +170,7 @@ bool trx_setup_config(struct trx_config *config)
if (!config->chans)
config->chans = DEFAULT_CHANS;
if (config->mcbts && ((config->chans < 0) || (config->chans > 5))) {
if (config->mcbts && (config->chans > MAX_MCHANS)) {
std::cout << "Unsupported number of channels" << std::endl;
return false;
}