diff options
author | Holger Hans Peter Freyther <zecke@selfish.org> | 2013-01-21 12:27:15 +0100 |
---|---|---|
committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2013-02-27 09:07:17 +0100 |
commit | ff4f789249e9c26f268abd2e47f39627f4bbdd9d (patch) | |
tree | edc3b3991bf77e42556cc80e5f809c7d9178466c /src | |
parent | 0890e274b1a1e82907dfa56a4f4bb067d22dca4c (diff) |
sysmobts: Remove the data parameter from the l1if_gsm_req_compl
Pass in the trx argument at the lower level as everyone is using
the fl1h->priv now.
Diffstat (limited to 'src')
-rw-r--r-- | src/osmo-bts-sysmo/l1_if.c | 4 | ||||
-rw-r--r-- | src/osmo-bts-sysmo/l1_if.h | 2 | ||||
-rw-r--r-- | src/osmo-bts-sysmo/oml.c | 18 |
3 files changed, 12 insertions, 12 deletions
diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c index 198ced48..3e8ee6eb 100644 --- a/src/osmo-bts-sysmo/l1_if.c +++ b/src/osmo-bts-sysmo/l1_if.c @@ -242,9 +242,9 @@ int l1if_req_compl(struct femtol1_hdl *fl1h, struct msgb *msg, } int l1if_gsm_req_compl(struct femtol1_hdl *fl1h, struct msgb *msg, - l1if_compl_cb *cb, void *data) + l1if_compl_cb *cb) { - return l1if_req_compl(fl1h, msg, 0, cb, data); + return l1if_req_compl(fl1h, msg, 0, cb, fl1h->priv); } /* allocate a msgb containing a GsmL1_Prim_t */ diff --git a/src/osmo-bts-sysmo/l1_if.h b/src/osmo-bts-sysmo/l1_if.h index 47d58de9..8d015519 100644 --- a/src/osmo-bts-sysmo/l1_if.h +++ b/src/osmo-bts-sysmo/l1_if.h @@ -64,7 +64,7 @@ typedef int l1if_compl_cb(struct msgb *l1_msg, void *data); int l1if_req_compl(struct femtol1_hdl *fl1h, struct msgb *msg, int is_system_prim, l1if_compl_cb *cb, void *data); int l1if_gsm_req_compl(struct femtol1_hdl *fl1h, struct msgb *msg, - l1if_compl_cb *cb, void *data); + l1if_compl_cb *cb); struct femtol1_hdl *l1if_open(void *priv); int l1if_close(struct femtol1_hdl *hdl); diff --git a/src/osmo-bts-sysmo/oml.c b/src/osmo-bts-sysmo/oml.c index 84307335..6d4f3627 100644 --- a/src/osmo-bts-sysmo/oml.c +++ b/src/osmo-bts-sysmo/oml.c @@ -296,7 +296,7 @@ static int trx_init(struct gsm_bts_trx *trx) dev_par->fRxPowerLevel, dev_par->fTxPowerLevel); /* send MPH-INIT-REQ, wait for MPH-INIT-CNF */ - return l1if_gsm_req_compl(fl1h, msg, trx_init_compl_cb, fl1h->priv); + return l1if_gsm_req_compl(fl1h, msg, trx_init_compl_cb); } uint32_t trx_get_hlayer1(struct gsm_bts_trx *trx) @@ -321,7 +321,7 @@ static int trx_close(struct gsm_bts_trx *trx) prim_init(msgb_l1prim(msg), GsmL1_PrimId_MphCloseReq, fl1h); LOGP(DL1C, LOGL_NOTICE, "Close TRX %u\n", trx->nr); - return l1if_gsm_req_compl(fl1h, msg, trx_close_compl_cb, fl1h->priv); + return l1if_gsm_req_compl(fl1h, msg, trx_close_compl_cb); } static int ts_connect(struct gsm_bts_trx_ts *ts) @@ -334,7 +334,7 @@ static int ts_connect(struct gsm_bts_trx_ts *ts) cr->u8Tn = ts->nr; cr->logChComb = pchan_to_logChComb[ts->pchan]; - return l1if_gsm_req_compl(fl1h, msg, opstart_compl_cb, fl1h->priv); + return l1if_gsm_req_compl(fl1h, msg, opstart_compl_cb); } GsmL1_Sapi_t lchan_to_GsmL1_Sapi_t(const struct gsm_lchan *lchan) @@ -716,7 +716,7 @@ static int mph_send_activate_req(struct gsm_lchan *lchan, int sapi, int dir) get_value_string(femtobts_dir_names, act_req->dir)); /* send the primitive for all GsmL1_Sapi_* that match the LCHAN */ - return l1if_gsm_req_compl(fl1h, msg, lchan_act_compl_cb, fl1h->priv); + return l1if_gsm_req_compl(fl1h, msg, lchan_act_compl_cb); } int lchan_activate(struct gsm_lchan *lchan) @@ -878,7 +878,7 @@ static int tx_confreq_logchpar(struct gsm_lchan *lchan, uint8_t direction) &conf_req->cfgParams.setLogChParams.logChParams, conf_req->cfgParams.setLogChParams.sapi); - return l1if_gsm_req_compl(fl1h, msg, chmod_modif_compl_cb, fl1h->priv); + return l1if_gsm_req_compl(fl1h, msg, chmod_modif_compl_cb); } int l1if_set_txpower(struct femtol1_hdl *fl1h, float tx_power) @@ -890,7 +890,7 @@ int l1if_set_txpower(struct femtol1_hdl *fl1h, float tx_power) conf_req->cfgParamId = GsmL1_ConfigParamId_SetTxPowerLevel; conf_req->cfgParams.setTxPowerLevel.fTxPowerLevel = tx_power; - return l1if_gsm_req_compl(fl1h, msg, NULL, NULL); + return l1if_gsm_req_compl(fl1h, msg, NULL); } const enum GsmL1_CipherId_t rsl2l1_ciph[] = { @@ -933,7 +933,7 @@ int l1if_set_ciphering(struct femtol1_hdl *fl1h, memcpy(cfgr->cfgParams.setCipheringParams.u8Kc, lchan->encr.key, lchan->encr.key_len); - return l1if_gsm_req_compl(fl1h, msg, chmod_modif_compl_cb, fl1h->priv); + return l1if_gsm_req_compl(fl1h, msg, chmod_modif_compl_cb); } @@ -1034,7 +1034,7 @@ int lchan_deactivate(struct gsm_lchan *lchan) osmo_timer_del(&fl1h->alive_timer); /* send the primitive for all GsmL1_Sapi_* that match the LCHAN */ - l1if_gsm_req_compl(fl1h, msg, lchan_deact_compl_cb, fl1h->priv); + l1if_gsm_req_compl(fl1h, msg, lchan_deact_compl_cb); } lchan_set_state(lchan, LCHAN_S_REL_REQ); @@ -1063,7 +1063,7 @@ static int lchan_deactivate_sacch(struct gsm_lchan *lchan) get_value_string(femtobts_dir_names, deact_req->dir)); /* send the primitive for all GsmL1_Sapi_* that match the LCHAN */ - return l1if_gsm_req_compl(fl1h, msg, lchan_deact_compl_cb, fl1h->priv); + return l1if_gsm_req_compl(fl1h, msg, lchan_deact_compl_cb); } |