# HG changeset patch
# User Space Falcon <falcon@ivan.Harhan.ORG>
# Date 1426138146 0
# Node ID 09382de17df959328065dde8186a1a006262cc5e
# Parent  5cc8a442efad591b9c6c659ec4391036dab36e8d
aci: integrated up to ati_pdu.c

diff -r 5cc8a442efad -r 09382de17df9 gsm-fw/g23m-aci/aci/Makefile
--- a/gsm-fw/g23m-aci/aci/Makefile	Wed Mar 11 08:27:02 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/Makefile	Thu Mar 12 05:29:06 2015 +0000
@@ -6,7 +6,9 @@
 	-I../../cdginc -I../aci_dti_mng -I../ati_ext -I../ksd
 
 OBJS=	aci_aci.o aci_csf.o aci_em.o aci_lst.o aci_mem.o aci_mfw.o aci_pei.o \
-	aci_tim.o aci_util.o aoc.o ati_bas.o
+	aci_tim.o aci_util.o aoc.o \
+	ati_bas.o ati_cc.o ati_cmd.o ati_cphs.o ati_csc.o ati_dti.o ati_em.o \
+	ati_em_ret.o ati_err.o ati_io.o ati_mm.o ati_mmi.o ati_pdu.o
 
 all:	${OBJS}
 
diff -r 5cc8a442efad -r 09382de17df9 gsm-fw/g23m-aci/aci/ati_cc.c
--- a/gsm-fw/g23m-aci/aci/ati_cc.c	Wed Mar 11 08:27:02 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/ati_cc.c	Thu Mar 12 05:29:06 2015 +0000
@@ -20,6 +20,11 @@
 #ifndef ATI_CC_C
 #define ATI_CC_C
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+#include "aci_conf.h"
+
 #undef DUMMY_ATI_STRINGS
 
 #include "aci_all.h"
@@ -138,7 +143,7 @@
     cmd.ctrl_params     = BAT_CMD_AT_D;
     cmd.params.ptr_at_d = &bat_dial;
     
-#pragma message(__TODO__"atD(): check for UCS2 dial string before bat_send()")    
+#warning "atD(): check for UCS2 dial string before bat_send()"
 
     bat_dial.c_dial_string = strlen(cl);
     if (bat_dial.c_dial_string)
@@ -204,9 +209,9 @@
                          lenAlpha,
                          (UBYTE*)cvtdAlpha,
                          &lenCvtdAlpha,
-#ifdef REL99
+    #ifdef REL99
                          sizeof(cvtdAlpha),
-#endif
+    #endif
                          GSM_ALPHA_Int);
   #endif /* #ifdef NO_ASCIIZ */
         t_p = cvtdAlpha;
@@ -2107,7 +2112,7 @@
       }
       ACI_MALLOC (calLst, MAX_CALL_NR * sizeof (T_ACI_CLCC_CALDESC));
       (void)qAT_PlusCLCC((T_ACI_CMD_SRC)srcId, calLst); /* Always returns AT_CMPL */
-	  
+
       /* 20 is approximatly the amount of extra characters (like ",") */
 
       for( lstIdx = 0; lstIdx < MAX_CALL_NR; lstIdx++ )
@@ -2619,13 +2624,13 @@
     for(i=0; i<blackl.blCount; i++) /* output black list */
     {
         type = (UBYTE)toa_merge(blackl.blNum[i].type);
-		for(j=0; j<blackl.blNum[i].numb_len; j++)
+	for(j=0; j<blackl.blNum[i].numb_len; j++)
         {
           blackl.blNum[i].number[j] = (blackl.blNum[i].number[j] | 0x30);
         }
         sprintf(g_sa,"%s:\"%s\",%d","%RDLB",blackl.blNum[i].number,
                                          (int)type);
-		io_sendMessage(srcId, g_sa, ATI_NORMAL_OUTPUT);
+	io_sendMessage(srcId, g_sa, ATI_NORMAL_OUTPUT);
     }
   }
   else
diff -r 5cc8a442efad -r 09382de17df9 gsm-fw/g23m-aci/aci/ati_cmd.c
--- a/gsm-fw/g23m-aci/aci/ati_cmd.c	Wed Mar 11 08:27:02 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/ati_cmd.c	Thu Mar 12 05:29:06 2015 +0000
@@ -20,6 +20,11 @@
 #ifndef ACI_CMD_C
 #define ACI_CMD_C
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+#include "aci_conf.h"
+
 #undef DUMMY_ATI_STRINGS
 
 #include "aci_all.h"
