--- a/rvinterf/include/tch_feature.h	Mon Dec 12 22:15:25 2022 +0000
+++ b/rvinterf/include/tch_feature.h	Tue Dec 13 03:01:41 2022 +0000
@@ -1,12 +1,29 @@
 /*
- * This header file contains definitions for the
- * custom voice TCH rerouting feature that
- * has been implemented as an experiment in the
- * FreeCalypso GSM firmware.
+ * This header file contains definitions for the original TCH tap feature
+ * (TCH DL sniffing/capture and TCH UL play/substitution) that exists in
+ * FreeCalypso firmwares, both the current mainlined version and the old
+ * Citrine experimental version.
  */
 
-#define	TCH_CONFIG_REQ	0x11
-#define	TCH_CONFIG_CONF	0x12
-#define	TCH_ULBITS_REQ	0x13
-#define	TCH_ULBITS_CONF	0x14
-#define	TCH_DLBITS_IND	0x15
+#define	TCH_CONFIG_REQ		0x11
+#define	TCH_CONFIG_CONF		0x12
+#define	TCH_ULBITS_REQ		0x13
+#define	TCH_ULBITS_CONF		0x14
+#define	TCH_DLBITS_OLD_IND	0x15	/* FR&EFR only, no distinction, no fn */
+#define	TCH_DLBITS_NEW_IND	0x16	/* with channel mode and fn added */
+
+/*--------------------------------------------------------*/
+/* Channel mode definitions for DEDICATED.                */
+/*--------------------------------------------------------*/
+#define SIG_ONLY_MODE      0    // signalling only
+#define TCH_FS_MODE        1    // speech full rate
+#define TCH_HS_MODE        2    // speech half rate
+#define TCH_96_MODE        3    // data 9,6 kb/s
+#define TCH_48F_MODE       4    // data 4,8 kb/s full rate
+#define TCH_48H_MODE       5    // data 4,8 kb/s half rate
+#define TCH_24F_MODE       6    // data 2,4 kb/s full rate
+#define TCH_24H_MODE       7    // data 2,4 kb/s half rate
+#define TCH_EFR_MODE       8    // enhanced full rate
+#define TCH_144_MODE       9    // data 14,4 kb/s half rate
+#define TCH_AHS_MODE      10    // adaptative speech half rate
+#define TCH_AFS_MODE      11    // adaptative speech full rate