Change in osmocom-bb[master]: trxcon/l1ctl.c: pass band_arfcn to l1ctl_tx_rach_conf()

[Vadim Yanitskiy]

Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12613 )

Change subject: trxcon/l1ctl.c: pass band_arfcn to l1ctl_tx_rach_conf()
......................................................................

trxcon/l1ctl.c: pass band_arfcn to l1ctl_tx_rach_conf()

This would allow to abstract both L1CTL and TRX interfaces
from each other in the upcoming refactoring.

Change-Id: I74a23c73b03bad822272b9cfe76c2501666912b7
---
M src/host/trxcon/l1ctl.c
M src/host/trxcon/l1ctl.h
M src/host/trxcon/sched_lchan_rach.c
3 files changed, 6 insertions(+), 5 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Vadim Yanitskiy: Looks good to me, approved



diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c
index 653ddf3..9cd5fe6 100644
--- a/src/host/trxcon/l1ctl.c
+++ b/src/host/trxcon/l1ctl.c
@@ -233,7 +233,8 @@
 	return l1ctl_link_send(l1l, msg);
 }
 
-int l1ctl_tx_rach_conf(struct l1ctl_link *l1l, uint32_t fn)
+int l1ctl_tx_rach_conf(struct l1ctl_link *l1l,
+	uint16_t band_arfcn, uint32_t fn)
 {
 	struct l1ctl_info_dl *dl;
 	struct msgb *msg;
@@ -243,8 +244,7 @@
 		return -ENOMEM;
 
 	dl = put_dl_info_hdr(msg, NULL);
-
-	dl->band_arfcn = htons(l1l->trx->band_arfcn);
+	dl->band_arfcn = htons(band_arfcn);
 	dl->frame_nr = htonl(fn);
 
 	return l1ctl_link_send(l1l, msg);
diff --git a/src/host/trxcon/l1ctl.h b/src/host/trxcon/l1ctl.h
index ca8c0be..48bbe09 100644
--- a/src/host/trxcon/l1ctl.h
+++ b/src/host/trxcon/l1ctl.h
@@ -22,4 +22,5 @@
 	uint8_t *l2, size_t l2_len, bool traffic);
 int l1ctl_tx_dt_conf(struct l1ctl_link *l1l,
 	struct l1ctl_info_dl *data, bool traffic);
-int l1ctl_tx_rach_conf(struct l1ctl_link *l1l, uint32_t fn);
+int l1ctl_tx_rach_conf(struct l1ctl_link *l1l,
+	uint16_t band_arfcn, uint32_t fn);
diff --git a/src/host/trxcon/sched_lchan_rach.c b/src/host/trxcon/sched_lchan_rach.c
index 58e86ae..565d693 100644
--- a/src/host/trxcon/sched_lchan_rach.c
+++ b/src/host/trxcon/sched_lchan_rach.c
@@ -175,7 +175,7 @@
 	}
 
 	/* Confirm RACH request */
-	l1ctl_tx_rach_conf(trx->l1l, fn);
+	l1ctl_tx_rach_conf(trx->l1l, trx->band_arfcn, fn);
 
 	/* Forget processed primitive */
 	sched_prim_drop(lchan);

-- 
To view, visit https://gerrit.osmocom.org/12613
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I74a23c73b03bad822272b9cfe76c2501666912b7
Gerrit-Change-Number: 12613
Gerrit-PatchSet: 3
Gerrit-Owner: Vadim Yanitskiy <axilirator at gmail.com>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Vadim Yanitskiy <axilirator at gmail.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190509/c7f8fdd6/attachment.html>