[MERGED] osmo-bts[master]: dyn PDCH: sysmo-bts/oml.c: add ts_connect_as(), absorbing ts...

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Harald Welte gerrit-no-reply at lists.osmocom.org
Fri Jun 17 15:50:49 UTC 2016


Harald Welte has submitted this change and it was merged.

Change subject: dyn PDCH: sysmo-bts/oml.c: add ts_connect_as(), absorbing ts_connect() guts
......................................................................


dyn PDCH: sysmo-bts/oml.c: add ts_connect_as(), absorbing ts_connect() guts

For upcoming dyn PDCH switching, I want to be able to set the pchan dynamically
upon ts_connect() and not continue with OPSTART ACK, but with the dyn PDCH.

Thus recoin ts_connect(ts) to ts_connect_as(ts, pchan, cb) and leave
ts_connect() as a thin wrapper to leave init code unchanged.

Change-Id: I09cc794cb424e17411e608c65f2b68e2f2544e07
---
M src/osmo-bts-sysmo/oml.c
1 file changed, 10 insertions(+), 3 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/osmo-bts-sysmo/oml.c b/src/osmo-bts-sysmo/oml.c
index 5d24bcb..ce8d2f4 100644
--- a/src/osmo-bts-sysmo/oml.c
+++ b/src/osmo-bts-sysmo/oml.c
@@ -480,7 +480,9 @@
 	}
 }
 
-static int ts_connect(struct gsm_bts_trx_ts *ts)
+static int ts_connect_as(struct gsm_bts_trx_ts *ts,
+			 enum gsm_phys_chan_config pchan,
+			 l1if_compl_cb *cb, void *data)
 {
 	struct msgb *msg = l1p_msgb_alloc();
 	struct femtol1_hdl *fl1h = trx_femtol1_hdl(ts->trx);
@@ -489,9 +491,14 @@
 	cr = prim_init(msgb_l1prim(msg), GsmL1_PrimId_MphConnectReq, fl1h,
 		       l1p_handle_for_ts(ts));
 	cr->u8Tn = ts->nr;
-	cr->logChComb = pchan_to_logChComb[ts->pchan];
+	cr->logChComb = pchan_to_logChComb[pchan];
 	
-	return l1if_gsm_req_compl(fl1h, msg, opstart_compl_cb, NULL);
+	return l1if_gsm_req_compl(fl1h, msg, cb, NULL);
+}
+
+static int ts_connect(struct gsm_bts_trx_ts *ts)
+{
+	return ts_connect_as(ts, ts->pchan, opstart_compl_cb, NULL);
 }
 
 GsmL1_Sapi_t lchan_to_GsmL1_Sapi_t(const struct gsm_lchan *lchan)

-- 
To view, visit https://gerrit.osmocom.org/295
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I09cc794cb424e17411e608c65f2b68e2f2544e07
Gerrit-PatchSet: 4
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder



More information about the gerrit-log mailing list