@@ -223,7 +228,7 @@
 #ifdef SIM_PERS
  /*For %MEPD -for querying ME Personalisation Data... Added on 11/03/2005*/
 EXTERN T_ATI_RSLT  setatPercentMEPD(CHAR *cl, UBYTE srcId);
- #endif
+#endif
 
 EXTERN T_ATI_RSLT atPlusCBC  (CHAR *cl, UBYTE srcId);
 EXTERN T_ATI_RSLT setatPlusCMUT (CHAR *cl, UBYTE srcId);
diff -r 5cc8a442efad -r 09382de17df9 gsm-fw/g23m-aci/aci/ati_cphs.c
--- a/gsm-fw/g23m-aci/aci/ati_cphs.c	Wed Mar 11 08:27:02 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/ati_cphs.c	Thu Mar 12 05:29:06 2015 +0000
@@ -15,6 +15,11 @@
 #ifndef ATI_CPHS_C
 #define ATI_CPHS_C
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+#include "aci_conf.h"
+
 #include "aci_all.h"
 #include "aci_cmh.h"
 #include "ati_cmd.h"
@@ -313,7 +318,7 @@
   if (ret NEQ AT_CMPL)
   {
     cmdCmeError(CME_ERR_OpNotAllow);
-	MFREE(line_desc);
+    MFREE(line_desc);
     return(ATI_FAIL);
   }
 
diff -r 5cc8a442efad -r 09382de17df9 gsm-fw/g23m-aci/aci/ati_csc.c
--- a/gsm-fw/g23m-aci/aci/ati_csc.c	Wed Mar 11 08:27:02 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/ati_csc.c	Thu Mar 12 05:29:06 2015 +0000
@@ -21,6 +21,11 @@
 #ifndef ATI_CSC_C
 #define ATI_CSC_C
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+#include "aci_conf.h"
+
 #undef DUMMY_ATI_STRINGS
 
 #include "aci_all.h"
diff -r 5cc8a442efad -r 09382de17df9 gsm-fw/g23m-aci/aci/ati_dti.c
--- a/gsm-fw/g23m-aci/aci/ati_dti.c	Wed Mar 11 08:27:02 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/ati_dti.c	Thu Mar 12 05:29:06 2015 +0000
@@ -12,6 +12,11 @@
              managment
 */
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+#include "aci_conf.h"
+
 #ifdef DTI
 
 #ifndef ATI_DTI_C
@@ -45,7 +50,7 @@
 
 #endif /* FF_ATI_BAT */
 /*==== EXPORT ==================================================*/
-EXTERN CHAR  *cmdCmeError ( T_ACI_CMS_ERR e );
+EXTERN CHAR  *cmdCmeError ( T_ACI_CME_ERR e );
 EXTERN CHAR  *parse(CHAR *b,CHAR *f, ...);
 
 /*==== VARIABLE====================================================*/
diff -r 5cc8a442efad -r 09382de17df9 gsm-fw/g23m-aci/aci/ati_em.c
--- a/gsm-fw/g23m-aci/aci/ati_em.c	Wed Mar 11 08:27:02 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/ati_em.c	Thu Mar 12 05:29:06 2015 +0000
@@ -18,6 +18,10 @@
 +----------------------------------------------------------------------------- 
 */ 
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+#include "aci_conf.h"
 
 #undef DUMMY_ATI_STRINGS
 
diff -r 5cc8a442efad -r 09382de17df9 gsm-fw/g23m-aci/aci/ati_em_ret.c
--- a/gsm-fw/g23m-aci/aci/ati_em_ret.c	Wed Mar 11 08:27:02 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/ati_em_ret.c	Thu Mar 12 05:29:06 2015 +0000
@@ -22,6 +22,11 @@
 #define ATI_EM_RET_C
 #endif
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+#include "aci_conf.h"
+
 #include "aci_all.h"
 /*===== INCLUDES ===================================================*/
 #include "aci_cmh.h"
@@ -453,7 +458,7 @@
 #else
        io_sendMessage(srcId, g_sa, ATI_ECHO_OUTPUT); /* send without CRLF */
 #endif
