commit fe8f4a4c874344759ecc314396dd0ac8c556edc9
author Pau Espin Pedrol <pespin@sysmocom.de> Wed May 31 20:03:41 2023 +0200
committer Pau Espin Pedrol <pespin@sysmocom.de> Fri Jun 02 14:37:05 2023 +0200
tree 966f50e48ab480e2ac2fbf23a87970a777a8e5e8
parent bd461e62b55e96cd69ca0f5cd9f448e44a8efeab

Derive FN from RFN once and cache it in struct rach_ind_params

Change-Id: Iaefb9650dfc5083360a4a24b9c17fdbf3115e51f

src/bts.cpp

diff --git a/src/bts.cpp b/src/bts.cpp
index 8be87be..5160fd5 100644
--- a/src/bts.cpp
+++ b/src/bts.cpp
@@ -531,7 +531,7 @@
 	}
 
 	bts_send_gsmtap_meas(bts, categ, true, rip->trx_nr, rip->ts_nr, channel,
-			 bts_rfn_to_fn(bts, rip->rfn), ra_buf,
+			 rip->fn, ra_buf,
 			 rip->is_11bit ? 2 : 1, &meas);
 }
 
@@ -943,15 +943,13 @@
 	if (rip->is_11bit)
 		bts_do_rate_ctr_inc(bts, CTR_RACH_REQUESTS_11BIT);
 
-	/* Determine full frame number */
-	uint32_t Fn = bts_rfn_to_fn(bts, rip->rfn);
 	uint8_t ta = qta2ta(rip->qta);
 
 	bts_send_gsmtap_rach(bts, PCU_GSMTAP_C_UL_RACH, GSMTAP_CHANNEL_RACH, rip);
 
 	LOGP(DRLCMAC, LOGL_DEBUG, "MS requests Uplink resource on CCCH/RACH: "
 	     "ra=0x%02x (%d bit) Fn=%u qta=%d\n", rip->ra,
-	     rip->is_11bit ? 11 : 8, Fn, rip->qta);
+	     rip->is_11bit ? 11 : 8, rip->fn, rip->qta);
 
 	/* Parse [EGPRS Packet] Channel Request from RACH.ind */
 	rc = parse_rach_ind(rip, &chan_req);

src/bts.h

diff --git a/src/bts.h b/src/bts.h
index 7a67f76..9a18cf3 100644
--- a/src/bts.h
+++ b/src/bts.h
@@ -197,6 +197,7 @@
 	uint8_t trx_nr;
 	uint8_t ts_nr;
 	uint16_t rfn;
+	uint32_t fn;
 	int16_t qta;
 };
 

src/pcu_l1_if.cpp

diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp
index cda7af7..e675d86 100644
--- a/src/pcu_l1_if.cpp
+++ b/src/pcu_l1_if.cpp
@@ -631,6 +631,7 @@
 		.trx_nr = trx_nr,
 		.ts_nr = ts_nr,
 		.rfn = fn2rfn(fn),
+		.fn = fn,
 		.qta = qta,
 	};
 
@@ -670,6 +671,7 @@
 		.trx_nr = rach_ind->trx_nr,
 		.ts_nr = rach_ind->ts_nr,
 		.rfn = rfn,
+		.fn = bts_rfn_to_fn(bts, rfn),
 		.qta = rach_ind->qta,
 	};
 

tests/tbf/TbfTest.cpp

diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp
index ae8b56f..bb36f9e 100644
--- a/tests/tbf/TbfTest.cpp
+++ b/tests/tbf/TbfTest.cpp
@@ -81,6 +81,7 @@
 		.trx_nr = 0,
 		.ts_nr = 0,
 		.rfn = fn2rfn(Fn),
+		.fn = Fn,
 		.qta = qta,
 	};