aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2019-03-05 21:27:01 +0100
committerHarald Welte <laforge@gnumonks.org>2019-03-05 21:34:08 +0100
commitb509023d3467592330b8541d6c12fcd81649904b (patch)
tree7edcebd4bf6622621a191a4a0d1eed52d292b4b4
parentde3262fd27624c4f6a7fb5c1b536931932a7e4db (diff)
OC-2G: Nominal transmit power is 25 dBm, not 40
According to the OC-2G product specifiacation, the maximum output power is 25 dBm. This should be reflected in the code, there's no point in claiming to be able to trnasmit 40 dBm - which just creates confusion on all levels (such as the logs, where Tx power is claimed to be ramped up to 40 dBm right now). Closes: OS#3823 Change-Id: Ia6b3476ab2f9279f8905b8c7cfd07ef7b0a939ed
-rw-r--r--src/osmo-bts-oc2g/main.c2
-rw-r--r--src/osmo-bts-oc2g/oc2gbts_vty.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/osmo-bts-oc2g/main.c b/src/osmo-bts-oc2g/main.c
index ab3d36d7..29fab474 100644
--- a/src/osmo-bts-oc2g/main.c
+++ b/src/osmo-bts-oc2g/main.c
@@ -126,7 +126,7 @@ int bts_model_init(struct gsm_bts *bts)
int bts_model_trx_init(struct gsm_bts_trx *trx)
{
- trx->nominal_power = 40;
+ trx->nominal_power = 25;
trx->power_params.trx_p_max_out_mdBm = to_mdB(trx->bts->c0->nominal_power);
return 0;
}
diff --git a/src/osmo-bts-oc2g/oc2gbts_vty.c b/src/osmo-bts-oc2g/oc2gbts_vty.c
index 9bb45798..4c3915ba 100644
--- a/src/osmo-bts-oc2g/oc2gbts_vty.c
+++ b/src/osmo-bts-oc2g/oc2gbts_vty.c
@@ -328,15 +328,15 @@ DEFUN(no_loopback, no_loopback_cmd,
}
DEFUN(cfg_trx_nominal_power, cfg_trx_nominal_power_cmd,
- "nominal-tx-power <0-40>",
+ "nominal-tx-power <0-25>",
"Set the nominal transmit output power in dBm\n"
"Nominal transmit output power level in dBm\n")
{
int nominal_power = atoi(argv[0]);
struct gsm_bts_trx *trx = vty->index;
- if (( nominal_power > 40 ) || ( nominal_power < 0 )) {
- vty_out(vty, "Nominal Tx power level must be between 0 and 40 dBm (%d) %s",
+ if (( nominal_power > 25 ) || ( nominal_power < 0 )) {
+ vty_out(vty, "Nominal Tx power level must be between 0 and 25 dBm (%d) %s",
nominal_power, VTY_NEWLINE);
return CMD_WARNING;
}