# HG changeset patch # User Michael Spacefalcon # Date 1412040027 0 # Node ID 8b11213593417f861cf3df785d16f5411dc3d0cc # Parent 75488f27acdd007f1e5e20b4586c42f1b3f2388d cc_cfk.c compiles diff -r 75488f27acdd -r 8b1121359341 gsm-fw/g23m-gsm/cc/Makefile --- a/gsm-fw/g23m-gsm/cc/Makefile Tue Sep 30 00:44:38 2014 +0000 +++ b/gsm-fw/g23m-gsm/cc/Makefile Tue Sep 30 01:20:27 2014 +0000 @@ -5,7 +5,7 @@ CPPFLAGS=-I. -I../../include -I../../include/condat -I../../gpf/inc \ -I../../cdginc -OBJS= cc_act.o +OBJS= cc_act.o cc_cfk.o all: ${OBJS} diff -r 75488f27acdd -r 8b1121359341 gsm-fw/g23m-gsm/cc/cc_cfk.c --- a/gsm-fw/g23m-gsm/cc/cc_cfk.c Tue Sep 30 00:44:38 2014 +0000 +++ b/gsm-fw/g23m-gsm/cc/cc_cfk.c Tue Sep 30 01:20:27 2014 +0000 @@ -22,6 +22,10 @@ #ifndef CC_CFK_C #define CC_CFK_C +#include "config.h" +#include "fixedconf.h" +#include "condat-features.h" + #define ENTITY_CC /*==== INCLUDES ===================================================*/ @@ -355,7 +359,6 @@ if (bc1->v_fnur != bc2->v_fnur) return FALSE; - if(bc1->v_fnur) { /* @@ -389,28 +392,26 @@ return FALSE; } - - /* - * Octet 6g, Compare Existence and contents - */ - if (bc1->v_acc_ext_288 != bc2->v_acc_ext_288) - return FALSE; - if (bc1->v_acc_ext_288 AND (bc1->acc_ext_288 != bc2->acc_ext_288)) - return FALSE; - if (bc1->v_acc_ext_320 != bc2->v_acc_ext_320) - return FALSE; - if (bc1->v_acc_ext_320 AND (bc1->acc_ext_320 != bc2->acc_ext_320)) - return FALSE; - if (bc1->v_acc_ext_432 != bc2->v_acc_ext_432) - return FALSE; - if (bc1->v_acc_ext_432 AND (bc1->acc_ext_432 != bc2->acc_ext_432)) - return FALSE; - - if (bc1->v_ch_cod_asym != bc2->v_ch_cod_asym) - return FALSE; - if (bc1->v_ch_cod_asym AND (bc1->ch_cod_asym != bc2->ch_cod_asym)) - return FALSE; + * Octet 6g, Compare Existence and contents + */ + if (bc1->v_acc_ext_288 != bc2->v_acc_ext_288) + return FALSE; + if (bc1->v_acc_ext_288 AND (bc1->acc_ext_288 != bc2->acc_ext_288)) + return FALSE; + if (bc1->v_acc_ext_320 != bc2->v_acc_ext_320) + return FALSE; + if (bc1->v_acc_ext_320 AND (bc1->acc_ext_320 != bc2->acc_ext_320)) + return FALSE; + if (bc1->v_acc_ext_432 != bc2->v_acc_ext_432) + return FALSE; + if (bc1->v_acc_ext_432 AND (bc1->acc_ext_432 != bc2->acc_ext_432)) + return FALSE; + + if (bc1->v_ch_cod_asym != bc2->v_ch_cod_asym) + return FALSE; + if (bc1->v_ch_cod_asym AND (bc1->ch_cod_asym != bc2->ch_cod_asym)) + return FALSE; } #endif @@ -432,7 +433,6 @@ } - /* +--------------------------------------------------------------------+ | PROJECT : GSM-PS (6147) MODULE : CC_CFK | @@ -510,7 +510,6 @@ } - /* +--------------------------------------------------------------------+ | PROJECT : GSM-PS (6147) MODULE : CC_CFK | @@ -1606,7 +1605,6 @@ else modify_com->bearer_cap = cc_data->neg_bc2; - if (cc_data->call_type [cc_data->index_ti] EQ CALL_TYPE_MTC) { modify_com->v_reverse_call = TRUE; @@ -1687,7 +1685,7 @@ const T_NAS_fac_inf * fac_inf, UBYTE ss_ver) { - + TRACE_FUNCTION ("cc_build_release()"); release->msg_type = U_RELEASE; @@ -2242,7 +2240,6 @@ }/* cc_check_ms_cap_repeat_indicator_support */ - /* +--------------------------------------------------------------------+ | PROJECT : GSM-PS (6147) MODULE : CC_CFK | @@ -2272,8 +2269,6 @@ cc_data->neg_bcpara2.bearer_serv = NOT_PRESENT_8BIT; cc_data->neg_ri = NOT_PRESENT_8BIT; - - if (setup->v_bearer_cap) { if (cc_check_bc (&setup->bearer_cap, @@ -2565,9 +2560,9 @@ &cc_data->bcpara1, &cc_data->serv1, /* Not used */ &cc_data->negotiation) /* Not used */ - EQ ERROR) + EQ ERROR) return ERROR; /* Not expected to catch */ - + if (!cc_check_capabilities (&cc_data->bcpara1)) return ERROR; /* Not expected to catch */ @@ -2585,7 +2580,7 @@ &cc_data->bcpara2, &cc_data->serv2, /* Not used */ &cc_data->negotiation) - EQ ERROR) + EQ ERROR) return ERROR; /* Bearer caps 2 incompatible */ if (!cc_check_capabilities (&cc_data->bcpara2)) return ERROR; /* Not expected to catch */ @@ -2867,9 +2862,9 @@ break; } case M_CC_ITC_AUXILIARY_SPEECH: - /* - * Speech bearer capability for alternate line service - */ + /* + * Speech bearer capability for alternate line service + */ { bcpara->bearer_serv = MNCC_BEARER_SERV_AUX_SPEECH; @@ -3107,7 +3102,6 @@ } - #ifndef NTRACE /* +--------------------------------------------------------------------+ @@ -3358,14 +3352,14 @@ * check only if transparent M_CC_ASYNCHRONOUS data services are supported */ if (bearer_cap->sync_async NEQ M_CC_ASYNCHRONOUS OR - bearer_cap->sig_access_prot NEQ M_CC_SIAP_I440) /* no async service */ + bearer_cap->sig_access_prot NEQ M_CC_SIAP_I440) /* no async service */ return; switch (bearer_cap->conn_elem) { case M_CC_CE_TRANSPA: neg_bearer_cap->compress = M_CC_COMP_NO; break; - case M_CC_CE_TRANSPA_PREF: /* set to trans async */ + case M_CC_CE_TRANSPA_PREF: /* set to trans async */ case M_CC_CE_RLP_PREF: *negotiation = TRUE; neg_bearer_cap->conn_elem = M_CC_CE_TRANSPA; @@ -3463,14 +3457,14 @@ * check only if non-transparent M_CC_ASYNCHRONOUS data services are supported */ if (bearer_cap->sync_async NEQ M_CC_ASYNCHRONOUS OR - bearer_cap->sig_access_prot NEQ M_CC_SIAP_I440) /* no async service */ + bearer_cap->sig_access_prot NEQ M_CC_SIAP_I440) /* no async service */ return; switch (bearer_cap->conn_elem) { case M_CC_CE_RLP: break; - case M_CC_CE_RLP_PREF: /* set to non-trans async */ + case M_CC_CE_RLP_PREF: /* set to non-trans async */ case M_CC_CE_TRANSPA_PREF: *negotiation = TRUE; neg_bearer_cap->conn_elem = M_CC_CE_RLP; @@ -3485,7 +3479,7 @@ neg_bearer_cap->intermed_rate = M_CC_IR_16_KBIT; break; - case M_CC_CE_TRANSPA: /* transparent service */ + case M_CC_CE_TRANSPA: /* transparent service */ return; default: @@ -3553,7 +3547,7 @@ */ if (bearer_cap->sync_async NEQ M_CC_SYNCHRONOUS OR - bearer_cap->sig_access_prot NEQ M_CC_SIAP_I440) /* no async service */ + bearer_cap->sig_access_prot NEQ M_CC_SIAP_I440) /* no async service */ return FALSE; switch (bearer_cap->conn_elem) @@ -3561,7 +3555,7 @@ case M_CC_CE_TRANSPA: break; - case M_CC_CE_TRANSPA_PREF: /* set to trans async */ + case M_CC_CE_TRANSPA_PREF: /* set to trans async */ case M_CC_CE_RLP_PREF: *negotiation = TRUE; neg_bearer_cap->conn_elem = M_CC_CE_TRANSPA; @@ -3576,7 +3570,7 @@ break; - case M_CC_CE_RLP: /* non-transparent service */ + case M_CC_CE_RLP: /* non-transparent service */ default: return FALSE; } @@ -3635,8 +3629,6 @@ */ - - GLOBAL void cc_build_facility_ind (UBYTE context, UBYTE valid, const T_M_CC_facility * facility ) @@ -3671,7 +3663,6 @@ */ - GLOBAL void cc_build_user_user_ind (UBYTE context, UBYTE valid, T_M_CC_user_user * user_user ) @@ -3803,7 +3794,7 @@ */ if (cc_check_capabilities (bcpara) EQ FALSE) { - /* MS doesn´t support the requested services */ + /* MS doesn't support the requested services */ return ERROR; } @@ -4131,7 +4122,7 @@ TRACE_FUNCTION ("cc_get_ss_diag()"); /* - * Only the following causes may also provide a supplementary diagnostic value + * Only the following causes may also provide a supplementary diagnostic value * - cause 17: User busy - MNCC_CAUSE_USER_BUSY * - cause 29: Facility rejected - MNCC_CAUSE_FACILITY_REJECT * - cause 34: No circuit/channel available - MNCC_CAUSE_NO_CHAN_AVAIL @@ -4169,8 +4160,8 @@ } /* end of switch (curr_cause) */ return ss_diag; - } + /* +--------------------------------------------------------------------+ | PROJECT : GSM-PS (6147) MODULE : CC_CFK |