--- a/g23m/condat/ms/src/aci/aci_aci.c	Mon Jun 01 19:12:01 2015 +0000
+++ b/g23m/condat/ms/src/aci/aci_aci.c	Mon Jun 01 19:16:41 2015 +0000
@@ -103,8 +103,15 @@
 | STATE   : code                        ROUTINE : aci_aci_cmd_req    |
 +--------------------------------------------------------------------+
 
-  PURPOSE : handle ACI command request primitive. It is only a
-            signal and must not be freed by PFREE.
+  PURPOSE : handle ACI command request primitive. The original comment
+	    said "It is only a signal and must not be freed by PFREE",
+	    but it appears to have been wrong even before we touched
+	    this code.
+
+  FreeCalypso change: this primitive (not signal!) was originally used
+  for by TI's _SIMULATION_ environment (the code in ati_src_tst.c,
+  removed in the TCS3.2 version we got), but we have repurposed it
+  for our AT-over-RVTMUX implementation in ati_src_rvt.c.
 
 */
 
@@ -118,9 +125,9 @@
     cmd->cmd_seq[cmd->cmd_len] = '\0';
     TRACE_EVENT_P1 ("%s", cmd->cmd_seq);
   }
-#ifdef DTI
-#ifdef _SIMULATION_
-  if (cmd->cmd_src >= CMD_SRC_EXT && cmd->cmd_src <= MAX_TST_SRC)
+
+#if defined _SIMULATION_ AND defined DTI
+  if (cmd->cmd_src >= CMD_SRC_EXT AND cmd->cmd_src <= MAX_TST_SRC)
   {
 #ifdef FF_ATI_BAT
     U8 src_id = tst_src_id[cmd->cmd_src - 1];
@@ -151,9 +158,12 @@
   {
     TRACE_EVENT_P1 ("aci_aci_cmd_req(): [WRN] srcId=%d, but must be 0x01 or 0x02", cmd->cmd_src);
   }
-#endif /* _SIMULATION_ */
-#endif /* DTI */
-#endif
+#elif 1 //CONFIG_AT_RVTMUX
+
+  ati_src_rvt_proc_cmd (cmd);
+
+#endif	/* old _SIMULATION_ vs FreeCalypso AT-over-RVTMUX */
+#endif	/* FF_ATI */
 
   PFREE (cmd);
 

--- a/g23m/condat/ms/src/aci/aci_cmh.h	Mon Jun 01 19:12:01 2015 +0000
+++ b/g23m/condat/ms/src/aci/aci_cmh.h	Mon Jun 01 19:16:41 2015 +0000
@@ -512,7 +512,8 @@
   CMD_SRC_ATI_5,           /* added in case of SAT run at cmd
                            THIS DOES NOT MEAN THIS IS THE SAT SOURCE THOUGH !!! */
 #endif /* SIM_TOOLKIT */
-#if defined FF_EOTD
+/* FreeCalypso debug hack: reusing CMD_SRC_ATI_6 for our AT-over-RVTMUX */
+#if 1 //defined FF_EOTD
   CMD_SRC_ATI_6,           /* added in case of Location Service (test purposes) */
 #endif /* FF_EOTD */
 #endif /* GOLITE */

--- a/g23m/condat/ms/src/aci/ati_cmd.c	Mon Jun 01 19:12:01 2015 +0000
+++ b/g23m/condat/ms/src/aci/ati_cmd.c	Mon Jun 01 19:16:41 2015 +0000
@@ -1348,6 +1348,10 @@
   aci_sat_cmd_init();
 #endif
 
+#if 1 //CONFIG_AT_RVTMUX
+  ati_src_rvt_register();
+#endif
+
   cmd_clearCnmiBuf ();
 
   /* for ATI parameters that are source dependant */