commit 48587d5475e16ee02f75a6cfb432a0db5adfa493
author Vadim Yanitskiy <vyanitskiy@sysmocom.de> Sat Aug 22 02:08:25 2020 +0700
committer fixeria <vyanitskiy@sysmocom.de> Mon Aug 24 10:53:08 2020 +0000
tree 36f54ecf0f6dd500909d6ac9ab2338b5abfa8ed4
parent 1d52c1e02e6cb6fdbf2072acbd5cbe1b93623885

gsm_rlcmac: use consistent naming for [Extended] Packet Timing Advance

Change-Id: I6382c81f7569b4c5a68521c04f6b03a34bfc39dd

src/gsm_rlcmac.c

diff --git a/src/gsm_rlcmac.c b/src/gsm_rlcmac.c
index c4ac4b1..06c721e 100644
--- a/src/gsm_rlcmac.c
+++ b/src/gsm_rlcmac.c
@@ -1699,8 +1699,8 @@
 
 static const
 CSN_DESCR_BEGIN(PU_AckNack_GPRS_AdditionsR99_t)
-  M_NEXT_EXIST (PU_AckNack_GPRS_AdditionsR99_t, Exist_PacketExtendedTimingAdvance, 1),
-  M_UINT       (PU_AckNack_GPRS_AdditionsR99_t,  PacketExtendedTimingAdvance,  2),
+  M_NEXT_EXIST (PU_AckNack_GPRS_AdditionsR99_t, Exist_Packet_Extended_Timing_Advance, 1),
+  M_UINT       (PU_AckNack_GPRS_AdditionsR99_t,  Packet_Extended_Timing_Advance,  2),
 
   M_UINT       (PU_AckNack_GPRS_AdditionsR99_t,  TBF_EST,  1),
 CSN_DESCR_END  (PU_AckNack_GPRS_AdditionsR99_t)
@@ -2092,7 +2092,7 @@
   M_NEXT_EXIST  (PUA_EGPRS_00_t, Exist_BEP_PERIOD2, 1),
   M_UINT        (PUA_EGPRS_00_t,  BEP_PERIOD2,  4),
 
-  M_TYPE        (PUA_EGPRS_00_t, PacketTimingAdvance, Packet_Timing_Advance_t),
+  M_TYPE        (PUA_EGPRS_00_t, Packet_Timing_Advance, Packet_Timing_Advance_t),
 
   M_NEXT_EXIST  (PUA_EGPRS_00_t, Exist_Packet_Extended_Timing_Advance, 1),
   M_UINT        (PUA_EGPRS_00_t,  Packet_Extended_Timing_Advance,  2),
@@ -4549,9 +4549,9 @@
 
 static const
 CSN_DESCR_BEGIN(PHO_TimingAdvance_t)
-  M_TYPE       (PHO_TimingAdvance_t, GlobalPacketTimingAdvance, Global_Packet_Timing_Advance_t),
-  M_NEXT_EXIST (PHO_TimingAdvance_t, Exist_PacketExtendedTimingAdvance, 1),
-  M_UINT       (PHO_TimingAdvance_t,  PacketExtendedTimingAdvance,  2),
+  M_TYPE       (PHO_TimingAdvance_t, GlobalPacket_Timing_Advance, Global_Packet_Timing_Advance_t),
+  M_NEXT_EXIST (PHO_TimingAdvance_t, Exist_Packet_Extended_Timing_Advance, 1),
+  M_UINT       (PHO_TimingAdvance_t,  Packet_Extended_Timing_Advance,  2),
 CSN_DESCR_END  (PHO_TimingAdvance_t)
 
 static const

src/gsm_rlcmac.h

diff --git a/src/gsm_rlcmac.h b/src/gsm_rlcmac.h
index 642530f..01e2ee6 100644
--- a/src/gsm_rlcmac.h
+++ b/src/gsm_rlcmac.h
@@ -1893,8 +1893,8 @@
 
 typedef struct
 {
-  gboolean Exist_PacketExtendedTimingAdvance;
-  guint8   PacketExtendedTimingAdvance;
+  gboolean Exist_Packet_Extended_Timing_Advance;
+  guint8   Packet_Extended_Timing_Advance;
   guint8   TBF_EST;
 } PU_AckNack_GPRS_AdditionsR99_t;
 
@@ -2201,7 +2201,7 @@
   gboolean                     Exist_BEP_PERIOD2;
   guint8                       BEP_PERIOD2;
 
-  Packet_Timing_Advance_t     PacketTimingAdvance;
+  Packet_Timing_Advance_t     Packet_Timing_Advance;
 
   gboolean                     Exist_Packet_Extended_Timing_Advance;
   guint8                       Packet_Extended_Timing_Advance;
@@ -4854,9 +4854,9 @@
 
 typedef struct
 {
-  Global_Packet_Timing_Advance_t    GlobalPacketTimingAdvance;
-  guint8 Exist_PacketExtendedTimingAdvance;
-  guint8 PacketExtendedTimingAdvance;
+  Global_Packet_Timing_Advance_t    GlobalPacket_Timing_Advance;
+  guint8 Exist_Packet_Extended_Timing_Advance;
+  guint8 Packet_Extended_Timing_Advance;
 } PHO_TimingAdvance_t;
 
 typedef struct