diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2013-01-21 12:39:24 +0100 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2013-02-27 09:07:17 +0100 |
| commit | b6942ffeb9c5b742ca111a8c2b49a98e102da2fe (patch) | |
| tree | 7f7eb907dad759d640d6f42a1efd8d32c0d65323 /src | |
| parent | ff4f789249e9c26f268abd2e47f39627f4bbdd9d (diff) | |
sysmobts: Use the hdl->priv in l1if_req_compl for all callers
Diffstat (limited to 'src')
| -rw-r--r-- | src/osmo-bts-sysmo/l1_if.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c index 3e8ee6eb..93e80eb0 100644 --- a/src/osmo-bts-sysmo/l1_if.c +++ b/src/osmo-bts-sysmo/l1_if.c @@ -933,8 +933,7 @@ int sysinfo_has_changed(struct gsm_bts *bts, int si) static int activate_rf_compl_cb(struct msgb *resp, void *data) { SuperFemto_Prim_t *sysp = msgb_sysprim(resp); - struct femtol1_hdl *fl1h = data; - struct gsm_bts_trx *trx = fl1h->priv; + struct gsm_bts_trx *trx = data; GsmL1_Status_t status; int on = 0; unsigned int i; @@ -1014,7 +1013,7 @@ int l1if_activate_rf(struct femtol1_hdl *hdl, int on) sysp->id = SuperFemto_PrimId_DeactivateRfReq; } - return l1if_req_compl(hdl, msg, 1, activate_rf_compl_cb, hdl); + return l1if_req_compl(hdl, msg, 1, activate_rf_compl_cb, hdl->priv); } /* call-back on arrival of DSP+FPGA version + band capability */ @@ -1022,8 +1021,8 @@ static int info_compl_cb(struct msgb *resp, void *data) { SuperFemto_Prim_t *sysp = msgb_sysprim(resp); SuperFemto_SystemInfoCnf_t *sic = &sysp->u.systemInfoCnf; - struct femtol1_hdl *fl1h = data; - struct gsm_bts_trx *trx = fl1h->priv; + struct gsm_bts_trx *trx = data; + struct femtol1_hdl *fl1h = trx_femtol1_hdl(trx); fl1h->hw_info.dsp_version[0] = sic->dspVersion.major; fl1h->hw_info.dsp_version[1] = sic->dspVersion.minor; @@ -1067,13 +1066,13 @@ static int l1if_get_info(struct femtol1_hdl *hdl) sysp->id = SuperFemto_PrimId_SystemInfoReq; - return l1if_req_compl(hdl, msg, 1, info_compl_cb, hdl); + return l1if_req_compl(hdl, msg, 1, info_compl_cb, hdl->priv); } static int reset_compl_cb(struct msgb *resp, void *data) { - struct femtol1_hdl *fl1h = data; - struct gsm_bts_trx *trx = fl1h->priv; + 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; @@ -1116,7 +1115,7 @@ int l1if_reset(struct femtol1_hdl *hdl) SuperFemto_Prim_t *sysp = msgb_sysprim(msg); sysp->id = SuperFemto_PrimId_Layer1ResetReq; - return l1if_req_compl(hdl, msg, 1, reset_compl_cb, hdl); + return l1if_req_compl(hdl, msg, 1, reset_compl_cb, hdl->priv); } /* set the trace flags within the DSP */ |