--- a/gsm-fw/g23m-glue/cst/Makefile	Sat Apr 25 20:11:08 2015 +0000
+++ b/gsm-fw/g23m-glue/cst/Makefile	Sat Apr 25 21:36:27 2015 +0000
@@ -5,7 +5,7 @@
 CPPFLAGS=-I. -I../../include -I../../include/condat -I../../gpf/inc \
 	-I../../cdginc
 
-OBJS=	cst_csf.o
+OBJS=	cst_csf.o cst_exts.o
 
 all:	${OBJS}
 

--- a/gsm-fw/g23m-glue/cst/cst_exts.c	Sat Apr 25 20:11:08 2015 +0000
+++ b/gsm-fw/g23m-glue/cst/cst_exts.c	Sat Apr 25 21:36:27 2015 +0000
@@ -16,12 +16,9 @@
 #define CST_EXTS_C
 #endif
 
-
-#include "config/swconfig.cfg"
-#include "config/chipset.cfg"
-#include "config/l1sw.cfg"
-
-
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
 
 #define ENTITY_CST
 /*==== INCLUDES ===================================================*/
@@ -35,40 +32,20 @@
 #include "p_mnsms.h"
 #include "p_mmreg.h"
 #include "p_mncc.h"
-#include "aci_cmh.h"
+#include "p_mnss.h"
 #include "vsi.h"
 #include "gsm.h"
 #include "p_cst.h"
-#include "cst/cst.h"
+#include "cst.h"
 #include "custom.h"
+#include "p_mmi.h"
+#include "p_em.h"
+#include "../../g23m-aci/aci/aci_cmh.h"
 
-#ifdef ALR
+#if 0 //#ifdef ALR
   #include "main/sys_ver.h"
 #endif
 
-/*==== MELODY TEST ==================================================*/
-
-#define MELODY_E1	0
-
-extern void enable_tch_vocoder(BOOL vocoder);
-
-#if (MELODY_E1)
-  extern void audio_melo_e1_demo1_start(void);
-  extern void audio_melo_e1_demo1_stop(void);
-  extern void audio_melo_e1_demo2_start(void);
-  extern void audio_melo_e1_demo2_stop(void);
-#endif
-
-#if (MELODY_E2)
-  extern void audio_melo_e2_load_lsi(void);
-  extern void audio_melo_e2_demo1_start(void);
-  extern void audio_melo_e2_demo1_stop(void);
-  extern void audio_melo_e2_demo2_start(void);
-  extern void audio_melo_e2_demo2_stop(void);
-#endif
-
-
-
 /*==== CONSTANTS ==================================================*/
 
 #define EXT_ATD             "EXT: D, I"
@@ -91,9 +68,7 @@
 
 #ifndef WIN32
   extern USHORT IQ_GetBuild(void);
-  #ifndef ALR
   extern USHORT IQ_GetPoleStarVersion(void);
-  #endif
   extern USHORT IQ_GetJtagId(void);
   extern USHORT IQ_GetRevision(void);
   extern void   l1dmacro_init_hw(void);
@@ -148,7 +123,7 @@
 
 #ifndef WIN32
 
-
+#if 0
 static void jtagid_to_chipset (USHORT jtagid, CHAR *chipset)
 {
 
@@ -216,6 +191,7 @@
         break;
   }
 }
+#endif
 
 GLOBAL void cmh_show_version (
                                       CHAR   *command,
@@ -223,7 +199,7 @@
                                       CHAR   *output
                                     )
 {
-#ifndef ALR
+#if 1 //#ifndef ALR
   CHAR   buf[80];
   USHORT build, hw, rev;
 #else
@@ -238,7 +214,7 @@
    */
   jtag  = IQ_GetJtagId();
 
-#ifndef ALR
+#if 1 //#ifndef ALR
   /*
    * Retrieve others hardware info and build from library
    */
@@ -611,34 +587,34 @@
         switch (*cmd) {
 
           case 'e':
-		  case 'E':
+	  case 'E':
           /* 's''e' already detected => assume the command is at%ser. */
-		  {
-			cmd += 3; /* Discard the following characters */
-			*cmdLen -= 9;
-			if (SER_WriteConfig (cmd, (BOOL) (*(cmd + 3) - '0')))
-			  return( AT_CMPL );
-			else
-              return( AT_FAIL );
-		  }
+	  {
+		cmd += 3; /* Discard the following characters */
+		*cmdLen -= 9;
+		if (SER_WriteConfig (cmd, (BOOL) (*(cmd + 3) - '0')))
+		  return( AT_CMPL );
+		else
+                  return( AT_FAIL );
+	  }
 
           case 'w':
-		  case 'W':
+	  case 'W':
           /* 's''w' already detected => assume the command is at%switch. */
-		  {
-			*cmdLen -= 7;
-			if (SER_ImmediateSwitch())
-			  return( AT_CMPL );
-			else
-			  return( AT_FAIL );
-		  }
+	  {
+		*cmdLen -= 7;
+		if (SER_ImmediateSwitch())
+		  return( AT_CMPL );
+		else
+		  return( AT_FAIL );
+	  }
 
           case 'l':
-		  case 'L':
+	  case 'L':
           /* 's''l' already detected => assume the command is at%sleep. */
-		  {
-			cmd += 5; /* Discard the following characters */
-			*cmdLen -= 8;
+	  {
+	    cmd += 5; /* Discard the following characters */
+	    *cmdLen -= 8;
             /*
              * Checks if the parameter is valid:
              *     0 -> NO_SLEEP
@@ -648,20 +624,20 @@
              *     4 -> ALL_SLEEP
              */
 
-   			if (((*cmd - '0') >= 0) && ((*cmd - '0') <= 4))
+	    if (((*cmd - '0') >= 0) && ((*cmd - '0') <= 4))
             {
               power_down_config ((UBYTE) (*cmd - '0'), UWIRE_CLK_CUT);
-			  return( AT_CMPL );
+		  return( AT_CMPL );
             }
-			else
+	    else
               return( AT_FAIL );
-		  }
+	  }
 
           default:
             *cmdLen -= 2;
             return ( AT_FAIL );
 
-		}
+	}
       }
 
       case 'H':
@@ -735,7 +711,7 @@
           out[0] = 22;
           memcpy (&out[1], "Performing Audio Tests", 22);
           out [23] = (CHAR) 0xff;
-		}
+	}
         else
         {
           if (!strncmp(cmd, "R", 1) || !strncmp(cmd, "r", 1)) 
@@ -747,7 +723,7 @@
           }
           else
             return( AT_FAIL );
-		}
+	}
         return( AT_CMPL );
 #endif
       default: