FreeCalypso > hg > freecalypso-sw

changeset 795:b93cee08a2e1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
aci: cmh_mm?.c done
author Space Falcon <falcon@ivan.Harhan.ORG>
date Mon, 16 Mar 2015 03:51:37 +0000
parents b380a85d77d5
children ac09e56b4e3b
files gsm-fw/g23m-aci/aci/Makefile gsm-fw/g23m-aci/aci/cmh_mmr.c gsm-fw/g23m-aci/aci/cmh_mms.c gsm-fw/g23m-aci/aci/cmh_mmt.c
diffstat 4 files changed, 56 insertions(+), 51 deletions(-) [+]
line wrap: on
line diff
--- a/gsm-fw/g23m-aci/aci/Makefile	Mon Mar 16 03:31:35 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/Makefile	Mon Mar 16 03:51:37 2015 +0000
@@ -13,7 +13,7 @@
 	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_mmf.o cmh_mmiq.o cmh_mmir.o cmh_mmis.o \
-	cmh_mmit.o cmh_mmq.o
+	cmh_mmit.o cmh_mmq.o cmh_mmr.o cmh_mms.o cmh_mmt.o
 
 all:	${OBJS}
 
--- a/gsm-fw/g23m-aci/aci/cmh_mmr.c	Mon Mar 16 03:31:35 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/cmh_mmr.c	Mon Mar 16 03:51:37 2015 +0000
@@ -24,6 +24,11 @@
 #define CMH_MMR_C
 #endif
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+#include "aci_conf.h"
+
 #include "aci_all.h"
 
 /*==== INCLUDES ===================================================*/
@@ -162,7 +167,7 @@
 | PROJECT : GSM-PS (6147)    MODULE  : CMH_MMR                      |
 |                            ROUTINE : cmhMM_Deregistered           |
 +-------------------------------------------------------------------+
-	
+
   PURPOSE : ME is deregistered from network
 
 */
--- a/gsm-fw/g23m-aci/aci/cmh_mms.c	Mon Mar 16 03:31:35 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/cmh_mms.c	Mon Mar 16 03:51:37 2015 +0000
@@ -23,6 +23,11 @@
 #define CMH_MMS_C
 #endif
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+#include "aci_conf.h"
+
 #include "aci_all.h"
 
 /*==== INCLUDES ===================================================*/
@@ -66,7 +71,7 @@
 #define DONT_LET_FFSH_DEF_GPRS
 #endif
 
-#include "ffs/ffs.h"
+#include "../../services/ffs/ffs.h"
 
 #include "rx.h"
 
