# HG changeset patch
# User Space Falcon <falcon@ivan.Harhan.ORG>
# Date 1425858121 0
# Node ID 79ccc6a27a95e8de8491ab84f26448e1a5be1b11
# Parent  3eb43280161d059dd05889994257e03504b48e5e
gsm-fw/g23m-aci/aci: aci_*.c modules compile

diff -r 3eb43280161d -r 79ccc6a27a95 gsm-fw/g23m-aci/aci/Makefile
--- a/gsm-fw/g23m-aci/aci/Makefile	Sun Mar 08 02:22:34 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/Makefile	Sun Mar 08 23:42:01 2015 +0000
@@ -3,9 +3,10 @@
 
 CFLAGS=	-O2 -fno-builtin -mthumb-interwork -mthumb
 CPPFLAGS=-I. -I../../include -I../../include/condat -I../../gpf/inc \
-	-I../../cdginc -I../ati_ext
+	-I../../cdginc -I../aci_dti_mng -I../ati_ext -I../ksd
 
-OBJS=	aci_aci.o
+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
 
 all:	${OBJS}
 
diff -r 3eb43280161d -r 79ccc6a27a95 gsm-fw/g23m-aci/aci/aci_csf.c
--- a/gsm-fw/g23m-aci/aci/aci_csf.c	Sun Mar 08 02:22:34 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/aci_csf.c	Sun Mar 08 23:42:01 2015 +0000
@@ -22,6 +22,11 @@
 #ifndef ACI_CSF_C
 #define ACI_CSF_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 3eb43280161d -r 79ccc6a27a95 gsm-fw/g23m-aci/aci/aci_em.c
--- a/gsm-fw/g23m-aci/aci/aci_em.c	Sun Mar 08 02:22:34 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/aci_em.c	Sun Mar 08 23:42:01 2015 +0000
@@ -24,6 +24,11 @@
 #define ACI_EM_C
 #endif
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+#include "aci_conf.h"
+
 #include "aci_all.h"
 /*===== INCLUDES ===================================================*/
 
diff -r 3eb43280161d -r 79ccc6a27a95 gsm-fw/g23m-aci/aci/aci_lst.c
--- a/gsm-fw/g23m-aci/aci/aci_lst.c	Sun Mar 08 02:22:34 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/aci_lst.c	Sun Mar 08 23:42:01 2015 +0000
@@ -22,6 +22,11 @@
 #define ACI_LST_C
 #endif
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+#include "aci_conf.h"
+
 #include "aci_all.h"
 
 /*==== INCLUDES ===================================================*/
diff -r 3eb43280161d -r 79ccc6a27a95 gsm-fw/g23m-aci/aci/aci_mem.c
--- a/gsm-fw/g23m-aci/aci/aci_mem.c	Sun Mar 08 02:22:34 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/aci_mem.c	Sun Mar 08 23:42:01 2015 +0000
@@ -21,6 +21,11 @@
 #define ACI_MEM_C
 #endif
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+#include "aci_conf.h"
+
 #include "aci_all.h"
 
 #include "aci_mem.h"
diff -r 3eb43280161d -r 79ccc6a27a95 gsm-fw/g23m-aci/aci/aci_mfw.c
--- a/gsm-fw/g23m-aci/aci/aci_mfw.c	Sun Mar 08 02:22:34 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/aci_mfw.c	Sun Mar 08 23:42:01 2015 +0000
@@ -23,6 +23,11 @@
 #define ACI_MFW_C
 #endif
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+#include "aci_conf.h"
+
 #include "aci_all.h"
 
 #include "aci_cmh.h"
diff -r 3eb43280161d -r 79ccc6a27a95 gsm-fw/g23m-aci/aci/aci_pei.c
--- a/gsm-fw/g23m-aci/aci/aci_pei.c	Sun Mar 08 02:22:34 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/aci_pei.c	Sun Mar 08 23:42:01 2015 +0000
@@ -22,12 +22,17 @@
 #ifndef ACI_PEI_C
 #define ACI_PEI_C
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+#include "aci_conf.h"
+
 #include "aci_all.h"
 
 #include "ccdapi.h"
 #include "cnf_aci.h"
 #include "mon_aci.h"  /* mouais... */
-#include "P_ACI.val"    /* SKA 2002-09-02 for MAX_CMD_LEN */
+#include "p_aci.val"    /* SKA 2002-09-02 for MAX_CMD_LEN */
 #include "line_edit.h"  /* SKA 2002-09-02                 */
 #include "aci_cmh.h"
 #include "ati_cmd.h"
@@ -35,7 +40,7 @@
 #include "aci.h"
 #include "aci_mem.h"
 
-#ifndef _SIMULATION_
+#if 0 //#ifndef _SIMULATION_	// FreeCalypso change
 #include "rv_swe.h"
 #ifdef RVM_GIL_SWE
 #include "gil/gil_gpf.h" /* MMI_GIL_IND dispatch function */
diff -r 3eb43280161d -r 79ccc6a27a95 gsm-fw/g23m-aci/aci/aci_tim.c
--- a/gsm-fw/g23m-aci/aci/aci_tim.c	Sun Mar 08 02:22:34 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/aci_tim.c	Sun Mar 08 23:42:01 2015 +0000
@@ -22,6 +22,11 @@
 #ifndef ACI_TIM_C
 #define ACI_TIM_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 3eb43280161d -r 79ccc6a27a95 gsm-fw/g23m-aci/aci/aci_util.c
--- a/gsm-fw/g23m-aci/aci/aci_util.c	Sun Mar 08 02:22:34 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/aci_util.c	Sun Mar 08 23:42:01 2015 +0000
@@ -25,6 +25,11 @@
 #define ACI_UTIL_C
 #endif
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+#include "aci_conf.h"
+
 #include "aci_all.h"
 
 #include "aci_cmh.h" 
@@ -586,7 +591,7 @@
           flag = TRUE;
           break;
         }
-        #ifdef REL99
+#ifdef REL99
         else
         {
           /* There is a chance that this is in the mapping table */
@@ -735,7 +740,7 @@
           out[outIdx++] = (UBYTE)j;
           break;
         }
-      #ifdef REL99
+#ifdef REL99
         else
         {
           /* There is a chance that this is in the mapping table */
@@ -880,7 +885,7 @@
           out[outIdx++] = (UBYTE)j;
           break;
         }
-      #ifdef REL99
+#ifdef REL99
         else
         {
           /* There is a chance that this is in the mapping table */
@@ -1113,7 +1118,7 @@
     {
       tmp  = 0x0000 + gsmToAsciiTable[*in];
     }
-    #ifdef REL99
+#ifdef REL99
     else
     {
       UBYTE ext_tbl_idx = 0;
@@ -1571,7 +1576,7 @@
               val = (UBYTE)j;
               break;
             }
-          #ifdef REL99
+#ifdef REL99
            else
            {
              /* There is a chance that this is in the mapping table */
@@ -2060,7 +2065,7 @@
       tblIdx = 0;
 
       while ( tblIdx <= 0xFF                                             AND
-              chset[CSCS_CHSET_Ira][tblIdx] NEQ (( UBYTE )in[inIdx] | 0x80 ))              
+              chset[CSCS_CHSET_Ira][tblIdx] NEQ (( UBYTE )in[inIdx] | 0x80 ))
         tblIdx++;
 
       if ( tblIdx <= 0xFF )