diff options
| author | Harald Welte <laforge@gnumonks.org> | 2016-11-17 18:10:10 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2016-11-17 18:11:20 +0100 |
| commit | 0a1571e462ad6de0a658b90f3693b935c411effe (patch) | |
| tree | 297317eebaba93f8da9a19bcf19a40a467484549 | |
| parent | 7830c0592e259416f6e00b584e6cc775218ce48c (diff) | |
pcu_sock: Don't re-implement core functionality like gsm_bts_trx_num()
Change-Id: I5ea506c8240dac124ccf5522d02ba18e4f0cb90d
| -rw-r--r-- | openbsc/src/libbsc/pcu_sock.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/openbsc/src/libbsc/pcu_sock.c b/openbsc/src/libbsc/pcu_sock.c index 8703d9e9e..0eb9c581e 100644 --- a/openbsc/src/libbsc/pcu_sock.c +++ b/openbsc/src/libbsc/pcu_sock.c @@ -56,18 +56,6 @@ static const char *sapi_string[] = { [PCU_IF_SAPI_PTCCH] = "PTCCH", }; -static struct gsm_bts_trx *trx_by_nr(struct gsm_bts *bts, uint8_t trx_nr) -{ - struct gsm_bts_trx *trx; - - llist_for_each_entry(trx, &bts->trx_list, list) { - if (trx->nr == trx_nr) - return trx; - } - - return NULL; -} - /* Check if BTS has a PCU connection */ static bool pcu_connected(struct gsm_bts *bts) { @@ -230,7 +218,7 @@ static int pcu_tx_info_ind(struct gsm_bts *bts) } for (i = 0; i < 8; i++) { - trx = trx_by_nr(bts, i); + trx = gsm_bts_trx_num(bts, i); if (!trx) break; info_ind->trx[i].pdch_mask = 0; @@ -487,7 +475,7 @@ static int pcu_rx_data_req(struct gsm_bts *bts, uint8_t msg_type, break; case PCU_IF_SAPI_PDTCH: case PCU_IF_SAPI_PTCCH: - trx = trx_by_nr(bts, data_req->trx_nr); + trx = gsm_bts_trx_num(bts, data_req->trx_nr); if (!trx) { LOGP(DPCU, LOGL_ERROR, "Received PCU data request with " "not existing TRX %d\n", data_req->trx_nr); @@ -517,7 +505,7 @@ static int pcu_rx_act_req(struct gsm_bts *bts, struct gsm_pcu_if_act_req *act_re (act_req->activate) ? "Activate" : "Deactivate", act_req->trx_nr, act_req->ts_nr); - trx = trx_by_nr(bts, act_req->trx_nr); + trx = gsm_bts_trx_num(bts, act_req->trx_nr); if (!trx || act_req->ts_nr >= 8) return -EINVAL; @@ -623,7 +611,7 @@ static void pcu_sock_close(struct pcu_sock_state *state) /* release PDCH */ for (i = 0; i < 8; i++) { - trx = trx_by_nr(bts, i); + trx = gsm_bts_trx_num(bts, i); if (!trx) break; for (j = 0; j < 8; j++) { |