Review at https://gerrit.osmocom.org/2143
osmo-trx: Separate command line switch to enable EDGE filler.
Now -r comand line switch always enables GMSK filler even when EDGE mode is
enabled with -e switch. If you want to enable EDGE filler, use -E switch.
Change-Id: Ic8808bbe3f06740ef3fec1d1865ecb57fbcfabab
---
M Transceiver52M/osmo-trx.cpp
1 file changed, 11 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/43/2143/1
diff --git a/Transceiver52M/osmo-trx.cpp b/Transceiver52M/osmo-trx.cpp
index 5e81586..dd80557 100644
--- a/Transceiver52M/osmo-trx.cpp
+++ b/Transceiver52M/osmo-trx.cpp
@@ -339,7 +339,8 @@
" -c Number of ARFCN channels (default=1)\n"
" -f Enable C0 filler table\n"
" -o Set baseband frequency offset (default=auto)\n"
- " -r Random Normal Burst test mode with TSC\n"
+ " -r Random GMSK Normal Burst test mode with given TSC\n"
+ " -E Random 8-PSK Normal Burst test mode with given TSC\n"
" -A Random Access Burst test mode with delay\n"
" -R RSSI to dBm offset in dB (default=0)\n"
" -S Swap channels (UmTRX only)\n",
@@ -366,7 +367,7 @@
config->swap_channels = false;
config->edge = false;
- while ((option = getopt(argc, argv, "ha:l:i:p:c:dmxgfo:s:b:r:A:R:Se"))
!= -1) {
+ while ((option = getopt(argc, argv,
"ha:l:i:p:c:dmxgfo:s:b:r:E:A:R:Se")) != -1) {
switch (option) {
case 'h':
print_help();
@@ -414,6 +415,10 @@
case 'r':
config->rtsc = atoi(optarg);
config->filler = Transceiver::FILLER_NORM_RAND;
+ break;
+ case 'E':
+ config->rtsc = atoi(optarg);
+ config->filler = Transceiver::FILLER_EDGE_RAND;
break;
case 'A':
config->rach_delay = atoi(optarg);
@@ -463,8 +468,10 @@
}
}
- if (config->edge && (config->filler == Transceiver::FILLER_NORM_RAND))
- config->filler = Transceiver::FILLER_EDGE_RAND;
+ if (!config->edge && (config->filler == Transceiver::FILLER_EDGE_RAND))
{
+ printf("Can't enable EDGE filler when EDGE mode is
disabled\n\n");
+ goto bad_config;
+ }
if ((config->tx_sps != 1) && (config->tx_sps != 4) &&
(config->rx_sps != 1) && (config->rx_sps != 4)) {
--
To view, visit https://gerrit.osmocom.org/2143
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic8808bbe3f06740ef3fec1d1865ecb57fbcfabab
Gerrit-PatchSet: 1
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Owner: Alexander Chemeris <alexander.cheme...@gmail.com>
