[PATCH] osmo-bts[master]: octphy: align frame number for new firmware versions

[dexter]

Review at  https://gerrit.osmocom.org/1965

octphy: align frame number for new firmware versions

Firmware releases OCTSDR-2G-02.07.00-B1314-BETA and newer require
to align the GPRS frame number (fn-3) for ph_data indications.

To preserve compatibility the header version is checked during
compile time and the right method is compiled in.

Change-Id: Ib93d5fb3b34ff92f10021a0e9ce9c8aa3044b7ff
---
M src/osmo-bts-octphy/l1_if.c
1 file changed, 16 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/65/1965/1

diff --git a/src/osmo-bts-octphy/l1_if.c b/src/osmo-bts-octphy/l1_if.c
index 0fc51fc..22c01e9 100644
--- a/src/osmo-bts-octphy/l1_if.c
+++ b/src/osmo-bts-octphy/l1_if.c
@@ -49,6 +49,12 @@
 #include "l1_utils.h"
 
 #include "octpkt.h"
+#include <octphy/octvc1/main/octvc1_main_version.h>
+
+/* NOTE: The octphy GPRS frame number handling changed with
+ * OCTSDR-2G-02.07.00-B1314-BETA. From that version on, each ph_data_ind must
+ * subtract 3 from the frame number before passing the frame to the PCU */
+#define cOCTVC1_MAIN_VERSION_ID_FN_PARADIGM_CHG 0x41c0522
 
 #include <octphy/octpkt/octpkt_hdr.h>
 #define OCTVC1_RC2STRING_DECLARE
@@ -1030,7 +1036,17 @@
 		       PRIM_OP_INDICATION, l1p_msg);
 	l1sap->u.data.link_id = link_id;
 	l1sap->u.data.chan_nr = chan_nr;
+
+#if (cOCTVC1_MAIN_VERSION_ID >= cOCTVC1_MAIN_VERSION_ID_FN_PARADIGM_CHG)
+	if (sapi == cOCTVC1_GSM_SAPI_ENUM_PDTCH) {
+		/* FIXME::PCU is expecting encode frame number*/
+		l1sap->u.data.fn = fn - 3;
+	} else
+		l1sap->u.data.fn = fn;
+#else
 	l1sap->u.data.fn = fn;
+#endif
+
 	l1sap->u.data.rssi = rssi;
 	b_total = data_ind->MeasurementInfo.usBERTotalBitCnt;
 	b_error =data_ind->MeasurementInfo.usBERCnt;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib93d5fb3b34ff92f10021a0e9ce9c8aa3044b7ff
Gerrit-PatchSet: 1
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Owner: dexter <pmaier at sysmocom.de>