Change in osmo-pcu[master]: find_multi_slots: Avoid multiple calls to mslot_class_get_type()

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22997 )

Change subject: find_multi_slots: Avoid multiple calls to mslot_class_get_type()
......................................................................

find_multi_slots: Avoid multiple calls to mslot_class_get_type()

Change-Id: I9cda52befe32a7727ab479bc151d10106fb94688
---
M src/gprs_rlcmac_ts_alloc.cpp
1 file changed, 4 insertions(+), 3 deletions(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved



diff --git a/src/gprs_rlcmac_ts_alloc.cpp b/src/gprs_rlcmac_ts_alloc.cpp
index cb054cd..5f0bcc5 100644
--- a/src/gprs_rlcmac_ts_alloc.cpp
+++ b/src/gprs_rlcmac_ts_alloc.cpp
@@ -518,7 +518,8 @@
 {
 	const uint8_t Rx = mslot_class_get_rx(mslot_class),   /* Max number of Rx slots */
 		      Tx = mslot_class_get_tx(mslot_class),   /* Max number of Tx slots */
-		      Sum = mslot_class_get_sum(mslot_class); /* Max number of Tx + Rx slots */
+		      Sum = mslot_class_get_sum(mslot_class), /* Max number of Tx + Rx slots */
+		      Type = mslot_class_get_type(mslot_class);
 	uint8_t max_slots, num_rx, num_tx, mask_sel, pdch_slots, ul_ts, dl_ts;
 	int16_t rx_window, tx_window;
 	char slot_info[9] = {0};
@@ -574,7 +575,7 @@
 			/* for multislot type 1: don't split the window to wrap around.
 			 * E.g. 'UU-----U' is invalid for a 4 TN window. Except 8 TN window.
 			 * See 45.002 B.1 */
-			if (mslot_class_get_type(mslot_class) == 1 && num_tx < 8 &&
+			if (Type == 1 && num_tx < 8 &&
 					tx_valid_win & (1 << 0) && tx_valid_win & (1 << 7))
 				continue;
 
@@ -602,7 +603,7 @@
 				/* for multislot type 1: don't split the window to wrap around.
 				 * E.g. 'DD-----D' is invalid for a 4 TN window. Except 8 TN window.
 				 * See 45.002 B.1 */
-				if (mslot_class_get_type(mslot_class) == 1 && num_rx < 8 &&
+				if (Type == 1 && num_rx < 8 &&
 						(rx_valid_win & (1 << 0)) && (rx_valid_win & (1 << 7)))
 					continue;
 

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22997
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I9cda52befe32a7727ab479bc151d10106fb94688
Gerrit-Change-Number: 22997
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210220/90d33ccb/attachment.htm>