diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2013-01-22 07:37:41 +0100 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2013-02-27 09:07:18 +0100 |
| commit | 654fe73b78993c6e421162c8a7b41f009d7d2e40 (patch) | |
| tree | 217ad0ac4b499c06702ed35a04dab86960623830 /src/osmo-bts-sysmo/oml.c | |
| parent | 6142f9262adf197d60a31ab4636ac0886dc32316 (diff) | |
sysmobts: We can now pass the trx to the callback change the signatures
Diffstat (limited to 'src/osmo-bts-sysmo/oml.c')
| -rw-r--r-- | src/osmo-bts-sysmo/oml.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/osmo-bts-sysmo/oml.c b/src/osmo-bts-sysmo/oml.c index 6d4f3627..bf4fe158 100644 --- a/src/osmo-bts-sysmo/oml.c +++ b/src/osmo-bts-sysmo/oml.c @@ -207,9 +207,8 @@ static int opstart_compl(struct gsm_abis_mo *mo, struct msgb *l1_msg) return oml_mo_opstart_ack(mo); } -static int opstart_compl_cb(struct msgb *l1_msg, void *data) +static int opstart_compl_cb(struct gsm_bts_trx *trx, struct msgb *l1_msg) { - struct gsm_bts_trx *trx = data; struct gsm_abis_mo *mo; GsmL1_Prim_t *l1p = msgb_l1prim(l1_msg); GsmL1_MphConnectCnf_t *cnf = &l1p->u.mphConnectCnf; @@ -218,9 +217,8 @@ static int opstart_compl_cb(struct msgb *l1_msg, void *data) return opstart_compl(mo, l1_msg); } -static int trx_init_compl_cb(struct msgb *l1_msg, void *data) +static int trx_init_compl_cb(struct gsm_bts_trx *trx, struct msgb *l1_msg) { - struct gsm_bts_trx *trx = data; struct femtol1_hdl *fl1h = trx_femtol1_hdl(trx); GsmL1_Prim_t *l1p = msgb_l1prim(l1_msg); @@ -306,7 +304,7 @@ uint32_t trx_get_hlayer1(struct gsm_bts_trx *trx) return fl1h->hLayer1; } -static int trx_close_compl_cb(struct msgb *l1_msg, void *data) +static int trx_close_compl_cb(struct gsm_bts_trx *trx, struct msgb *l1_msg) { msgb_free(l1_msg); return 0; @@ -454,10 +452,9 @@ static const struct lchan_sapis sapis_for_lchan[_GSM_LCHAN_MAX] = { }, }; -static int lchan_act_compl_cb(struct msgb *l1_msg, void *data) +static int lchan_act_compl_cb(struct gsm_bts_trx *trx, struct msgb *l1_msg) { struct gsm_time *time; - struct gsm_bts_trx *trx = data; struct gsm_lchan *lchan; GsmL1_Prim_t *l1p = msgb_l1prim(l1_msg); GsmL1_MphActivateCnf_t *ic = &l1p->u.mphActivateCnf; @@ -787,9 +784,8 @@ static void dump_lch_par(int logl, GsmL1_LogChParam_t *lch_par, GsmL1_Sapi_t sap LOGPC(DL1C, logl, ")\n"); } -static int chmod_modif_compl_cb(struct msgb *l1_msg, void *data) +static int chmod_modif_compl_cb(struct gsm_bts_trx *trx, struct msgb *l1_msg) { - struct gsm_bts_trx *trx = data; struct gsm_lchan *lchan; GsmL1_Prim_t *l1p = msgb_l1prim(l1_msg); GsmL1_MphConfigCnf_t *cc = &l1p->u.mphConfigCnf; @@ -950,9 +946,8 @@ int bts_model_rsl_mode_modify(struct gsm_lchan *lchan) return 0; } -static int lchan_deact_compl_cb(struct msgb *l1_msg, void *data) +static int lchan_deact_compl_cb(struct gsm_bts_trx *trx, struct msgb *l1_msg) { - struct gsm_bts_trx *trx = data; struct gsm_lchan *lchan; GsmL1_Prim_t *l1p = msgb_l1prim(l1_msg); GsmL1_MphDeactivateCnf_t *ic = &l1p->u.mphDeactivateCnf; |