summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorVadim Yanitskiy <axilirator@gmail.com>2019-01-17 16:57:41 +0700
committerVadim Yanitskiy <axilirator@gmail.com>2019-05-09 22:01:28 +0700
commit2d94a4b71c27f266b952e8c4a0d2efd70e08c534 (patch)
tree6104c807b94bf60325511ca05120df806a3a89c9 /src
parentcb9e020471cc327535637e97b49fe861b85819ec (diff)
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
Diffstat (limited to 'src')
-rw-r--r--src/host/trxcon/l1ctl.c6
-rw-r--r--src/host/trxcon/l1ctl.h3
-rw-r--r--src/host/trxcon/sched_lchan_rach.c2
3 files changed, 6 insertions, 5 deletions
diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c
index 653ddf34..9cd5fe61 100644
--- a/src/host/trxcon/l1ctl.c
+++ b/src/host/trxcon/l1ctl.c
@@ -233,7 +233,8 @@ int l1ctl_tx_dt_ind(struct l1ctl_link *l1l, struct l1ctl_info_dl *data,
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 @@ int l1ctl_tx_rach_conf(struct l1ctl_link *l1l, uint32_t fn)
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 ca8c0be6..48bbe097 100644
--- a/src/host/trxcon/l1ctl.h
+++ b/src/host/trxcon/l1ctl.h
@@ -22,4 +22,5 @@ int l1ctl_tx_dt_ind(struct l1ctl_link *l1l, struct l1ctl_info_dl *data,
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 58e86ae1..565d6932 100644
--- a/src/host/trxcon/sched_lchan_rach.c
+++ b/src/host/trxcon/sched_lchan_rach.c
@@ -175,7 +175,7 @@ int tx_rach_fn(struct trx_instance *trx, struct trx_ts *ts,
}
/* 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);