-	   
+
        sprintf(g_sa, "%d,%d,%d,%d,%d,%d", 
                val_tmp->em_u.em_amr_val.amr_cod_prop[0].amr_codec_thr,  val_tmp->em_u.em_amr_val.amr_cod_prop[0].amr_codec_hyst,              
                val_tmp->em_u.em_amr_val.amr_cod_prop[1].amr_codec_thr,  val_tmp->em_u.em_amr_val.amr_cod_prop[1].amr_codec_hyst,
diff -r 5cc8a442efad -r 09382de17df9 gsm-fw/g23m-aci/aci/ati_err.c
--- a/gsm-fw/g23m-aci/aci/ati_err.c	Wed Mar 11 08:27:02 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/ati_err.c	Thu Mar 12 05:29:06 2015 +0000
@@ -25,6 +25,11 @@
 #ifndef ATI_ERR_C
 #define ATI_ERR_C
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+#include "aci_conf.h"
+
 #undef DUMMY_ATI_STRINGS
 
 #include "aci_all.h"
diff -r 5cc8a442efad -r 09382de17df9 gsm-fw/g23m-aci/aci/ati_io.c
--- a/gsm-fw/g23m-aci/aci/ati_io.c	Wed Mar 11 08:27:02 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/ati_io.c	Thu Mar 12 05:29:06 2015 +0000
@@ -21,6 +21,11 @@
 #ifndef ATI_IO_C
 #define ATI_IO_C
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+#include "aci_conf.h"
+
 #undef DUMMY_ATI_STRINGS
 
 #include "aci_all.h"
diff -r 5cc8a442efad -r 09382de17df9 gsm-fw/g23m-aci/aci/ati_mm.c
--- a/gsm-fw/g23m-aci/aci/ati_mm.c	Wed Mar 11 08:27:02 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/ati_mm.c	Thu Mar 12 05:29:06 2015 +0000
@@ -21,6 +21,11 @@
 #ifndef ATI_MM_C
 #define ATI_MM_C
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+#include "aci_conf.h"
+
 #undef DUMMY_ATI_STRINGS
 
 #include "aci_all.h"
@@ -893,25 +898,27 @@
   PURPOSE : show list of all available entries in the SIM field EF_HPLMNwAcT.
             
             Command            Possible Response
-		        %CHPL=oprFrmt      %CHPL: <opr>
-		        %CHPL=?            %CHPL: (list of supported <oprFrmt>s)
+            %CHPL=oprFrmt      %CHPL: <opr>
+            %CHPL=?            %CHPL: (list of supported <oprFrmt>s)
 
             <oprFrmt>:
               0    long format alphanumeric <opr>
-	            1    short format alphanumeric <opr>
-	            2    numeric <opr>
+              1    short format alphanumeric <opr>
+              2    numeric <opr>
 
             <opr>: string type; <oprFrmt> indicates if the format is
               alphanumeric or numeric.
               Long alphanumeric can be up to 16 characters.
-	            Short alphanumeric can be up to 8 characters.
-		        Numeric format is the GSM LAI number, which consists of:
-			        3 BCD country code.
-			        2 BCD network code.
-		The returned <opr> string shall not be in BCD format, but
-		in IRA characters converted from BCD. Hence the number
-		will have the structure (CC digit 3)(CC digit 2)(CC digit 1)
-		(NW digit 2)(NW digit 1).
+              Short alphanumeric can be up to 8 characters.
+
+            Numeric format is the GSM LAI number, which consists of:
+              3 BCD country code.
+              2 BCD network code.
+
+	The returned <opr> string shall not be in BCD format, but
+	in IRA characters converted from BCD. Hence the number
+	will have the structure (CC digit 3)(CC digit 2)(CC digit 1)
+	(NW digit 2)(NW digit 1).
 
 */
 
diff -r 5cc8a442efad -r 09382de17df9 gsm-fw/g23m-aci/aci/ati_mmi.c
--- a/gsm-fw/g23m-aci/aci/ati_mmi.c	Wed Mar 11 08:27:02 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/ati_mmi.c	Thu Mar 12 05:29:06 2015 +0000
@@ -22,6 +22,11 @@
 #ifndef ATI_MMI_C
 #define ATI_MMI_C
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+#include "aci_conf.h"
+
 #include "aci_all.h"
 
 #include "aci_cmh.h"
diff -r 5cc8a442efad -r 09382de17df9 gsm-fw/g23m-aci/aci/ati_pdu.c
--- a/gsm-fw/g23m-aci/aci/ati_pdu.c	Wed Mar 11 08:27:02 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/ati_pdu.c	Thu Mar 12 05:29:06 2015 +0000
@@ -21,6 +21,11 @@
 #ifndef ATI_PDU_C
 #define ATI_PDU_C
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+#include "aci_conf.h"
+
 #undef DUMMY_ATI_STRINGS
 
 #include "aci_all.h"