aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@gnumonks.org>2011-08-16 17:26:23 +0200
committerPablo Neira Ayuso <pablo@gnumonks.org>2011-08-16 17:26:23 +0200
commitde668910d63be49661bea974c3bee61128b7f1a0 (patch)
tree2674859a45d87c930bc195d885ef886784871564
parent95e5decb7991d8934272ae9d941d575515362291 (diff)
src: replace S_INP_* signals by S_L_INP_* according to naming policy
-rw-r--r--include/osmocom/abis/e1_input.h14
-rw-r--r--src/e1_input.c2
-rw-r--r--src/input/dahdi.c10
-rw-r--r--src/input/hsl.c2
-rw-r--r--src/input/ipaccess.c2
-rw-r--r--src/input/misdn.c4
6 files changed, 17 insertions, 17 deletions
diff --git a/include/osmocom/abis/e1_input.h b/include/osmocom/abis/e1_input.h
index 8fac79a..8d2f7bc 100644
--- a/include/osmocom/abis/e1_input.h
+++ b/include/osmocom/abis/e1_input.h
@@ -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 */
diff --git a/src/e1_input.c b/src/e1_input.c
index d49d3b4..3253fd4 100644
--- a/src/e1_input.c
+++ b/src/e1_input.c
@@ -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;
}
diff --git a/src/input/dahdi.c b/src/input/dahdi.c
index c7ce6d2..1b366e1 100644
--- a/src/input/dahdi.c
+++ b/src/input/dahdi.c
@@ -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:
diff --git a/src/input/hsl.c b/src/input/hsl.c
index 98fd40f..7579290 100644
--- a/src/input/hsl.c
+++ b/src/input/hsl.c
@@ -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);
diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c
index 07c8607..ef96bc4 100644
--- a/src/input/ipaccess.c
+++ b/src/input/ipaccess.c
@@ -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;
diff --git a/src/input/misdn.c b/src/input/misdn.c
index dc8d10f..7adcaa6 100644
--- a/src/input/misdn.c
+++ b/src/input/misdn.c
@@ -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: