chan_dahdi: Reflect the set software gain in the CLI "dahdi show channel" output.

* Remember the swgain setting from CLI "dahdi set swgain" command so the
CLI "dahdi show channel" output will reflect the current setting.

* Updated CLI "dahdi set hwgain" and "dahdi set swgain" documentation.

(issue ASTERISK-22429)
Reported by: Jaco Kroon
Patches:
      jira_asterisk_22429_v1.8_v2.patch (license #5621) patch uploaded by rmudgett


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@400907 65c4cc65-6c06-0410-ace0-fbb531ad65f3
changes/98/198/1
Richard Mudgett 12 years ago
parent 27f6318afb
commit 9735b75ed2

@ -718,9 +718,9 @@ struct dahdi_pvt {
struct dahdi_pvt *oprpeer; /*!< "Operator Services" peer tech_pvt ptr */
/*! \brief Amount of gain to increase during caller id */
float cid_rxgain;
/*! \brief Rx gain set by chan_dahdi.conf */
/*! \brief Software Rx gain set by chan_dahdi.conf */
float rxgain;
/*! \brief Tx gain set by chan_dahdi.conf */
/*! \brief Software Tx gain set by chan_dahdi.conf */
float txgain;
float txdrc; /*!< Dynamic Range Compression factor. a number between 1 and 6ish */
@ -15690,15 +15690,20 @@ static char *dahdi_set_hwgain(struct ast_cli_entry *e, int cmd, struct ast_cli_a
switch (cmd) {
case CLI_INIT:
e->command = "dahdi set hwgain";
e->command = "dahdi set hwgain {rx|tx}";
e->usage =
"Usage: dahdi set hwgain <rx|tx> <chan#> <gain>\n"
" Sets the hardware gain on a a given channel, overriding the\n"
" value provided at module loadtime, whether the channel is in\n"
" use or not. Changes take effect immediately.\n"
" Sets the hardware gain on a given channel. Changes take effect\n"
" immediately whether the channel is in use or not.\n"
"\n"
" <rx|tx> which direction do you want to change (relative to our module)\n"
" <chan num> is the channel number relative to the device\n"
" <gain> is the gain in dB (e.g. -3.5 for -3.5dB)\n";
" <gain> is the gain in dB (e.g. -3.5 for -3.5dB)\n"
"\n"
" Please note:\n"
" * This is currently the only way to set hwgain by the channel driver.\n"
" * hwgain is only supportable by hardware with analog ports because\n"
" hwgain works on the analog side of an analog-digital conversion.\n";
return NULL;
case CLI_GENERATE:
return NULL;
@ -15759,12 +15764,13 @@ static char *dahdi_set_swgain(struct ast_cli_entry *e, int cmd, struct ast_cli_a
switch (cmd) {
case CLI_INIT:
e->command = "dahdi set swgain";
e->command = "dahdi set swgain {rx|tx}";
e->usage =
"Usage: dahdi set swgain <rx|tx> <chan#> <gain>\n"
" Sets the software gain on a a given channel, overriding the\n"
" value provided at module loadtime, whether the channel is in\n"
" use or not. Changes take effect immediately.\n"
" Sets the software gain on a given channel and overrides the\n"
" value provided at module loadtime. Changes take effect\n"
" immediately whether the channel is in use or not.\n"
"\n"
" <rx|tx> which direction do you want to change (relative to our module)\n"
" <chan num> is the channel number relative to the device\n"
" <gain> is the gain in dB (e.g. -3.5 for -3.5dB)\n";
@ -15808,6 +15814,12 @@ static char *dahdi_set_swgain(struct ast_cli_entry *e, int cmd, struct ast_cli_a
ast_cli(a->fd, "software %s gain set to %.1f on channel %d\n",
tx ? "tx" : "rx", gain, channel);
if (tx) {
tmp->txgain = gain;
} else {
tmp->rxgain = gain;
}
break;
}
ast_mutex_unlock(&iflock);

Loading…
Cancel
Save