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
This commit is contained in:
Harald Welte 2019-03-05 21:27:01 +01:00
parent de3262fd27
commit b509023d34
2 changed files with 4 additions and 4 deletions

View File

@ -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;
}

View File

@ -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;
}