aboutsummaryrefslogtreecommitdiffstats
path: root/openbsc/src/ipaccess
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@gnumonks.org>2011-08-17 22:43:54 +0200
committerHarald Welte <laforge@gnumonks.org>2011-08-19 22:38:33 +0200
commit7abecfcfc9ef94c1367cd88ac858b79d20f75db0 (patch)
treeb9df6f561a169ec9ca174217ac6b0a7eafda0686 /openbsc/src/ipaccess
parentc45a8045a645d64782ab2afbce79732d3f9d12a1 (diff)
src: use new msg->dst pointer instead of deprecated msg->trx
This patch modifies openBSC code to use msg->dst which stores the pointer to the signalling link structure instead of the pointer to the transceiver structure. This patch prepares the introduction of libosmo-abis.
Diffstat (limited to 'openbsc/src/ipaccess')
-rw-r--r--openbsc/src/ipaccess/network_listen.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/openbsc/src/ipaccess/network_listen.c b/openbsc/src/ipaccess/network_listen.c
index a719903dd..71b49eaaf 100644
--- a/openbsc/src/ipaccess/network_listen.c
+++ b/openbsc/src/ipaccess/network_listen.c
@@ -37,6 +37,7 @@
#include <openbsc/abis_nm.h>
#include <openbsc/signal.h>
#include <openbsc/debug.h>
+#include <openbsc/e1_input.h>
#define WHITELIST_MAX_SIZE ((NUM_ARFCNS*2)+2+1)
@@ -129,6 +130,7 @@ static int test_rep(void *_msg)
uint16_t test_rep_len, ferr_list_len;
struct ipacc_ferr_elem *ife;
struct ipac_bcch_info binfo;
+ struct e1inp_sign_link *sign_link = (struct e1inp_sign_link *)msg->dst;
int i, rc;
DEBUGP(DNM, "TEST REPORT: ");
@@ -168,7 +170,7 @@ static int test_rep(void *_msg)
uint16_t arfcn = cu & 0x3ff;
uint8_t rxlev = cu >> 10;
DEBUGP(DNM, "==> ARFCN %4u, RxLev %2u\n", arfcn, rxlev);
- rxlev_stat_input(&msg->trx->ipaccess.rxlev_stat,
+ rxlev_stat_input(&sign_link->trx->ipaccess.rxlev_stat,
arfcn, rxlev);
}
break;
@@ -219,13 +221,14 @@ static int test_rep(void *_msg)
case NM_IPACC_TESTRES_STOPPED:
case NM_IPACC_TESTRES_TIMEOUT:
case NM_IPACC_TESTRES_NO_CHANS:
- msg->trx->ipaccess.test_state = IPAC_TEST_S_IDLE;
+ sign_link->trx->ipaccess.test_state = IPAC_TEST_S_IDLE;
/* Send signal to notify higher layers of test completion */
DEBUGP(DNM, "dispatching S_IPAC_NWL_COMPLETE signal\n");
- osmo_signal_dispatch(SS_IPAC_NWL, S_IPAC_NWL_COMPLETE, msg->trx);
+ osmo_signal_dispatch(SS_IPAC_NWL, S_IPAC_NWL_COMPLETE,
+ sign_link->trx);
break;
case NM_IPACC_TESTRES_PARTIAL:
- msg->trx->ipaccess.test_state = IPAC_TEST_S_PARTIAL;
+ sign_link->trx->ipaccess.test_state = IPAC_TEST_S_PARTIAL;
break;
}