Change in libosmocore[master]: Rename osmo dyn ts enums to contain SDCCH8

[pespin]

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/24784 )


Change subject: Rename osmo dyn ts enums to contain SDCCH8
......................................................................

Rename osmo dyn ts enums to contain SDCCH8

They will gain support to be activated as SDCCH/8 soon too.

Related: OS#5309
Change-Id: I56dcfe4d17899630b17f80145c3ced72f1e91e68
---
M include/osmocom/gsm/gsm_utils.h
M include/osmocom/gsm/protocol/gsm_12_21.h
M src/gsm/abis_nm.c
3 files changed, 7 insertions(+), 3 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/84/24784/1

diff --git a/include/osmocom/gsm/gsm_utils.h b/include/osmocom/gsm/gsm_utils.h
index 0909006..3a4e5ed 100644
--- a/include/osmocom/gsm/gsm_utils.h
+++ b/include/osmocom/gsm/gsm_utils.h
@@ -213,9 +213,11 @@
 	GSM_PCHAN_UNKNOWN,
 	GSM_PCHAN_CCCH_SDCCH4_CBCH,
 	GSM_PCHAN_SDCCH8_SACCH8C_CBCH,
-	GSM_PCHAN_TCH_F_TCH_H_PDCH,
+	GSM_PCHAN_TCH_F_TCH_H_SDCCH8_SACCH8C_PDCH,
 	_GSM_PCHAN_MAX
 };
+/* Backward compatibility with older naming: */
+#define GSM_PCHAN_TCH_F_TCH_H_PDCH GSM_PCHAN_TCH_F_TCH_H_SDCCH8_SACCH8C_PDCH
 
 /* Osmocom internal, not part of any gsm spec */
 enum gsm_chan_t {
diff --git a/include/osmocom/gsm/protocol/gsm_12_21.h b/include/osmocom/gsm/protocol/gsm_12_21.h
index 6156ce9..df7d2f7 100644
--- a/include/osmocom/gsm/protocol/gsm_12_21.h
+++ b/include/osmocom/gsm/protocol/gsm_12_21.h
@@ -564,8 +564,10 @@
 	NM_CHANC_IPAC_TCHFull_PDCH = 0x80,
 	NM_CHANC_IPAC_TCHFull_TCHHalf = 0x81,
 	/* osmocom */
-	NM_CHANC_OSMO_TCHFull_TCHHalf_PDCH = 0x90,
+	NM_CHANC_OSMO_TCHFull_TCHHalf_SDCCH_PDCH = 0x90,
 };
+/* Backward compatibility with older naming: */
+#define NM_CHANC_OSMO_TCHFull_TCHHalf_PDCH NM_CHANC_OSMO_TCHFull_TCHHalf_SDCCH_PDCH
 
 /*! Event Type (Section 9.4.16) */
 enum abis_nm_event_type {
diff --git a/src/gsm/abis_nm.c b/src/gsm/abis_nm.c
index f7793d7..236c8cc 100644
--- a/src/gsm/abis_nm.c
+++ b/src/gsm/abis_nm.c
@@ -703,7 +703,7 @@
 	[GSM_PCHAN_UNKNOWN]	= 0xff,
 	[GSM_PCHAN_CCCH_SDCCH4_CBCH]	= NM_CHANC_BCCH_CBCH,
 	[GSM_PCHAN_SDCCH8_SACCH8C_CBCH] = NM_CHANC_SDCCH_CBCH,
-	[GSM_PCHAN_TCH_F_TCH_H_PDCH]	= NM_CHANC_OSMO_TCHFull_TCHHalf_PDCH,
+	[GSM_PCHAN_TCH_F_TCH_H_SDCCH8_SACCH8C_PDCH]	= NM_CHANC_OSMO_TCHFull_TCHHalf_SDCCH_PDCH,
 	/* FIXME: bounds check */
 };
 

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

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I56dcfe4d17899630b17f80145c3ced72f1e91e68
Gerrit-Change-Number: 24784
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210628/acf50d27/attachment.htm>