<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/24784">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
dexter: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Rename osmo dyn ts enums<br><br>They will gain support to be activated as SDCCH/8 soon too. Since new<br>name would start to be too large, use a more generic naming for it.<br><br>Related: OS#5309<br>Change-Id: I56dcfe4d17899630b17f80145c3ced72f1e91e68<br>---<br>M include/osmocom/gsm/gsm_utils.h<br>M include/osmocom/gsm/protocol/gsm_12_21.h<br>M src/gsm/abis_nm.c<br>3 files changed, 7 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/gsm/gsm_utils.h b/include/osmocom/gsm/gsm_utils.h</span><br><span>index 0909006..45af4f2 100644</span><br><span>--- a/include/osmocom/gsm/gsm_utils.h</span><br><span>+++ b/include/osmocom/gsm/gsm_utils.h</span><br><span>@@ -213,9 +213,11 @@</span><br><span> GSM_PCHAN_UNKNOWN,</span><br><span> GSM_PCHAN_CCCH_SDCCH4_CBCH,</span><br><span> GSM_PCHAN_SDCCH8_SACCH8C_CBCH,</span><br><span style="color: hsl(0, 100%, 40%);">- GSM_PCHAN_TCH_F_TCH_H_PDCH,</span><br><span style="color: hsl(120, 100%, 40%);">+ GSM_PCHAN_OSMO_DYN,</span><br><span> _GSM_PCHAN_MAX</span><br><span> };</span><br><span style="color: hsl(120, 100%, 40%);">+/* Backward compatibility with older naming: */</span><br><span style="color: hsl(120, 100%, 40%);">+#define GSM_PCHAN_TCH_F_TCH_H_PDCH GSM_PCHAN_OSMO_DYN</span><br><span> </span><br><span> /* Osmocom internal, not part of any gsm spec */</span><br><span> enum gsm_chan_t {</span><br><span>diff --git a/include/osmocom/gsm/protocol/gsm_12_21.h b/include/osmocom/gsm/protocol/gsm_12_21.h</span><br><span>index 6156ce9..542d978 100644</span><br><span>--- a/include/osmocom/gsm/protocol/gsm_12_21.h</span><br><span>+++ b/include/osmocom/gsm/protocol/gsm_12_21.h</span><br><span>@@ -564,8 +564,10 @@</span><br><span> NM_CHANC_IPAC_TCHFull_PDCH = 0x80,</span><br><span> NM_CHANC_IPAC_TCHFull_TCHHalf = 0x81,</span><br><span> /* osmocom */</span><br><span style="color: hsl(0, 100%, 40%);">- NM_CHANC_OSMO_TCHFull_TCHHalf_PDCH = 0x90,</span><br><span style="color: hsl(120, 100%, 40%);">+ NM_CHANC_OSMO_DYN = 0x90,</span><br><span> };</span><br><span style="color: hsl(120, 100%, 40%);">+/* Backward compatibility with older naming: */</span><br><span style="color: hsl(120, 100%, 40%);">+#define NM_CHANC_OSMO_TCHFull_TCHHalf_PDCH NM_CHANC_OSMO_DYN</span><br><span> </span><br><span> /*! Event Type (Section 9.4.16) */</span><br><span> enum abis_nm_event_type {</span><br><span>diff --git a/src/gsm/abis_nm.c b/src/gsm/abis_nm.c</span><br><span>index f7793d7..38cd194 100644</span><br><span>--- a/src/gsm/abis_nm.c</span><br><span>+++ b/src/gsm/abis_nm.c</span><br><span>@@ -703,7 +703,7 @@</span><br><span> [GSM_PCHAN_UNKNOWN] = 0xff,</span><br><span> [GSM_PCHAN_CCCH_SDCCH4_CBCH] = NM_CHANC_BCCH_CBCH,</span><br><span> [GSM_PCHAN_SDCCH8_SACCH8C_CBCH] = NM_CHANC_SDCCH_CBCH,</span><br><span style="color: hsl(0, 100%, 40%);">- [GSM_PCHAN_TCH_F_TCH_H_PDCH] = NM_CHANC_OSMO_TCHFull_TCHHalf_PDCH,</span><br><span style="color: hsl(120, 100%, 40%);">+ [GSM_PCHAN_OSMO_DYN] = NM_CHANC_OSMO_DYN,</span><br><span> /* FIXME: bounds check */</span><br><span> };</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/24784">change 24784</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/libosmocore/+/24784"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I56dcfe4d17899630b17f80145c3ced72f1e91e68 </div>
<div style="display:none"> Gerrit-Change-Number: 24784 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>