--- a/gsm-fw/g23m-gsm/mm/Makefile	Sat Oct 04 21:45:54 2014 +0000
+++ b/gsm-fw/g23m-gsm/mm/Makefile	Sat Oct 04 22:48:18 2014 +0000
@@ -6,7 +6,7 @@
 	-I../../cdginc
 
 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 mm_pei.o mm_regf.o
+	mm_mms.o mm_pei.o mm_regf.o mm_regp.o
 
 all:	${OBJS}
 

--- a/gsm-fw/g23m-gsm/mm/mm_regp.c	Sat Oct 04 21:45:54 2014 +0000
+++ b/gsm-fw/g23m-gsm/mm/mm_regp.c	Sat Oct 04 22:48:18 2014 +0000
@@ -22,6 +22,10 @@
 #ifndef MM_REGP_C
 #define MM_REGP_C
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+
 #define ENTITY_MM
 
 /*==== INCLUDES ===================================================*/
@@ -1296,10 +1300,10 @@
 GLOBAL void reg_send_sim_sync_req (void)
 {
   GET_INSTANCE_DATA;
-   PALLOC (sync_req, SIM_SYNC_REQ); 
-   sync_req->synccs = (U8)SYNC_MM_FINISHED_READING;
-   PSENDX (SIM, sync_req);
-   mm_data->reg.sim_sync_req_pending = FALSE; 
+  PALLOC (sync_req, SIM_SYNC_REQ); 
+  sync_req->synccs = (U8)SYNC_MM_FINISHED_READING;
+  PSENDX (SIM, sync_req);
+  mm_data->reg.sim_sync_req_pending = FALSE; 
 }
 
 /*
@@ -1388,8 +1392,8 @@
         if (mm_data->reg.upd_sim_ocps_at EQ SAT_UNCHANGED)
         {
           /*
-           * EF PLMNsel can be used if indicated because EF EFPLMNwAcT reading error and
-           * EFOPLMNwAcT is not indicated.
+           * EF PLMNsel can be used if indicated because EF EFPLMNwAcT reading
+	   * error and EFOPLMNwAcT is not indicated.
            */
           mm_data->reg.sim_uocps_at_used = FALSE;
         }
@@ -1398,14 +1402,15 @@
     case SIM_OCPS_ACTEC:
       /*
        * Read Operator controlled PLMN selector with access technology list.
-       * This can happens only after SIM insert indication indicates to read file from SIM.
+       * This can happens only after SIM insert indication indicates to read
+       * file from SIM.
        */
       mm_data->reg.upd_sim_ocps_at  = SAT_UNCHANGED;
       if (sim_read_cnf->cause EQ SIM_NO_ERROR)
       {
         /*
-         * EF PLMNsel will not be used. PLMNsel only be used if EFs EFPLMNwAcT or EFOPLMNwAcT 
-         * are not used. MM should not read EF SIM_PLMNSEL.
+         * EF PLMNsel will not be used. PLMNsel only be used if EFs EFPLMNwAcT
+	 * or EFOPLMNwAcT are not used. MM should not read EF SIM_PLMNSEL.
          */
         mm_data->reg.upd_sim_plmnsel = SAT_UNCHANGED;
 
@@ -1420,10 +1425,10 @@
       }
       else
       {
-        /*
-         * EF PLMNsel can be used if indicated and if there was any error during reading of 
-         * EF EFPLMNwAcT.
-         */
+       /*
+        * EF PLMNsel can be used if indicated and if there was any error
+	* during reading of EF EFPLMNwAcT.
+        */
        TRACE_EVENT_P2 ("SIM read cnf error file:%x, cause:%x",
                          SIM_OCPS_ACTEC, sim_read_cnf->cause);
       }
@@ -1506,9 +1511,8 @@
     /* Acknowledge completion of file update */
     /* SIM_FILE_UPDATE_RES should be sent immediately after response 
       from SIM : Issue 23561*/
-   if(mm_data->reg.sim_file_upd_ind_rec)
+    if(mm_data->reg.sim_file_upd_ind_rec)
     {
-       
       PALLOC (update_res, SIM_FILE_UPDATE_RES); /* T_SIM_FILE_UPDATE_RES */
       update_res->source = SRC_MM;
       update_res->fu_rsc = SIM_FU_SUCCESS;
@@ -1538,7 +1542,6 @@
        mm_build_rr_sync_req_cause (SYNCCS_ACCC);
     }
 
-
     if (mm_data->reg.upd_sim_hplmn NEQ SAT_UNCHANGED)
     {
       if (mm_data->first_attach_mem AND
@@ -1556,7 +1559,6 @@
       }
     }/*end of mm_data->reg.upd_sim_hplmn*/
 
-    
     if (mm_data->reg.upd_sim_act_hplmn NEQ SAT_UNCHANGED )
     {         
       BOOL valid_ahplmn= FALSE;
@@ -1578,9 +1580,9 @@
         mm_mmgmm_ahplmn_ind(&mm_data->reg.acting_hplmn);
 
         /* Delete any Equivalent PLMN list */
-        reg_clear_plmn_list (mm_data->reg.eqv_plmns.eqv_plmn_list, EPLMNLIST_SIZE);
+        reg_clear_plmn_list (mm_data->reg.eqv_plmns.eqv_plmn_list,
+				EPLMNLIST_SIZE);
 
-        
         /* If AHPLMN value read from SIM is same as the RPLMN then inform
          * RR about it. No need of registering again. Set the flag 
          * to true so that hplmn will now be taken from this
@@ -1635,6 +1637,4 @@
   }/*end of reg_read_next_sim_file*/
 }/*end of reg_sim_read_cnf*/
 
-
 #endif
-