cellular-infrastructure
/
osmo-msc
mirror of https://gerrit.osmocom.org/osmo-msc
9
0
Fork 0
Code Issues Releases Wiki Activity

Use new e1inp_signal_names from libosmo-abis to print input signal names 

Change-Id: I156027ecdd1456228c9f8776577edd48e70c19da
This commit is contained in:
Harald Welte 2017-05-25 19:16:40 +02:00
parent 271ceca862
commit 5f72f6fccc
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openbsc/src/libbsc/bsc_init.c
View File

@ -324,9 +324,10 @@ static int inp_sig_cb(unsigned int subsys, unsigned int signal,
if (subsys != SS_L_INPUT)
return -EINVAL;
LOGP(DLMI, LOGL_DEBUG, "%s(): Input signal '%s' received\n", __func__,
get_value_string(e1inp_signal_names, signal));
switch (signal) {
case S_L_INP_TEI_UP:
LOGP(DLMI, LOGL_DEBUG, "%s() signal: S_L_INP_TEI_UP\n", __func__);
if (isd->link_type == E1INP_SIGN_OML) {
/* TODO: this is required for the Nokia BTS, hopping is configured
during OML, other MA is not set. */
@ -351,7 +352,6 @@ static int inp_sig_cb(unsigned int subsys, unsigned int signal,
bootstrap_rsl(trx);
break;
case S_L_INP_TEI_DN:
LOGP(DLMI, LOGL_DEBUG, "%s() signal: S_L_INP_TEI_DN\n", __func__);
LOGP(DLMI, LOGL_ERROR, "Lost some E1 TEI link: %d %p\n", isd->link_type, trx);
if (isd->link_type == E1INP_SIGN_OML)

7
openbsc/src/libbsc/bts_ericsson_rbs2000.c
View File

@ -114,9 +114,10 @@ static int inp_sig_cb(unsigned int subsys, unsigned int signal,
if (subsys != SS_L_INPUT)
return 0;
LOGP(DNM, LOGL_DEBUG, "%s(): Input signal '%s' received\n", __func__,
get_value_string(e1inp_signal_names, signal));
switch (signal) {
case S_L_INP_TEI_UP:
LOGP(DNM, LOGL_DEBUG, "%s() signal: S_L_INP_TEI_UP\n", __func__);
switch (isd->link_type) {
case E1INP_SIGN_OML:
if (isd->trx->bts->type != GSM_BTS_TYPE_RBS2000)
@ -129,7 +130,6 @@ static int inp_sig_cb(unsigned int subsys, unsigned int signal,
}
break;
case S_L_INP_TEI_DN:
LOGP(DNM, LOGL_DEBUG, "%s() signal: S_L_INP_TEI_DN\n", __func__);
if (isd->trx->bts->type != GSM_BTS_TYPE_RBS2000)
break;
LOGP(DNM, LOGL_NOTICE, "Line-%u TS-%u TEI-%u SAPI-%u: Link "
@ -141,9 +141,7 @@ static int inp_sig_cb(unsigned int subsys, unsigned int signal,
lapd_sap_start(e1i_ts->lapd, isd->tei, isd->sapi);
break;
case S_L_INP_LINE_INIT:
LOGP(DNM, LOGL_DEBUG, "%s() signal: S_L_INP_LINE_INIT\n", __func__);
case S_L_INP_LINE_NOALARM:
LOGP(DNM, LOGL_DEBUG, "%s() signal: S_L_INP_LINE_NOALARM\n", __func__);
if (strcasecmp(isd->line->driver->name, "DAHDI")
&& strcasecmp(isd->line->driver->name, "MISDN_LAPD")
&& strcasecmp(isd->line->driver->name, "UNIXSOCKET"))
@ -151,7 +149,6 @@ static int inp_sig_cb(unsigned int subsys, unsigned int signal,
start_sabm_in_line(isd->line, 1);
break;
case S_L_INP_LINE_ALARM:
LOGP(DNM, LOGL_DEBUG, "%s() signal: S_L_INP_LINE_ALARM\n", __func__);
if (strcasecmp(isd->line->driver->name, "DAHDI")
&& strcasecmp(isd->line->driver->name, "MISDN_LAPD")
&& strcasecmp(isd->line->driver->name, "UNIXSOCKET"))