--- a/gsm-fw/L1/cfile/Makefile	Thu Mar 17 05:39:51 2016 +0000
+++ b/gsm-fw/L1/cfile/Makefile	Fri Mar 18 16:37:28 2016 +0000
@@ -7,11 +7,17 @@
 LD=	arm-elf-ld
 INTSED=	../intram.sed
 
+sinclude ../../include/config.mk
+
 IOBJS=	l1_api_hisr.o l1_cmplx_intram.o l1_ctl.o l1_drive.o l1_func.o \
 	l1_mfmgr.o l1_small_asm.o l1_sync_intram.o l1_isr_glue.o
 XOBJS=	l1_afunc.o l1_async.o l1_cmplx.o l1_init.o l1_pwmgr.o l1_small_defs.o \
 	l1_sync.o l1_trace.o dummy_tch_data.o
 
+ifeq (${FEATURE_TCH_REROUTE},1)
+XOBJS+=	tch_feature.o
+endif
+
 all:	iramcode.o xipcode.o
 
 ${XOBJS}:	%.o : %.c

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gsm-fw/L1/cfile/tch_feature.c	Fri Mar 18 16:37:28 2016 +0000
@@ -0,0 +1,29 @@
+/*
+ * This module is a FreeCalypso addition; it contains code implementing
+ * our custom voice TCH rerouting feature.
+ */
+
+#include "config.h"
+#include "l1_confg.h"
+#include "l1_types.h"
+#include "sys_types.h"
+#include "l1_trace.h"
+#include "tch_feature.h"
+
+T_RVT_USER_ID tch_reroute_rvt_id;
+BOOL tch_reroute_downlink;
+
+/*
+ * The following function is the callback registered with RVT; it gets
+ * called in RVT HISR context.
+ */
+static void tch_rvt_input_callback(T_RVT_BUFFER pkt, UINT16 pktlen)
+{
+	/* guts to be filled */
+}
+
+void feature_tch_reroute_init()
+{
+	rvt_register_id("TCH", &tch_reroute_rvt_id, tch_rvt_input_callback);
+	tch_reroute_downlink = FALSE;
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gsm-fw/L1/include/tch_feature.h	Fri Mar 18 16:37:28 2016 +0000
@@ -0,0 +1,10 @@
+/*
+ * This header file is a FreeCalypso addition; it contains definitions
+ * for the custom voice TCH rerouting feature.
+ */
+
+#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

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gsm-fw/cfgmagic/feature.tch-reroute	Fri Mar 18 16:37:28 2016 +0000
@@ -0,0 +1,3 @@
+FEATURE_TCH_REROUTE=1
+export_to_c	FEATURE_TCH_REROUTE
+export_to_mk	FEATURE_TCH_REROUTE