Harald Welte has uploaded this change for review. (
https://gerrit.osmocom.org/13135
Change subject: OC-2G: Nominal transmit power is 25 dBm, not 40
......................................................................
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
---
M src/osmo-bts-oc2g/main.c
M src/osmo-bts-oc2g/oc2gbts_vty.c
2 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/35/13135/1
diff --git a/src/osmo-bts-oc2g/main.c b/src/osmo-bts-oc2g/main.c
index ab3d36d..29fab47 100644
--- a/src/osmo-bts-oc2g/main.c
+++ b/src/osmo-bts-oc2g/main.c
@@ -126,7 +126,7 @@
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 9bb4579..4c3915b 100644
--- a/src/osmo-bts-oc2g/oc2gbts_vty.c
+++ b/src/osmo-bts-oc2g/oc2gbts_vty.c
@@ -328,15 +328,15 @@
}
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;
}
--
To view, visit https://gerrit.osmocom.org/13135
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia6b3476ab2f9279f8905b8c7cfd07ef7b0a939ed
Gerrit-Change-Number: 13135
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte <[email protected]>
