--- a/gsm-fw/g23m-gsm/mm/Makefile	Sat Oct 04 20:36:23 2014 +0000
+++ b/gsm-fw/g23m-gsm/mm/Makefile	Sat Oct 04 20:54:40 2014 +0000
@@ -5,7 +5,8 @@
 CPPFLAGS=-I. -I../../include -I../../include/condat -I../../gpf/inc \
 	-I../../cdginc
 
-OBJS=	mm_csf.o mm_em.o mm_forf.o mm_forp.o mm_fors.o mm_mmf.o mm_mmp.o
+OBJS=	mm_csf.o mm_em.o mm_forf.o mm_forp.o mm_fors.o mm_mmf.o mm_mmp.o \
+	mm_mms.o
 
 all:	${OBJS}
 

--- a/gsm-fw/g23m-gsm/mm/mm_mms.c	Sat Oct 04 20:36:23 2014 +0000
+++ b/gsm-fw/g23m-gsm/mm/mm_mms.c	Sat Oct 04 20:54:40 2014 +0000
@@ -22,6 +22,10 @@
 #ifndef MM_MMS_C
 #define MM_MMS_C
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+
 #define ENTITY_MM
 
 /*==== INCLUDES ===================================================*/
@@ -740,13 +744,13 @@
              * if there was a failure in the VLR's database.
              * This is expected to happen seldom.
              * GSM 11.10 subclause 26.7.5.5 doesn't expect that a call is saved 
-             * and established is performed later in this condition. Choosing this 
+             * and established is performed later in this condition.
+	     * Choosing this
              * implementation option complicates the protocol here too much.
              * (danger of introducing bugs, especially if GPRS is also present)
              * The next thing to do is a NORMAL UPDATE.
              */
 
-
             /* 
              * If cause value #4 is received, the mobile station aborts any 
              * MM connection, deletes any TMSI, LAI and ciphering key 
@@ -865,8 +869,8 @@
                               UNSPEC);
 #if defined (FF_EOTD) AND defined (REL99)
               /*
-               *If there is no MM connection & rrlp is started, start the timer3241
-               *and move MM to state MM_RR_CONN_RELEASE_NOT_ALLOWED
+               * If there is no MM connection & rrlp is started, start the
+	       * timer3241 and move MM to state MM_RR_CONN_RELEASE_NOT_ALLOWED
                */
               if(mm_data->rrlp_lcs_started EQ TRUE)
               {
@@ -891,9 +895,9 @@
               {
 #if defined (FF_EOTD) AND defined (REL99)
                 /*
-                *If there is no MM connection & rrlp is started, start the timer3241
-                *and move MM  to state MM_RR_CONN_RELEASE_NOT_ALLOWED
-                */
+                 * If there is no MM connection & rrlp is started, start the
+		 * timer3241 and move MM to state MM_RR_CONN_RELEASE_NOT_ALLOWED
+                 */
                 if(mm_data->rrlp_lcs_started EQ TRUE)
                 {
                   TIMERSTART(T3241,T_3241_VALUE);
@@ -1016,15 +1020,12 @@
   GET_INSTANCE_DATA;
   TRACE_FUNCTION ("mm_loc_upd_acc()");
 
-
   /* Semantical checks and preprocessing */
   if (loc_upd_accept->loc_area_ident.c_mnc EQ 2)
   {
     loc_upd_accept->loc_area_ident.mnc[2] = 0xf;
   }
 
-  
-  
   switch (GET_STATE (STATE_MM))
   {
     case MM_LUP_INITIATED:
@@ -1145,7 +1146,7 @@
             }
             case 2: /*TYPE_IMEI:*/
             {
-/* Implements Measure 29 and streamline encoding */
+	      /* Implements Measure 29 and streamline encoding */
               mm_send_status(RC_INCORRECT_MESSAGE);
               /* Implementation problem: This should be handled like 
                  LOCATION UPDATING REJECT received with cause NETWORK FAILURE.
@@ -1261,7 +1262,7 @@
           mm_data->loc_upd_type.follow = FOR_PENDING_NO;
           /* PATCH LE 02.12.99
            *
-           * Donīt stop connection if not follow on proceed
+           * Don't stop connection if not follow on proceed
            *
            * mm_mmxx_rel_ind (RELCS_UNSPECIFIED, CM_PENDING);
            * mm_mmxx_rel_ind (RELCS_UNSPECIFIED, CM_NOT_IDLE);
@@ -1376,8 +1377,6 @@
   /* Semantical checks and preprocessing */
   /* MSG(B_MM_STATUS)->rej_cause = for_check_reject_cause (MSG(B_MM_STATUS)->rej_cause); nobody cares */
 
-
-
   switch (GET_STATE (STATE_MM))
   {
     case MM_LUP_INITIATED:
@@ -1665,8 +1664,8 @@
        * [Here the situation is that RR is searching for a cell and no cell is 
        * yet available, but one may be found in a period lesser than 20 seconds
        * and according to the standard an IMSI DETACH shall be performed.
-       * This MM implementation is more simple here, if still searching for a cell, 
-       * the IMSI detach is not done. This may not cause any harm to the
+       * This MM implementation is more simple here, if still searching for a
+       * cell. the IMSI detach is not done. This may not cause any harm to the
        * mobile user, however, it is a minor violation of GSM 04.08.]
        */
       switch (nreg_cause)
@@ -2141,9 +2140,9 @@
         }
 #ifdef REL99
         /*
-         *Stop timer t3241 if it is ruuning. *As per the spec 24.008, Timer T3241
-         *is stopped and reset (but not started) when the MM state
-         *RR CONNECTION RELEASE NOT ALLOWED is left.
+         * Stop timer t3241 if it is running. *As per the spec 24.008, Timer
+         * T3241 is stopped and reset (but not started) when the MM state
+         * RR CONNECTION RELEASE NOT ALLOWED is left.
          */
         TIMERSTOP(T3241);
 #endif