sysmobts: Remove the trx parameter from the signature
l1if_gsm_req_compl everyone is passing the trx as data pointer right now, remove it from the request procedure right now as it can be deducted from the femtol1_hdl.
This commit is contained in:
parent
64c5e3a19c
commit
6142f9262a
|
@ -217,7 +217,7 @@ static int calib_file_send(struct femtol1_hdl *fl1h,
|
|||
return rc;
|
||||
}
|
||||
|
||||
return l1if_req_compl(fl1h, msg, 1, calib_send_compl_cb, fl1h->priv);
|
||||
return l1if_req_compl(fl1h, msg, 1, calib_send_compl_cb);
|
||||
}
|
||||
|
||||
/* completion callback after every SetCalibTbl is confirmed */
|
||||
|
|
|
@ -183,7 +183,7 @@ static void l1if_req_timeout(void *data)
|
|||
|
||||
/* send a request primitive to the L1 and schedule completion call-back */
|
||||
int l1if_req_compl(struct femtol1_hdl *fl1h, struct msgb *msg,
|
||||
int is_system_prim, l1if_compl_cb *cb, void *data)
|
||||
int is_system_prim, l1if_compl_cb *cb)
|
||||
{
|
||||
struct wait_l1_conf *wlc;
|
||||
struct osmo_wqueue *wqueue;
|
||||
|
@ -192,7 +192,7 @@ int l1if_req_compl(struct femtol1_hdl *fl1h, struct msgb *msg,
|
|||
/* allocate new wsc and store reference to mutex and conf_id */
|
||||
wlc = talloc_zero(fl1h, struct wait_l1_conf);
|
||||
wlc->cb = cb;
|
||||
wlc->cb_data = data;
|
||||
wlc->cb_data = NULL;
|
||||
|
||||
/* Make sure we actually have received a REQUEST type primitive */
|
||||
if (is_system_prim == 0) {
|
||||
|
@ -244,7 +244,7 @@ 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)
|
||||
{
|
||||
return l1if_req_compl(fl1h, msg, 0, cb, fl1h->priv);
|
||||
return l1if_req_compl(fl1h, msg, 0, cb);
|
||||
}
|
||||
|
||||
/* allocate a msgb containing a GsmL1_Prim_t */
|
||||
|
@ -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, wlc->cb_data);
|
||||
rc = wlc->cb(msg, fl1h->priv);
|
||||
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, wlc->cb_data);
|
||||
rc = wlc->cb(msg, fl1h->priv);
|
||||
else
|
||||
rc = 0;
|
||||
release_wlc(wlc);
|
||||
|
@ -1013,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->priv);
|
||||
return l1if_req_compl(hdl, msg, 1, activate_rf_compl_cb);
|
||||
}
|
||||
|
||||
/* call-back on arrival of DSP+FPGA version + band capability */
|
||||
|
@ -1066,7 +1066,7 @@ 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->priv);
|
||||
return l1if_req_compl(hdl, msg, 1, info_compl_cb);
|
||||
}
|
||||
|
||||
static int reset_compl_cb(struct msgb *resp, void *data)
|
||||
|
@ -1115,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->priv);
|
||||
return l1if_req_compl(hdl, msg, 1, reset_compl_cb);
|
||||
}
|
||||
|
||||
/* set the trace flags within the DSP */
|
||||
|
|
|
@ -69,7 +69,7 @@ typedef int l1if_compl_cb(struct msgb *l1_msg, void *data);
|
|||
|
||||
/* send a request primitive to the L1 and schedule completion call-back */
|
||||
int l1if_req_compl(struct femtol1_hdl *fl1h, struct msgb *msg,
|
||||
int is_system_prim, l1if_compl_cb *cb, void *data);
|
||||
int is_system_prim, l1if_compl_cb *cb);
|
||||
int l1if_gsm_req_compl(struct femtol1_hdl *fl1h, struct msgb *msg,
|
||||
l1if_compl_cb *cb);
|
||||
|
||||
|
|
Loading…
Reference in New Issue