--- a/gsm-fw/g23m-gsm/mm/Makefile	Sat Oct 04 01:16:19 2014 +0000
+++ b/gsm-fw/g23m-gsm/mm/Makefile	Sat Oct 04 17:35:45 2014 +0000
@@ -5,7 +5,7 @@
 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
+OBJS=	mm_csf.o mm_em.o mm_forf.o mm_forp.o mm_fors.o mm_mmf.o
 
 all:	${OBJS}
 

--- a/gsm-fw/g23m-gsm/mm/mm_mmf.c	Sat Oct 04 01:16:19 2014 +0000
+++ b/gsm-fw/g23m-gsm/mm/mm_mmf.c	Sat Oct 04 17:35:45 2014 +0000
@@ -22,6 +22,10 @@
 #ifndef MM_MMF_C
 #define MM_MMF_C
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+
 #define ENTITY_MM
 
 /*==== INCLUDES ===================================================*/
@@ -47,13 +51,10 @@
 #ifdef _SIMULATION_
   #include "ffs_pc_api.h"
 #else
-  #include "ffs/ffs.h"
+  #include "../../services/ffs/ffs.h"
 #endif
 #include "mm_em.h"
 
-
-
-
 /*==== EXPORT =====================================================*/
 BOOL poor_quality_network = FALSE; /* Hack, maybe needed by CC */
 
@@ -958,8 +959,8 @@
         {
           mm_data->store[j] = mm_data->store[j + 1]; /* Struct copy */
         }        
-          mm_data->store[MAX_STORE_ENTRIES - 1].use = ENTRY_FREE;
-          mm_data->store[MAX_STORE_ENTRIES - 1].content_type = NO_ENTRY;
+        mm_data->store[MAX_STORE_ENTRIES - 1].use = ENTRY_FREE;
+        mm_data->store[MAX_STORE_ENTRIES - 1].content_type = NO_ENTRY;
           
         if (comp < NUM_OF_CM_ENT)
         {
@@ -1420,7 +1421,7 @@
          * paging with IMSI on the old channels after entering an area where 
          * we have network mode II/III or that the mobile rejects a manual 
          * switch to mobile class CS without switch off. 
-         * What is done here may not be perfect, but should be sufficient.         
+         * What is done here may not be perfect, but should be sufficient.
          * In fact, #2 may never be seen in field, as the network providers
          * may not want to sell GPRS subscriptions without GSM subscriptions.
          */
@@ -1566,7 +1567,6 @@
 }
 
 
-
 /*
 +--------------------------------------------------------------------+
 | PROJECT : GSM-PS (6147)       MODULE  : MM_MM                      |
@@ -1598,7 +1598,7 @@
      *   received on the BCCH from the current serving cell and the
      *   attempt counter is smaller than 4:
      *   
-     *   The mobile station shall keep the update status to UPDATED, the MM IDLE 
+     *   The mobile station shall keep the update status to UPDATED, the MM IDLE
      *   sub-state after the RR connection release is NORMAL SERVICE. 
      * (GSM 04.08 4.4.4.9)
      */ 
@@ -1628,7 +1628,7 @@
      *   according to 3GPP TS 23.122 when the RR connection is released. If 
      *   the attempt counter is smaller than 4, the mobile station shall 
      *   memorize that timer T3211 is to be started when the RR connection is 
-     *   released, otherwise it shall memorize that timer T3212 is to be started 
+     *   released, otherwise it shall memorize that timer T3212 is to be started
      *   when the RR connection is released. 
      * (GSM 24.008 4.4.4.9)
      */
@@ -1697,15 +1697,14 @@
           mm_func_mmgmm_net_req();
         }
         else
-      {
+        {
           mm_mmgmm_nreg_ind (NREG_LIMITED_SERVICE, 
                              SEARCH_NOT_RUNNING,
                              FORB_PLMN_NOT_INCLUDED);
           mm_data->reg.quick_hplmn_search = TRUE;
-      }
+        }
       }
-      
-      
+
       if (mm_data->reg.op.sim_ins EQ SIM_INSRT AND 
           mm_data->reg.op.ts EQ TS_NO_AVAIL)
       {
@@ -2462,7 +2461,6 @@
 {
   GET_INSTANCE_DATA;
 
-
   PALLOC (rr_activate_req, RR_ACTIVATE_REQ); /* T_RR_ACTIVATE_REQ */
 
   TRACE_FUNCTION ("mm_rr_act_req()");
@@ -2476,12 +2474,11 @@
   rr_activate_req->cell_test  = mm_data->reg.cell_test;
   rr_activate_req->check_hplmn = CHECK_PLMN_NOT_PRES;
 
- 
   switch (rr_activate_req->op.func)
   {
     case FUNC_LIM_SERV_ST_SRCH:
       mm_data->loc_upd_type.lut = NOT_RUNNING;
-	      
+
       //lint -fallthrough
     case FUNC_ST_PWR_SCAN:
     case FUNC_NET_SRCH_BY_MMI:
@@ -2498,7 +2495,6 @@
               sizeof (T_tmsi_struct));
       memset (&rr_activate_req->bcch_info, 0,
               sizeof (T_bcch_info));
-	  	  
       break;
 
     case FUNC_PLMN_SRCH:
@@ -3656,7 +3652,7 @@
            0xFF, 
            EPLMNLIST_SIZE*UBYTES_PER_PLMN);
 
-   mm_write_eplmn_to_ffs();
+  mm_write_eplmn_to_ffs();
 }
 
 /*
@@ -3732,8 +3728,10 @@
   loc_info_ffs.loc[9]  = 0;
   loc_info_ffs.loc[10] = mm_data->reg.update_stat;
 
-TRACE_EVENT_P7("writelocinfo:%d,%d,%d,%d,%d,%d,%d", loc_info_ffs.loc[4], loc_info_ffs.loc[5], loc_info_ffs.loc[6], loc_info_ffs.loc[7], 
-						loc_info_ffs.loc[8], loc_info_ffs.loc[9], loc_info_ffs.loc[10]);
+  TRACE_EVENT_P7("writelocinfo:%d,%d,%d,%d,%d,%d,%d", loc_info_ffs.loc[4],
+		 loc_info_ffs.loc[5], loc_info_ffs.loc[6], loc_info_ffs.loc[7],
+		 loc_info_ffs.loc[8], loc_info_ffs.loc[9],
+		 loc_info_ffs.loc[10]);
   mm_check_ffs_dirs();
   mm_handle_ffs_write_result(ffs_file_write (simloci_name, 
                                 &loc_info_ffs,