@@ -1181,89 +1186,81 @@
 {
   T_MM_CMD_PRM * pMMCmdPrm;  /* points to MM command parameters */
 
-
   T_ACI_NRG_RGMD regMode; /*NRG Registration mode */
   T_ACI_NRG_FRMT regFormat; 
   T_ACI_NRG_SVMD  svrMode;
 
-
   TRACE_FUNCTION ("sat_Plus_Percent_COPS()");
 
-
   pMMCmdPrm = &cmhPrm[srcId].mmCmdPrm;
   mmShrdPrm.COPSmodeBeforeAbort = mmShrdPrm.COPSmode;
   
-/*
+ /*
   *  check MM entity status
   */
   if( mmEntStat.curCmd NEQ AT_CMD_NONE )
-
     return( AT_BUSY );
 
-
-/*
+ /*
   *convert  format to NRG type and set the COPS format value.
   */
 
+  if( format EQ COPS_FRMT_NotPresent )
+    format = pMMCmdPrm -> COPSfrmt;
 
-if( format EQ COPS_FRMT_NotPresent ) format = pMMCmdPrm -> COPSfrmt;
-
-  
   switch( format )
   {
     case(    COPS_FRMT_NotPresent): 
-    regFormat = NRG_FRMT_NotPresent; 
-    break;
+      regFormat = NRG_FRMT_NotPresent; 
+      break;
     case(   COPS_FRMT_Numeric ): 
-    regFormat =NRG_FRMT_Numeric ; 
-    break;
+      regFormat =NRG_FRMT_Numeric ; 
+      break;
     case( COPS_FRMT_Short):
-    regFormat = NRG_FRMT_Short; 
-    break;
+      regFormat = NRG_FRMT_Short; 
+      break;
     case( COPS_FRMT_Long):
-    regFormat = NRG_FRMT_Long; 
-    break;
+      regFormat = NRG_FRMT_Long; 
+      break;
     default:
       ACI_ERR_DESC( ACI_ERR_CLASS_Ext, EXT_ERR_Parameter );
       return( AT_FAIL );
   }
 
-pMMCmdPrm -> COPSfrmt = format;
-
+  pMMCmdPrm -> COPSfrmt = format;
 
-
-/*
+ /*
   * The function cmhMM_OperatorSelect() is using the NRG types. Therefore the following conversion is required.
   * Also the appropiate value for Service Mode, required by cmhMM_OperatorSelect(),  is set. 
   */
 
+  if( mode EQ COPS_MOD_NotPresent )
+    mode = mmShrdPrm.COPSmode;
 
-if( mode EQ COPS_MOD_NotPresent ) mode = mmShrdPrm.COPSmode;
-
-switch( mode )
+  switch( mode )
   {
     case( COPS_MOD_NotPresent   ): 
-    regMode = NRG_RGMD_NotPresent; 
-    svrMode = NRG_SVMD_NotPresent;
-    break;
+      regMode = NRG_RGMD_NotPresent; 
+      svrMode = NRG_SVMD_NotPresent;
+      break;
     case(  COPS_MOD_Auto  ): 
-    regMode =NRG_RGMD_Auto ; 
-    svrMode = NRG_SVMD_Full;    /* Only Full Service makes sense for Automatic Mode */
-    break;
+      regMode =NRG_RGMD_Auto ; 
+      svrMode = NRG_SVMD_Full;    /* Only Full Service makes sense for Automatic Mode */
+      break;
     case(  COPS_MOD_Man):
-    regMode = NRG_RGMD_Manual; 
-    svrMode = NRG_SVMD_Full;   /* Only Full Service makes sense for Manual Mode */ 
-    break;
+      regMode = NRG_RGMD_Manual; 
+      svrMode = NRG_SVMD_Full;   /* Only Full Service makes sense for Manual Mode */ 
+      break;
     case(  COPS_MOD_Dereg):
-    regMode = NRG_RGMD_Dereg; 
-    svrMode = NRG_SVMD_Limited;    
-    break;
+      regMode = NRG_RGMD_Dereg; 
+      svrMode = NRG_SVMD_Limited;    
+      break;
     case(   COPS_MOD_Both ): 
-    regMode = NRG_RGMD_Both; 
-    svrMode = NRG_SVMD_Full;  /* Only Full Service makes sense for the Both Mode */
-    break;
+      regMode = NRG_RGMD_Both; 
+      svrMode = NRG_SVMD_Full;  /* Only Full Service makes sense for the Both Mode */
+      break;
     case(COPS_MOD_SetOnly):  /*This mode can be fully handled in this function */
-       /* DO NOT SET mmShrdPrm.COPSmode !!! */
+      /* DO NOT SET mmShrdPrm.COPSmode !!! */
       pMMCmdPrm -> COPSfrmt = format;
       return AT_CMPL;
     default:
@@ -1271,16 +1268,14 @@
       return( AT_FAIL );
   }
 
-mmShrdPrm.COPSmode = mode;
-
-
+  mmShrdPrm.COPSmode = mode;
 
-/*Set the value of the current command executed */
-mmEntStat.curCmd  = cmd;  
+  /*Set the value of the current command executed */
+  mmEntStat.curCmd  = cmd;  
 
-return cmhMM_OperatorSelect(srcId,regMode,svrMode,regFormat,oper);
- 
+  return cmhMM_OperatorSelect(srcId,regMode,svrMode,regFormat,oper);
 }
+
 #ifdef TI_PS_FF_AT_P_CMD_CTREG
 /*
 +--------------------------------------------------------------------+
--- a/gsm-fw/g23m-aci/aci/cmh_mmt.c	Mon Mar 16 03:31:35 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/cmh_mmt.c	Mon Mar 16 03:51:37 2015 +0000
@@ -23,6 +23,11 @@
 #define CMH_MMT_C
 #endif
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+#include "aci_conf.h"
+
 #include "aci_all.h"
 
 /*==== INCLUDES ===================================================*/