changeset 692:c1cda30fda52

cc_est.c compiles
author Michael Spacefalcon <msokolov@ivan.Harhan.ORG>
date Tue, 30 Sep 2014 01:38:39 +0000
parents e7b45d295580
children 59f088f893a5
files gsm-fw/g23m-gsm/cc/Makefile gsm-fw/g23m-gsm/cc/cc_est.c
diffstat 2 files changed, 29 insertions(+), 25 deletions(-) [+]
line wrap: on
line diff
--- a/gsm-fw/g23m-gsm/cc/Makefile	Tue Sep 30 01:29:41 2014 +0000
+++ b/gsm-fw/g23m-gsm/cc/Makefile	Tue Sep 30 01:38:39 2014 +0000
@@ -5,7 +5,7 @@
 CPPFLAGS=-I. -I../../include -I../../include/condat -I../../gpf/inc \
 	-I../../cdginc
 
-OBJS=	cc_act.o cc_cfk.o cc_csf.o cc_em.o
+OBJS=	cc_act.o cc_cfk.o cc_csf.o cc_em.o cc_est.o
 
 all:	${OBJS}
 
--- a/gsm-fw/g23m-gsm/cc/cc_est.c	Tue Sep 30 01:29:41 2014 +0000
+++ b/gsm-fw/g23m-gsm/cc/cc_est.c	Tue Sep 30 01:38:39 2014 +0000
@@ -22,6 +22,10 @@
 #ifndef CC_EST_C
 #define CC_EST_C
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+
 #define ENTITY_CC
 /*==== INCLUDES ===================================================*/
 
@@ -1142,9 +1146,9 @@
             {
               MCAST (rel_com, U_RELEASE_COMP);
               cc_build_release_complete (rel_com, CAUSE_MAKE(DEFBY_STD, 
-                                                                      ORIGSIDE_MS, 
-                                                                      MNCC_CC_ORIGINATING_ENTITY,
-                                                                      MNCC_CAUSE_USER_BUSY));
+                                                    ORIGSIDE_MS, 
+                                                    MNCC_CC_ORIGINATING_ENTITY,
+                                                    MNCC_CAUSE_USER_BUSY));
               for_release_complete (rel_com);
             }
             CCD_END;
@@ -1239,14 +1243,14 @@
             MCAST (est_cnf, U_CC_EST_CONF);
             if (cc_count_active_connections () EQ 0)
               cc_build_cc_est_confirm (est_cnf, CAUSE_MAKE(DEFBY_CONDAT, 
-                                                                    ORIGSIDE_MS, 
-                                                                    MNCC_CC_ORIGINATING_ENTITY,
-                                                                    NOT_PRESENT_8BIT));
+                                                    ORIGSIDE_MS, 
+                                                    MNCC_CC_ORIGINATING_ENTITY,
+                                                    NOT_PRESENT_8BIT));
             else
               cc_build_cc_est_confirm (est_cnf, CAUSE_MAKE(DEFBY_STD, 
-                                                                    ORIGSIDE_MS, 
-                                                                    MNCC_CC_ORIGINATING_ENTITY,
-                                                                    MNCC_CAUSE_USER_BUSY));
+                                                    ORIGSIDE_MS, 
+                                                    MNCC_CC_ORIGINATING_ENTITY,
+                                                    MNCC_CAUSE_USER_BUSY));
             for_cc_est_confirm (est_cnf);
           }
           CCD_END;
@@ -1439,9 +1443,9 @@
             MCAST (rel_com, U_RELEASE_COMP);
 
             cc_build_release_complete (rel_com, CAUSE_MAKE(DEFBY_STD, 
-                                                                    ORIGSIDE_MS, 
-                                                                    MNCC_CC_ORIGINATING_ENTITY,
-                                                                    cc_data->error));
+                                                    ORIGSIDE_MS, 
+                                                    MNCC_CC_ORIGINATING_ENTITY,
+                                                    cc_data->error));
             for_release_complete (rel_com);
           }
           CCD_END;
@@ -1457,9 +1461,9 @@
               {
                 MCAST (rel_com, U_RELEASE_COMP);
                 cc_build_release_complete (rel_com, CAUSE_MAKE(DEFBY_STD, 
-                                                                        ORIGSIDE_MS, 
-                                                                        MNCC_CC_ORIGINATING_ENTITY,
-                                                                        MNCC_CAUSE_NO_ROUTE));
+                                                    ORIGSIDE_MS, 
+                                                    MNCC_CC_ORIGINATING_ENTITY,
+                                                    MNCC_CAUSE_NO_ROUTE));
                 for_release_complete (rel_com);
               }
               CCD_END;
@@ -1473,9 +1477,9 @@
               {
                 MCAST (rel_com, U_RELEASE_COMP);
                 cc_build_release_complete (rel_com, CAUSE_MAKE(DEFBY_STD, 
-                                                                        ORIGSIDE_MS, 
-                                                                        MNCC_CC_ORIGINATING_ENTITY,
-                                                                        MNCC_CAUSE_INCOMPAT_DEST));
+                                                    ORIGSIDE_MS, 
+                                                    MNCC_CC_ORIGINATING_ENTITY,
+                                                    MNCC_CAUSE_INCOMPAT_DEST));
                 for_release_complete (rel_com);
               }
               CCD_END;
@@ -1518,14 +1522,14 @@
   
                 if (cc_count_active_connections () EQ 0)
                   cc_build_call_confirm (call_cnf, CAUSE_MAKE(DEFBY_CONDAT, 
-                                                                       ORIGSIDE_MS, 
-                                                                       MNCC_CC_ORIGINATING_ENTITY,
-                                                                       NOT_PRESENT_8BIT));
+                                                    ORIGSIDE_MS, 
+                                                    MNCC_CC_ORIGINATING_ENTITY,
+                                                    NOT_PRESENT_8BIT));
                 else
                   cc_build_call_confirm (call_cnf, CAUSE_MAKE(DEFBY_STD, 
-                                                                       ORIGSIDE_MS, 
-                                                                       MNCC_CC_ORIGINATING_ENTITY,
-                                                                       MNCC_CAUSE_USER_BUSY));
+                                                    ORIGSIDE_MS, 
+                                                    MNCC_CC_ORIGINATING_ENTITY,
+                                                    MNCC_CAUSE_USER_BUSY));
                 for_call_confirm (call_cnf);
               }
               CCD_END;