<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/23822">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo-bts-trx: cosmetic: TRXD 'header version' -> 'PDU version'<br><br>TRXDv2 brings significant changes to the whole PDU structure, not<br>just the header.  Let's highlight this in the code / strings.<br><br>Change-Id: Id0274bd1ae5c419548596ed1852e6a28ec62b713<br>Related: SYS#4895, OS#4941, OS#4006<br>---<br>M include/osmo-bts/phy_link.h<br>M src/osmo-bts-trx/l1_if.h<br>M src/osmo-bts-trx/main.c<br>M src/osmo-bts-trx/trx_if.c<br>M src/osmo-bts-trx/trx_if.h<br>M src/osmo-bts-trx/trx_provision_fsm.c<br>M src/osmo-bts-trx/trx_vty.c<br>7 files changed, 49 insertions(+), 49 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/22/23822/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/phy_link.h b/include/osmo-bts/phy_link.h</span><br><span>index ef3df27..16cfd06 100644</span><br><span>--- a/include/osmo-bts/phy_link.h</span><br><span>+++ b/include/osmo-bts/phy_link.h</span><br><span>@@ -48,7 +48,7 @@</span><br><span>                        uint32_t clock_advance;</span><br><span>                      uint32_t rts_advance;</span><br><span>                        bool use_legacy_setbsic;</span><br><span style="color: hsl(0, 100%, 40%);">-                        uint8_t  trxd_hdr_ver_max; /* Maximum TRXD header version to negotiate */</span><br><span style="color: hsl(120, 100%, 40%);">+                     uint8_t  trxd_pdu_ver_max; /* Maximum TRXD header version to negotiate */</span><br><span>                    bool powered; /* last POWERON (true) or POWEROFF (false) confirmed */</span><br><span>                        bool poweronoff_sent; /* is there a POWERON/POWEROFF in transit? (one or the other based on ->powered) */</span><br><span>                 } osmotrx;</span><br><span>diff --git a/src/osmo-bts-trx/l1_if.h b/src/osmo-bts-trx/l1_if.h</span><br><span>index 8c309db..112a6ab 100644</span><br><span>--- a/src/osmo-bts-trx/l1_if.h</span><br><span>+++ b/src/osmo-bts-trx/l1_if.h</span><br><span>@@ -60,8 +60,8 @@</span><br><span> };</span><br><span> </span><br><span> struct trx_config {</span><br><span style="color: hsl(0, 100%, 40%);">-    uint8_t                 trxd_hdr_ver_req; /* requested TRXD header version */</span><br><span style="color: hsl(0, 100%, 40%);">-   uint8_t                 trxd_hdr_ver_use; /* actual TRXD header version in use */</span><br><span style="color: hsl(120, 100%, 40%);">+     uint8_t                 trxd_pdu_ver_req; /* requested TRXD PDU version */</span><br><span style="color: hsl(120, 100%, 40%);">+    uint8_t                 trxd_pdu_ver_use; /* actual TRXD PDU version in use */</span><br><span>       bool                    setformat_sent;</span><br><span>      bool                    setformat_acked;</span><br><span> </span><br><span>diff --git a/src/osmo-bts-trx/main.c b/src/osmo-bts-trx/main.c</span><br><span>index 7e6dea9..e0a99a5 100644</span><br><span>--- a/src/osmo-bts-trx/main.c</span><br><span>+++ b/src/osmo-bts-trx/main.c</span><br><span>@@ -169,7 +169,7 @@</span><br><span>  plink->u.osmotrx.clock_advance = 2;</span><br><span>       plink->u.osmotrx.rts_advance = 3;</span><br><span>         /* attempt use newest TRXD version by default: */</span><br><span style="color: hsl(0, 100%, 40%);">-       plink->u.osmotrx.trxd_hdr_ver_max = TRX_DATA_FORMAT_VER;</span><br><span style="color: hsl(120, 100%, 40%);">+   plink->u.osmotrx.trxd_pdu_ver_max = TRX_DATA_PDU_VER;</span><br><span> }</span><br><span> </span><br><span> void bts_model_phy_instance_set_defaults(struct phy_instance *pinst)</span><br><span>diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c</span><br><span>index 2e97319..bec6a5a 100644</span><br><span>--- a/src/osmo-bts-trx/trx_if.c</span><br><span>+++ b/src/osmo-bts-trx/trx_if.c</span><br><span>@@ -275,11 +275,11 @@</span><br><span>   return trx_ctrl_cmd_cb(l1h, 1, cb, "POWERON", "");</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/*! Send "SETFORMAT" command to TRX: change TRXD header format version */</span><br><span style="color: hsl(120, 100%, 40%);">+/*! Send "SETFORMAT" command to TRX: change TRXD PDU version */</span><br><span> int trx_if_cmd_setformat(struct trx_l1h *l1h, uint8_t ver, trx_if_cmd_generic_cb *cb)</span><br><span> {</span><br><span>  LOGPPHI(l1h->phy_inst, DTRX, LOGL_INFO,</span><br><span style="color: hsl(0, 100%, 40%);">-              "Requesting TRXD header format version %u\n", ver);</span><br><span style="color: hsl(120, 100%, 40%);">+         "Requesting TRXD PDU version %u\n", ver);</span><br><span> </span><br><span>      return trx_ctrl_cmd_cb(l1h, 0, cb, "SETFORMAT", "%u", ver);</span><br><span> }</span><br><span>@@ -510,7 +510,7 @@</span><br><span>   return rsp->status == 0 ? 0 : -EINVAL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* TRXD header format negotiation handler.</span><br><span style="color: hsl(120, 100%, 40%);">+/* TRXD PDU format negotiation handler.</span><br><span>  *</span><br><span>  * If the transceiver does not support the format negotiation, it would</span><br><span>  * reject SETFORMAT with 'RSP ERR 1'. If the requested version is not</span><br><span>@@ -526,7 +526,7 @@</span><br><span>        if (strcmp(rsp->cmd, "SETFORMAT") != 0) {</span><br><span>               LOGPPHI(l1h->phy_inst, DTRX, LOGL_NOTICE,</span><br><span>                         "Transceiver rejected the format negotiation command, "</span><br><span style="color: hsl(0, 100%, 40%);">-                       "using legacy TRXD header format version (0)\n");</span><br><span style="color: hsl(120, 100%, 40%);">+                   "using legacy TRXD PDU version (0)\n");</span><br><span>            if (rsp->cb) {</span><br><span>                    cb = (trx_if_cmd_generic_cb*) rsp->cb;</span><br><span>                    cb(l1h, 0);</span><br><span>@@ -535,11 +535,11 @@</span><br><span>  }</span><br><span> </span><br><span>        /* Status shall indicate a proper version supported by the transceiver */</span><br><span style="color: hsl(0, 100%, 40%);">-       if (rsp->status < 0 || rsp->status > l1h->config.trxd_hdr_ver_req) {</span><br><span style="color: hsl(120, 100%, 40%);">+   if (rsp->status < 0 || rsp->status > l1h->config.trxd_pdu_ver_req) {</span><br><span>          LOGPPHI(l1h->phy_inst, DTRX, LOGL_ERROR,</span><br><span>                  "Transceiver indicated an out of range "</span><br><span style="color: hsl(0, 100%, 40%);">-                      "header format version %d (requested %u)\n",</span><br><span style="color: hsl(0, 100%, 40%);">-                  rsp->status, l1h->config.trxd_hdr_ver_req);</span><br><span style="color: hsl(120, 100%, 40%);">+                     "PDU version %d (requested %u)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+                  rsp->status, l1h->config.trxd_pdu_ver_req);</span><br><span>            return -EINVAL;</span><br><span>      }</span><br><span> </span><br><span>@@ -814,7 +814,7 @@</span><br><span>  return TRX_UL_V1HDR_LEN;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* TRXD burst handler for header version 0 */</span><br><span style="color: hsl(120, 100%, 40%);">+/* TRXD burst handler for PDU version 0 */</span><br><span> static int trx_data_handle_burst_v0(struct trx_l1h *l1h,</span><br><span>                                   struct trx_ul_burst_ind *bi,</span><br><span>                                 const uint8_t *buf, size_t buf_len)</span><br><span>@@ -850,7 +850,7 @@</span><br><span>        return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* TRXD burst handler for header version 1 */</span><br><span style="color: hsl(120, 100%, 40%);">+/* TRXD burst handler for PDU version 1 */</span><br><span> static int trx_data_handle_burst_v1(struct trx_l1h *l1h,</span><br><span>                                  struct trx_ul_burst_ind *bi,</span><br><span>                                 const uint8_t *buf, size_t buf_len)</span><br><span>@@ -869,7 +869,7 @@</span><br><span>                return -EINVAL;</span><br><span>      }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   /* The burst format is the same as for version 0.</span><br><span style="color: hsl(120, 100%, 40%);">+     /* The PDU format is the same as for version 0.</span><br><span>       * NOTE: other modulation types to be handled separately. */</span><br><span>         return trx_data_handle_burst_v0(l1h, bi, buf, buf_len);</span><br><span> }</span><br><span>@@ -937,7 +937,7 @@</span><br><span>  *   +-----------------+------------------------+</span><br><span>  *   | 7 6 5 4 3 2 1 0 | bit numbers            |</span><br><span>  *   +-----------------+------------------------+</span><br><span style="color: hsl(0, 100%, 40%);">- *   | X X X X . . . . | header version (0..15) |</span><br><span style="color: hsl(120, 100%, 40%);">+ *   | X X X X . . . . | PDU version (0..15)    |</span><br><span>  *   +-----------------+------------------------+</span><br><span>  *   | . . . . . X X X | TDMA TN (0..7)         |</span><br><span>  *   +-----------------+------------------------+</span><br><span>@@ -1040,7 +1040,7 @@</span><br><span>         uint8_t buf[TRX_DATA_MSG_MAX_LEN];</span><br><span>   struct trx_ul_burst_ind bi;</span><br><span>  ssize_t hdr_len, buf_len;</span><br><span style="color: hsl(0, 100%, 40%);">-       uint8_t hdr_ver;</span><br><span style="color: hsl(120, 100%, 40%);">+      uint8_t pdu_ver;</span><br><span>     int rc;</span><br><span> </span><br><span>  buf_len = recv(ofd->fd, buf, sizeof(buf), 0);</span><br><span>@@ -1054,9 +1054,9 @@</span><br><span>     /* Pre-clean (initialize) the flags */</span><br><span>       bi.flags = 0x00;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    /* Parse the header depending on its version */</span><br><span style="color: hsl(0, 100%, 40%);">- hdr_ver = buf[0] >> 4;</span><br><span style="color: hsl(0, 100%, 40%);">-    switch (hdr_ver) {</span><br><span style="color: hsl(120, 100%, 40%);">+    /* Parse header depending on the PDU version */</span><br><span style="color: hsl(120, 100%, 40%);">+       pdu_ver = buf[0] >> 4;</span><br><span style="color: hsl(120, 100%, 40%);">+  switch (pdu_ver) {</span><br><span>   case 0:</span><br><span>              /* Legacy protocol has no version indicator */</span><br><span>               hdr_len = trx_data_handle_hdr_v0(l1h, &bi, buf, buf_len);</span><br><span>@@ -1066,7 +1066,7 @@</span><br><span>                break;</span><br><span>       default:</span><br><span>             LOGPPHI(l1h->phy_inst, DTRX, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">-                     "TRXD header version %u is not supported\n", hdr_ver);</span><br><span style="color: hsl(120, 100%, 40%);">+                      "TRXD PDU version %u is not supported\n", pdu_ver);</span><br><span>                return -ENOTSUP;</span><br><span>     }</span><br><span> </span><br><span>@@ -1083,7 +1083,7 @@</span><br><span>        buf_len -= hdr_len;</span><br><span> </span><br><span>      /* Handle burst bits */</span><br><span style="color: hsl(0, 100%, 40%);">- switch (hdr_ver) {</span><br><span style="color: hsl(120, 100%, 40%);">+    switch (pdu_ver) {</span><br><span>   case 0:</span><br><span>              rc = trx_data_handle_burst_v0(l1h, &bi, buf + hdr_len, buf_len);</span><br><span>                 break;</span><br><span>@@ -1101,9 +1101,9 @@</span><br><span> </span><br><span> skip_burst:</span><br><span>    /* Print header & burst info */</span><br><span style="color: hsl(0, 100%, 40%);">-     LOGPPHI(l1h->phy_inst, DTRX, LOGL_DEBUG, "Rx %s (hdr_ver=%u): %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+     LOGPPHI(l1h->phy_inst, DTRX, LOGL_DEBUG, "Rx %s (pdu_ver=%u): %s\n",</span><br><span>            (bi.flags & TRX_BI_F_NOPE_IND) ? "NOPE.ind" : "UL burst",</span><br><span style="color: hsl(0, 100%, 40%);">-               hdr_ver, trx_data_desc_msg(&bi));</span><br><span style="color: hsl(120, 100%, 40%);">+         pdu_ver, trx_data_desc_msg(&bi));</span><br><span> </span><br><span>    /* feed received burst into scheduler code */</span><br><span>        trx_sched_route_burst_ind(&bi, &l1h->l1s);</span><br><span>@@ -1118,7 +1118,7 @@</span><br><span> int trx_if_send_burst(struct trx_l1h *l1h, const struct trx_dl_burst_req *br)</span><br><span> {</span><br><span>  ssize_t snd_len;</span><br><span style="color: hsl(0, 100%, 40%);">-        uint8_t hdr_ver = l1h->config.trxd_hdr_ver_use;</span><br><span style="color: hsl(120, 100%, 40%);">+    uint8_t pdu_ver = l1h->config.trxd_pdu_ver_use;</span><br><span>   uint8_t buf[TRX_DATA_MSG_MAX_LEN];</span><br><span> </span><br><span>       if ((br->burst_len != GSM_BURST_LEN) && (br->burst_len != EGPRS_BURST_LEN)) {</span><br><span>@@ -1128,22 +1128,22 @@</span><br><span>        }</span><br><span> </span><br><span>        LOGPPHI(l1h->phy_inst, DTRX, LOGL_DEBUG,</span><br><span style="color: hsl(0, 100%, 40%);">-             "Tx burst (hdr_ver=%u): tn=%u fn=%u att=%u\n",</span><br><span style="color: hsl(0, 100%, 40%);">-                hdr_ver, br->tn, br->fn, br->att);</span><br><span style="color: hsl(120, 100%, 40%);">+           "Tx burst (pdu_ver=%u): tn=%u fn=%u att=%u\n",</span><br><span style="color: hsl(120, 100%, 40%);">+              pdu_ver, br->tn, br->fn, br->att);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- switch (hdr_ver) {</span><br><span style="color: hsl(120, 100%, 40%);">+    switch (pdu_ver) {</span><br><span>   case 0:</span><br><span>      case 1:</span><br><span style="color: hsl(0, 100%, 40%);">-         /* Both versions have the same header format */</span><br><span style="color: hsl(120, 100%, 40%);">+               /* Both versions have the same PDU format */</span><br><span>                 break;</span><br><span> </span><br><span>   default:</span><br><span>             LOGPPHI(l1h->phy_inst, DTRX, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">-                     "Requested TRXD header version %u is not supported\n", hdr_ver);</span><br><span style="color: hsl(120, 100%, 40%);">+                    "Requested TRXD PDU version %u is not supported\n", pdu_ver);</span><br><span>              return -ENOTSUP;</span><br><span>     }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   buf[0] = ((hdr_ver & 0x0f) << 4) | br->tn;</span><br><span style="color: hsl(120, 100%, 40%);">+       buf[0] = ((pdu_ver & 0x0f) << 4) | br->tn;</span><br><span>      osmo_store32be(br->fn, buf + 1);</span><br><span>  buf[5] = br->att;</span><br><span> </span><br><span>diff --git a/src/osmo-bts-trx/trx_if.h b/src/osmo-bts-trx/trx_if.h</span><br><span>index 17bc7db..dd77270 100644</span><br><span>--- a/src/osmo-bts-trx/trx_if.h</span><br><span>+++ b/src/osmo-bts-trx/trx_if.h</span><br><span>@@ -40,7 +40,7 @@</span><br><span> int trx_if_powered(struct trx_l1h *l1h);</span><br><span> </span><br><span> /* The latest supported TRXD header format version */</span><br><span style="color: hsl(0, 100%, 40%);">-#define TRX_DATA_FORMAT_VER    1</span><br><span style="color: hsl(120, 100%, 40%);">+#define TRX_DATA_PDU_VER    1</span><br><span> </span><br><span> /* Format negotiation command */</span><br><span> int trx_if_cmd_setformat(struct trx_l1h *l1h, uint8_t ver, trx_if_cmd_generic_cb *cb);</span><br><span>diff --git a/src/osmo-bts-trx/trx_provision_fsm.c b/src/osmo-bts-trx/trx_provision_fsm.c</span><br><span>index e4721ba..1e5de2e 100644</span><br><span>--- a/src/osmo-bts-trx/trx_provision_fsm.c</span><br><span>+++ b/src/osmo-bts-trx/trx_provision_fsm.c</span><br><span>@@ -148,16 +148,16 @@</span><br><span>                 l1h->config.bsic_acked = false;</span><br><span>   }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   /* Ask transceiver to use the newest TRXD header version if not using it yet */</span><br><span style="color: hsl(120, 100%, 40%);">+       /* Ask transceiver to use the newest TRXD PDU version if not using it yet */</span><br><span>         if (!l1h->config.setformat_sent) {</span><br><span>                l1h->config.setformat_sent = true;</span><br><span style="color: hsl(0, 100%, 40%);">-           if (plink->u.osmotrx.trxd_hdr_ver_max == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+              if (plink->u.osmotrx.trxd_pdu_ver_max == 0) {</span><br><span>                     LOGPPHI(pinst, DL1C, LOGL_INFO,</span><br><span>                              "No need to negotiate max TRXD version 0");</span><br><span style="color: hsl(0, 100%, 40%);">-                   l1h->config.trxd_hdr_ver_use = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+                  l1h->config.trxd_pdu_ver_use = 0;</span><br><span>                         l1h->config.setformat_acked = true;</span><br><span>               } else {</span><br><span style="color: hsl(0, 100%, 40%);">-                        trx_if_cmd_setformat(l1h, l1h->config.trxd_hdr_ver_req, l1if_setformat_cb);</span><br><span style="color: hsl(120, 100%, 40%);">+                        trx_if_cmd_setformat(l1h, l1h->config.trxd_pdu_ver_req, l1if_setformat_cb);</span><br><span>                       l1h->config.setformat_acked = false;</span><br><span>              }</span><br><span>    }</span><br><span>@@ -276,7 +276,7 @@</span><br><span>      struct trx_l1h *l1h = (struct trx_l1h *)fi->priv;</span><br><span>         struct phy_instance *pinst = l1h->phy_inst;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-      l1h->config.trxd_hdr_ver_req = pinst->phy_link->u.osmotrx.trxd_hdr_ver_max;</span><br><span style="color: hsl(120, 100%, 40%);">+  l1h->config.trxd_pdu_ver_req = pinst->phy_link->u.osmotrx.trxd_pdu_ver_max;</span><br><span> </span><br><span>     /* Apply initial RFMUTE state */</span><br><span>     trx_if_cmd_rfmute(l1h, pinst->trx->mo.nm_state.administrative != NM_STATE_UNLOCKED);</span><br><span>@@ -354,18 +354,18 @@</span><br><span>   case TRX_PROV_EV_SETFORMAT_CNF:</span><br><span>              status = (int)(intptr_t)data;</span><br><span>                /* Transceiver may suggest a lower version (than requested) */</span><br><span style="color: hsl(0, 100%, 40%);">-          if (status == l1h->config.trxd_hdr_ver_req) {</span><br><span style="color: hsl(0, 100%, 40%);">-                        l1h->config.trxd_hdr_ver_use = status;</span><br><span style="color: hsl(120, 100%, 40%);">+             if (status == l1h->config.trxd_pdu_ver_req) {</span><br><span style="color: hsl(120, 100%, 40%);">+                      l1h->config.trxd_pdu_ver_use = status;</span><br><span>                    l1h->config.setformat_acked = true;</span><br><span>                       LOGPPHI(l1h->phy_inst, DTRX, LOGL_INFO,</span><br><span style="color: hsl(0, 100%, 40%);">-                              "Using TRXD header format version %u\n",</span><br><span style="color: hsl(0, 100%, 40%);">-                              l1h->config.trxd_hdr_ver_use);</span><br><span style="color: hsl(120, 100%, 40%);">+                             "Using TRXD PDU version %u\n",</span><br><span style="color: hsl(120, 100%, 40%);">+                              l1h->config.trxd_pdu_ver_use);</span><br><span>            } else {</span><br><span>                     LOGPPHI(l1h->phy_inst, DTRX, LOGL_DEBUG,</span><br><span style="color: hsl(0, 100%, 40%);">-                             "Transceiver suggests TRXD header version %u (requested %u)\n",</span><br><span style="color: hsl(0, 100%, 40%);">-                               status, l1h->config.trxd_hdr_ver_req);</span><br><span style="color: hsl(120, 100%, 40%);">+                             "Transceiver suggests TRXD PDU version %u (requested %u)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+                                status, l1h->config.trxd_pdu_ver_req);</span><br><span>                    /* Send another SETFORMAT with suggested version */</span><br><span style="color: hsl(0, 100%, 40%);">-                     l1h->config.trxd_hdr_ver_req = status;</span><br><span style="color: hsl(120, 100%, 40%);">+                     l1h->config.trxd_pdu_ver_req = status;</span><br><span>                    l1h->config.setformat_sent = false;</span><br><span>               }</span><br><span>            break;</span><br><span>diff --git a/src/osmo-bts-trx/trx_vty.c b/src/osmo-bts-trx/trx_vty.c</span><br><span>index 4e8c8d6..b85dcdc 100644</span><br><span>--- a/src/osmo-bts-trx/trx_vty.c</span><br><span>+++ b/src/osmo-bts-trx/trx_vty.c</span><br><span>@@ -517,15 +517,15 @@</span><br><span> </span><br><span>      int max_ver;</span><br><span>         if (strcmp(argv[0], "latest") == 0)</span><br><span style="color: hsl(0, 100%, 40%);">-           max_ver = TRX_DATA_FORMAT_VER;</span><br><span style="color: hsl(120, 100%, 40%);">+                max_ver = TRX_DATA_PDU_VER;</span><br><span>  else</span><br><span>                 max_ver = atoi(argv[0]);</span><br><span style="color: hsl(0, 100%, 40%);">-        if (max_ver > TRX_DATA_FORMAT_VER) {</span><br><span style="color: hsl(120, 100%, 40%);">+       if (max_ver > TRX_DATA_PDU_VER) {</span><br><span>                 vty_out(vty, "%% Format version %d is not supported, maximum supported is %d%s",</span><br><span style="color: hsl(0, 100%, 40%);">-                      max_ver, TRX_DATA_FORMAT_VER, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+                   max_ver, TRX_DATA_PDU_VER, VTY_NEWLINE);</span><br><span>             return CMD_WARNING;</span><br><span>  }</span><br><span style="color: hsl(0, 100%, 40%);">-       plink->u.osmotrx.trxd_hdr_ver_max = max_ver;</span><br><span style="color: hsl(120, 100%, 40%);">+       plink->u.osmotrx.trxd_pdu_ver_max = max_ver;</span><br><span> </span><br><span>  return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -554,8 +554,8 @@</span><br><span>       if (plink->u.osmotrx.use_legacy_setbsic)</span><br><span>          vty_out(vty, " osmotrx legacy-setbsic%s", VTY_NEWLINE);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   if (plink->u.osmotrx.trxd_hdr_ver_max != TRX_DATA_FORMAT_VER)</span><br><span style="color: hsl(0, 100%, 40%);">-                vty_out(vty, " osmotrx trxd-max-version %d%s", plink->u.osmotrx.trxd_hdr_ver_max, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+  if (plink->u.osmotrx.trxd_pdu_ver_max != TRX_DATA_PDU_VER)</span><br><span style="color: hsl(120, 100%, 40%);">+         vty_out(vty, " osmotrx trxd-max-version %d%s", plink->u.osmotrx.trxd_pdu_ver_max, VTY_NEWLINE);</span><br><span> }</span><br><span> </span><br><span> void bts_model_config_write_phy_inst(struct vty *vty, const struct phy_instance *pinst)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/23822">change 23822</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-bts/+/23822"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Id0274bd1ae5c419548596ed1852e6a28ec62b713 </div>
<div style="display:none"> Gerrit-Change-Number: 23822 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>