Change in osmo-bts[master]: osmo-bts-trx: cosmetic: get rid of TRX_CHDR_LEN macro

laforge gerrit-no-reply at lists.osmocom.org
Sat Apr 24 08:47:04 UTC 2021


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

Change subject: osmo-bts-trx: cosmetic: get rid of TRX_CHDR_LEN macro
......................................................................

osmo-bts-trx: cosmetic: get rid of TRX_CHDR_LEN macro

The 'CHDR' stands for 'Common Header', but this does not apply to
TRXDv2 because TDMA frame number may not be present in the batched
PDUs.  Let's avoid potential confusion by removing it.

Change-Id: I80495df474c432f4c0a4cfa6f917821d7b35859a
---
M src/osmo-bts-trx/trx_if.c
1 file changed, 3 insertions(+), 5 deletions(-)

Approvals:
  laforge: Looks good to me, but someone else must approve
  pespin: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c
index 5d18c2c..0beb941 100644
--- a/src/osmo-bts-trx/trx_if.c
+++ b/src/osmo-bts-trx/trx_if.c
@@ -718,11 +718,9 @@
  * TRX burst data socket
  */
 
-/* Common header length: 1/2 VER + 1/2 TDMA TN + 4 TDMA FN */
-#define TRX_CHDR_LEN		(1 + 4)
-/* Uplink v0 header length: 1 RSSI + 2 ToA256 */
-#define TRX_UL_V0HDR_LEN	(TRX_CHDR_LEN + 1 + 2)
-/* Uplink v1 header length: + 1 MTS + 2 C/I */
+/* Uplink TRXDv0 header length: TDMA TN + FN + RSSI + ToA256 */
+#define TRX_UL_V0HDR_LEN	(1 + 4 + 1 + 2)
+/* Uplink TRXDv1 header length: additional MTS + C/I */
 #define TRX_UL_V1HDR_LEN	(TRX_UL_V0HDR_LEN + 1 + 2)
 
 /* TRXD header dissector for version 0 */

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

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I80495df474c432f4c0a4cfa6f917821d7b35859a
Gerrit-Change-Number: 23831
Gerrit-PatchSet: 5
Gerrit-Owner: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210424/f3e99899/attachment.htm>


More information about the gerrit-log mailing list