osmocom
/
libosmo-abis
mirror of https://gerrit.osmocom.org/libosmo-abis
14
0
Fork 0
Code Issues Releases Wiki Activity

src: replace S_INP_* signals by S_L_INP_* according to naming policy

This commit is contained in:
Pablo Neira Ayuso 2011-08-16 17:26:23 +02:00
parent 95e5decb79
commit de668910d6
6 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/osmocom/abis/e1_input.h
View File

@ -157,13 +157,13 @@ struct e1inp_line {
/* SS_L_INPUT signals */
enum signal_input {
S_INP_NONE,
S_INP_TEI_UP,
S_INP_TEI_DN,
S_INP_TEI_UNKNOWN,
S_INP_LINE_INIT,
S_INP_LINE_ALARM,
S_INP_LINE_NOALARM,
S_L_INP_NONE,
S_L_INP_TEI_UP,
S_L_INP_TEI_DN,
S_L_INP_TEI_UNKNOWN,
S_L_INP_LINE_INIT,
S_L_INP_LINE_ALARM,
S_L_INP_LINE_NOALARM,
};
/* register a driver with the E1 core */

2
src/e1_input.c
View File

@ -619,7 +619,7 @@ int e1inp_line_update(struct e1inp_line *line)
* configured */
memset(&isd, 0, sizeof(isd));
isd.line = line;
osmo_signal_dispatch(SS_L_INPUT, S_INP_LINE_INIT, &isd);
osmo_signal_dispatch(SS_L_INPUT, S_L_INP_LINE_INIT, &isd);
return rc;
}

10
src/input/dahdi.c
View File

@ -78,12 +78,12 @@ static void handle_dahdi_exception(struct e1inp_ts *ts)
switch (evt) {
case DAHDI_EVENT_ALARM:
/* we should notify the code that the line is gone */
osmo_signal_dispatch(SS_L_INPUT, S_INP_LINE_ALARM, &isd);
osmo_signal_dispatch(SS_L_INPUT, S_L_INP_LINE_ALARM, &isd);
rate_ctr_inc(&line->rate_ctr->ctr[E1I_CTR_ALARM]);
break;
case DAHDI_EVENT_NOALARM:
/* alarm has gone, we should re-start the SABM requests */
osmo_signal_dispatch(SS_L_INPUT, S_INP_LINE_NOALARM, &isd);
osmo_signal_dispatch(SS_L_INPUT, S_L_INP_LINE_NOALARM, &isd);
break;
case DAHDI_EVENT_ABORT:
rate_ctr_inc(&line->rate_ctr->ctr[E1I_CTR_HDLC_ABORT]);
@ -139,7 +139,7 @@ static int handle_ts1_read(struct osmo_fd *bfd)
* notify the driver to see if it can do anything to
* recover the existing signalling links with the BTS.
*/
e1inp_event(e1i_ts, S_INP_TEI_UNKNOWN, tei, sapi);
e1inp_event(e1i_ts, S_L_INP_TEI_UNKNOWN, tei, sapi);
return -EIO;
}
if (prim == 0)
@ -155,11 +155,11 @@ static int handle_ts1_read(struct osmo_fd *bfd)
break;
case LAPD_MPH_ACTIVATE_IND:
DEBUGP(DLMI, "MPH_ACTIVATE_IND: sapi(%d) tei(%d)\n", sapi, tei);
ret = e1inp_event(e1i_ts, S_INP_TEI_UP, tei, sapi);
ret = e1inp_event(e1i_ts, S_L_INP_TEI_UP, tei, sapi);
break;
case LAPD_MPH_DEACTIVATE_IND:
DEBUGP(DLMI, "MPH_DEACTIVATE_IND: sapi(%d) tei(%d)\n", sapi, tei);
ret = e1inp_event(e1i_ts, S_INP_TEI_DN, tei, sapi);
ret = e1inp_event(e1i_ts, S_L_INP_TEI_DN, tei, sapi);
break;
case LAPD_DL_DATA_IND:
case LAPD_DL_UNITDATA_IND:

2
src/input/hsl.c
View File

@ -311,7 +311,7 @@ static void hsl_close(struct e1inp_sign_link *sign_link)
{
struct e1inp_ts *ts = sign_link->ts;
struct osmo_fd *bfd = &ts->driver.ipaccess.fd;
e1inp_event(ts, S_INP_TEI_DN, sign_link->tei, sign_link->sapi);
e1inp_event(ts, S_L_INP_TEI_DN, sign_link->tei, sign_link->sapi);
/* the first e1inp_sign_link_destroy call closes the socket. */
if (bfd->fd != -1) {
osmo_fd_unregister(bfd);

2
src/input/ipaccess.c
View File

@ -465,7 +465,7 @@ static void ipaccess_close(struct e1inp_sign_link *sign_link)
{
struct e1inp_ts *e1i_ts = sign_link->ts;
struct osmo_fd *bfd = &e1i_ts->driver.ipaccess.fd;
e1inp_event(e1i_ts, S_INP_TEI_DN, sign_link->tei, sign_link->sapi);
e1inp_event(e1i_ts, S_L_INP_TEI_DN, sign_link->tei, sign_link->sapi);
osmo_fd_unregister(bfd);
close(bfd->fd);
bfd->fd = -1;

4
src/input/misdn.c
View File

@ -149,12 +149,12 @@ static int handle_ts1_read(struct osmo_fd *bfd)
}
/* save the channel number in the driver private struct */
link->driver.misdn.channel = l2addr.channel;
ret = e1inp_event(e1i_ts, S_INP_TEI_UP, l2addr.tei, l2addr.sapi);
ret = e1inp_event(e1i_ts, S_L_INP_TEI_UP, l2addr.tei, l2addr.sapi);
break;
case DL_RELEASE_IND:
DEBUGP(DLMI, "DL_RELEASE_IND: channel(%d) sapi(%d) tei(%d)\n",
l2addr.channel, l2addr.sapi, l2addr.tei);
ret = e1inp_event(e1i_ts, S_INP_TEI_DN, l2addr.tei, l2addr.sapi);
ret = e1inp_event(e1i_ts, S_L_INP_TEI_DN, l2addr.tei, l2addr.sapi);
break;
case DL_DATA_IND:
case DL_UNITDATA_IND: