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/l1_if.c | |
| parent | 6142f9262adf197d60a31ab4636ac0886dc32316 (diff) | |
sysmobts: We can now pass the trx to the callback change the signatures
Diffstat (limited to 'src/osmo-bts-sysmo/l1_if.c')
| -rw-r--r-- | src/osmo-bts-sysmo/l1_if.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c index 9ac1f8df..b20987f0 100644 --- a/src/osmo-bts-sysmo/l1_if.c +++ b/src/osmo-bts-sysmo/l1_if.c @@ -875,7 +875,7 @@ int l1if_handle_l1prim(int wq, struct femtol1_hdl *fl1h, struct msgb *msg) if (wlc->is_sys_prim == 0 && l1p->id == wlc->conf_prim_id) { llist_del(&wlc->list); if (wlc->cb) - rc = wlc->cb(msg, fl1h->priv); + rc = wlc->cb(fl1h->priv, msg); else rc = 0; release_wlc(wlc); @@ -903,7 +903,7 @@ int l1if_handle_sysprim(struct femtol1_hdl *fl1h, struct msgb *msg) if (wlc->is_sys_prim && sysp->id == wlc->conf_prim_id) { llist_del(&wlc->list); if (wlc->cb) - rc = wlc->cb(msg, fl1h->priv); + rc = wlc->cb(fl1h->priv, msg); else rc = 0; release_wlc(wlc); @@ -930,10 +930,9 @@ int sysinfo_has_changed(struct gsm_bts *bts, int si) } #endif -static int activate_rf_compl_cb(struct msgb *resp, void *data) +static int activate_rf_compl_cb(struct gsm_bts_trx *trx, struct msgb *resp) { SuperFemto_Prim_t *sysp = msgb_sysprim(resp); - struct gsm_bts_trx *trx = data; GsmL1_Status_t status; int on = 0; unsigned int i; @@ -1017,11 +1016,10 @@ int l1if_activate_rf(struct femtol1_hdl *hdl, int on) } /* call-back on arrival of DSP+FPGA version + band capability */ -static int info_compl_cb(struct msgb *resp, void *data) +static int info_compl_cb(struct gsm_bts_trx *trx, struct msgb *resp) { SuperFemto_Prim_t *sysp = msgb_sysprim(resp); SuperFemto_SystemInfoCnf_t *sic = &sysp->u.systemInfoCnf; - struct gsm_bts_trx *trx = data; struct femtol1_hdl *fl1h = trx_femtol1_hdl(trx); fl1h->hw_info.dsp_version[0] = sic->dspVersion.major; @@ -1069,9 +1067,8 @@ static int l1if_get_info(struct femtol1_hdl *hdl) return l1if_req_compl(hdl, msg, 1, info_compl_cb); } -static int reset_compl_cb(struct msgb *resp, void *data) +static int reset_compl_cb(struct gsm_bts_trx *trx, struct msgb *resp) { - struct gsm_bts_trx *trx = data; struct femtol1_hdl *fl1h = trx_femtol1_hdl(trx); SuperFemto_Prim_t *sysp = msgb_sysprim(resp); GsmL1_Status_t status = sysp->u.layer1ResetCnf.status; |