FreeCalypso > hg > freecalypso-sw
changeset 678:a7865809c863
alr_dedi.c compiles
author | Michael Spacefalcon <msokolov@ivan.Harhan.ORG> |
---|---|
date | Mon, 29 Sep 2014 05:51:26 +0000 |
parents | a71671d8c2db |
children | a2a65fdc1a99 |
files | gsm-fw/g23m-gsm/alr/Makefile gsm-fw/g23m-gsm/alr/alr_dedi.c |
diffstat | 2 files changed, 9 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/gsm-fw/g23m-gsm/alr/Makefile Mon Sep 29 05:07:39 2014 +0000 +++ b/gsm-fw/g23m-gsm/alr/Makefile Mon Sep 29 05:51:26 2014 +0000 @@ -5,7 +5,7 @@ CPPFLAGS=-I. -I../../include -I../../include/condat -I../../gpf/inc \ -I../../cdginc -OBJS= alr_cbch.o alr_cs.o alr_csf.o +OBJS= alr_cbch.o alr_cs.o alr_csf.o alr_dedi.o all: ${OBJS}
--- a/gsm-fw/g23m-gsm/alr/alr_dedi.c Mon Sep 29 05:07:39 2014 +0000 +++ b/gsm-fw/g23m-gsm/alr/alr_dedi.c Mon Sep 29 05:51:26 2014 +0000 @@ -21,6 +21,10 @@ #ifndef ALR_DEDI_C #define ALR_DEDI_C +#include "config.h" +#include "fixedconf.h" +#include "condat-features.h" + #define ENTITY_PL /*==== INCLUDES ===================================================*/ @@ -529,7 +533,7 @@ &alr_data->dedi_data.old_frequency_list, sizeof (T_frequency_list)); - /* + /* * convert channel numbers if needed */ if (dedi_conversion_needed ()) @@ -1604,8 +1608,6 @@ dedi_cyclically_repeat_kc ((UBYTE *)set_ciph->new_ciph_param.A, (UBYTE *)ciph_req->ciph.kc, KLEN); #endif - - alr_data->dedi_data.act_cipher_mode = set_ciph->cipher_mode; alr_data->dedi_data.act_a5_algorithm = set_ciph->a5_algorithm; memcpy (&alr_data->dedi_data.act_cipher_key, @@ -1807,9 +1809,9 @@ +--------------------------------------------------------------------+ PURPOSE : Fills a frequency list for layer 1. - Condatīs representation is a list of USHORT with + Condat's representation is a list of USHORT with 0xFFFF as delimiter. - TIīs representation is different from this. + TI's representation is different from this. */ @@ -1921,7 +1923,7 @@ +--------------------------------------------------------------------+ PURPOSE : The function converts the channel mode representation - from Condatīs notation (equal to GSM) to TIīs values. + from Condat's notation (equal to GSM) to TI's values. */