FreeCalypso > hg > freecalypso-sw

changeset 793:c77d5b1fd6a2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
aci: got to cmh_mmq.c, compilation failure (something to do with RTC), remains to be investigated and fixed
author Space Falcon <falcon@ivan.Harhan.ORG>
date Fri, 13 Mar 2015 00:29:36 +0000
parents 44bac38197dd
children b380a85d77d5
files gsm-fw/g23m-aci/aci/Makefile gsm-fw/g23m-aci/aci/cmh_mmf.c gsm-fw/g23m-aci/aci/cmh_mmiq.c gsm-fw/g23m-aci/aci/cmh_mmir.c gsm-fw/g23m-aci/aci/cmh_mmis.c gsm-fw/g23m-aci/aci/cmh_mmit.c gsm-fw/g23m-aci/aci/cmh_mmq.c
diffstat 7 files changed, 49 insertions(+), 37 deletions(-) [+]
line wrap: on
line diff
--- a/gsm-fw/g23m-aci/aci/Makefile	Thu Mar 12 22:11:27 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/Makefile	Fri Mar 13 00:29:36 2015 +0000
@@ -12,7 +12,8 @@
 	ati_prs.o ati_ret.o ati_sat.o ati_sim.o ati_sms.o ati_src_sat.o \
 	ati_src_uart.o ati_src_uart_io.o ati_ss.o \
 	cmh_ccf.o cmh_ccq.o cmh_ccr.o cmh_ccs.o cmh_cphs.o cmh_dmy.o cmh_dti.o \
-	cmh_emq.o cmh_emr.o cmh_f.o
+	cmh_emq.o cmh_emr.o cmh_f.o cmh_mmf.o cmh_mmiq.o cmh_mmir.o cmh_mmis.o \
+	cmh_mmit.o cmh_mmq.o
 
 all:	${OBJS}
 
--- a/gsm-fw/g23m-aci/aci/cmh_mmf.c	Thu Mar 12 22:11:27 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/cmh_mmf.c	Fri Mar 13 00:29:36 2015 +0000
@@ -22,7 +22,12 @@
 #ifndef CMH_MMF_C
 #define CMH_MMF_C
 #endif
- 
+
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+#include "aci_conf.h"
+
 #include "aci_all.h"
 
 /*==== INCLUDES ===================================================*/
@@ -68,7 +73,7 @@
 
 
 #ifndef _SIMULATION_
-#include "ffs/ffs.h"
+#include "../../services/ffs/ffs.h"
 #include "ffs_coat.h"
 #endif /* !_SIMULATION_ */
 
@@ -467,11 +472,6 @@
     sim_mcc = operListFixed[i].mcc;
     sim_mnc = operListFixed[i].mnc;
 
-
-
-
-
-
     if (cmhSIM_plmn_equal_sim (mcc, mnc, sim_mcc, sim_mnc))
     {
       strncpy (plmnDesc->longName, 
@@ -1949,7 +1949,7 @@
             mmShrdPrm.regMode = MODE_AUTO;
             mmShrdPrm.owner = (T_OWN)srcId;
             mmEntStat.entOwn = srcId;			
-	    		
+
 
 #ifdef GPRS 
       /*   Taken from the former sAT_PlusCOPS()
@@ -2107,7 +2107,7 @@
         simEntStat.curCmd = AT_CMD_NRG;
         simShrdPrm.owner = (T_OWN)srcId;
         simEntStat.entOwn = srcId;
-			
+
         if( psaSIM_ActivateSIM() < 0 )   /* activate SIM card */
         {
           TRACE_EVENT( "FATAL RETURN psaSIM in %%NRG" );
@@ -2182,7 +2182,7 @@
           else
           {
             mmShrdPrm.regMode = MODE_AUTO;
-	     mmShrdPrm.owner = (T_OWN)srcId;		
+            mmShrdPrm.owner = (T_OWN)srcId;		
             mmEntStat.entOwn  = srcId;
 #ifdef  GPRS
             if( psaG_MM_CMD_REG ( ) < 0 )  /* register to network */
--- a/gsm-fw/g23m-aci/aci/cmh_mmiq.c	Thu Mar 12 22:11:27 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/cmh_mmiq.c	Fri Mar 13 00:29:36 2015 +0000
@@ -23,6 +23,11 @@
 #define CMH_MMIQ_C
 #endif
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+#include "aci_conf.h"
+
 #include "aci_all.h"
 
 /*==== INCLUDES ===================================================*/
@@ -149,7 +154,7 @@
     return cmhSIM_ReqLanguage_LP_or_ELP ( srcId, SIM_ELP );
   }     
 
-   return( AT_CMPL );
+  return( AT_CMPL );
 }
 
 /*
@@ -185,7 +190,7 @@
     return( AT_FAIL );
   }
 
-   pPHBCmdPrm = &cmhPrm[srcId].phbCmdPrm;
+  pPHBCmdPrm = &cmhPrm[srcId].phbCmdPrm;
 
 /*
  *-------------------------------------------------------------------
@@ -255,13 +260,3 @@
 }
 
 /*==== EOF ========================================================*/
-
-
-
-
-
-
-
-
-
-
--- a/gsm-fw/g23m-aci/aci/cmh_mmir.c	Thu Mar 12 22:11:27 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/cmh_mmir.c	Fri Mar 13 00:29:36 2015 +0000
@@ -24,6 +24,11 @@
 #define CMH_MMIR_C
 #endif
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+#include "aci_conf.h"
+
 #include "aci_all.h"
 
 /*==== INCLUDES ===================================================*/
--- a/gsm-fw/g23m-aci/aci/cmh_mmis.c	Thu Mar 12 22:11:27 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/cmh_mmis.c	Fri Mar 13 00:29:36 2015 +0000
@@ -23,6 +23,11 @@
 #define CMH_MMIS_C
 #endif
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+#include "aci_conf.h"
+
 #include "aci_all.h"
 
 /*==== INCLUDES ===================================================*/
--- a/gsm-fw/g23m-aci/aci/cmh_mmit.c	Thu Mar 12 22:11:27 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/cmh_mmit.c	Fri Mar 13 00:29:36 2015 +0000
@@ -23,6 +23,11 @@
 #define CMH_MMIT_C
 #endif
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+#include "aci_conf.h"
+
 #include "aci_all.h"
 
 /*==== INCLUDES ===================================================*/
--- a/gsm-fw/g23m-aci/aci/cmh_mmq.c	Thu Mar 12 22:11:27 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/cmh_mmq.c	Fri Mar 13 00:29:36 2015 +0000
@@ -28,6 +28,11 @@
 #define CMH_MMQ_C
 #endif
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+#include "aci_conf.h"
+
 #include "aci_all.h"
 
 /*==== INCLUDES ===================================================*/
@@ -72,8 +77,7 @@
 #define DONT_LET_FFSH2_DEF_GPRS
 #endif
 
-#include "ffs/ffs.h"
-
+#include "../../services/ffs/ffs.h"
 
 /* check whether latter has defined GPRS !!! */
 #ifdef DONT_LET_FFSH2_DEF_GPRS
@@ -620,30 +624,27 @@
 
   *regMode = cmhPrm[srcId].mmCmdPrm.NRGregMode;
 
-   switch( *oprFrmt )
+  switch( *oprFrmt )
   {
     case(  NRG_FRMT_NotPresent  ): 
-    copsFormat = COPS_FRMT_NotPresent; 
-    break;
+      copsFormat = COPS_FRMT_NotPresent; 
+      break;
     case( NRG_FRMT_Numeric   ): 
-    copsFormat = COPS_FRMT_Numeric  ; 
-    break;
+      copsFormat = COPS_FRMT_Numeric  ; 
+      break;
     case( NRG_FRMT_Short):
-    copsFormat = COPS_FRMT_Short ; 
-    break;
+      copsFormat = COPS_FRMT_Short ; 
+      break;
     case( NRG_FRMT_Long):
-    copsFormat = COPS_FRMT_Long; 
-    break;
+      copsFormat = COPS_FRMT_Long; 
+      break;
     default:
       ACI_ERR_DESC( ACI_ERR_CLASS_Ext, EXT_ERR_Parameter );
       return( AT_FAIL );
   }
 
-
   cmhMM_OperatorQuery(srcId,copsFormat,oper);
 
-  
-
   return( AT_CMPL );
 }