freecalypso-citrine: L1/cfile/l1

comparison L1/cfile/l1_async.c @ 8:b36540edb046

L1/cfile/l1_*.c: initial import from tcs211-l1-reconst

author	Mychaela Falconia <falcon@freecalypso.org>
date	Thu, 09 Jun 2016 05:45:03 +0000
parents	75a11d740a02
children	b80f0c5016ee

comparison

equal deleted inserted replaced

-:b7d857ebc9ca
+:b36540edb046
 *  Copyright 2003 (C) Texas Instruments
 *
 ************* Revision Controle System Header *************/
 //#pragma DUPLICATE_FOR_INTERNAL_RAM_START
-#include "config.h"
+#include "l1_macro.h"
 #include "l1_confg.h"
-#include "l1_macro.h"
 //#pragma DUPLICATE_FOR_INTERNAL_RAM_END
 #if !((MOVE_IN_INTERNAL_RAM == 1) && (GSM_IDLE_RAM !=0))  // MOVE TO INTERNAL MEM IN CASE GSM_IDLE_RAM enabled
 //#pragma GSM_IDLE_DUPLICATE_FOR_INTERNAL_RAM_START         // KEEP IN EXTERNAL MEM otherwise
 #include "l1_types.h"
 #include "sys_types.h"
 #include "l1_const.h"
 #include "l1_time.h"
 #include "l1_signa.h"
-#include "../../gpf/inc/cust_os.h"
+#include "cust_os.h"
 #if TESTMODE
 #include "l1tm_defty.h"
 #include "l1tm_signa.h"
 #endif
 #if (AUDIO_TASK == 1)
 #if (L1_AAC == 1)
 #include "l1aac_defty.h"
 #include "l1aac_signa.h"
 #endif
 #if (L1_DYN_DSP_DWNLD == 1)
+#include <stdio.h>
 #include "l1_dyn_dwl_signa.h"
 #endif
 #include "l1_defty.h"
 #include "l1_msgty.h"
 #if L1_RECOVERY
 #if ((CHIPSET == 12) || (CHIPSET == 15))
 #include "sys_inth.h"
 #else
-#include "../../bsp/iq.h"
+#include "iq.h"
-#include "../../bsp/inth.h"
+#include "inth.h"
-#include "../../bsp/mem.h"
+#include "mem.h"
 #endif
 #endif
 #if (VCXO_ALGO == 1)
 #include "l1_ctl.h"
 #endif
 // Speech recognition reco process
 extern void l1a_mmi_sr_reco_process         (xSignalHeaderRec *msg);
 // Speech recognition update-check process
 extern void l1a_mmi_sr_update_check_process (xSignalHeaderRec *msg);
 #endif
-#if (L1_AEC == 1)
+#if (AEC)
-// AEC process
-extern void l1a_mmi_aec_process             (xSignalHeaderRec *msg);
-#endif
-#if (L1_AEC == 2)
 // AEC process
 extern void l1a_mmi_aec_process             (xSignalHeaderRec *msg);
 #endif
 #if (FIR)
 // FIR process
 // Speech recognition reco process
 l1a_mmi_sr_reco_process(msg);
 // Speech recognition update-check process
 l1a_mmi_sr_update_check_process(msg);
 #endif
-#if (L1_AEC == 1)
+#if (AEC)
-// AEC process
-l1a_mmi_aec_process(msg);
-#endif
-#if (L1_AEC == 2)
 // AEC process
 l1a_mmi_aec_process(msg);
 #endif
 #if (FIR)
 // FIR process
 l1a_mmi_vocoder_cfg_process(msg);
 #endif // L1_VOCODER_IF_CHANGE == 1
 #if(L1_BT_AUDIO ==1)
 l1a_mmi_bt_process(msg);
 #endif // L1_VOCODER_IF_CHANGE == 1
 /*
-* FreeCalypso change: the following call to l1a_mmi_outen_cfg_process()
+	* FreeCalypso Frankenstein: the following call to
-* (a function that doesn't exist in the Leonardo objects) has been
+	* l1a_mmi_outen_cfg_process() was totally unconditional
-* moved inside the #if (AUDIO_TASK == 1) conditional, otherwise
+	* in the LoCosto source we got, but no such function
-* the link fails - it is definitely an audio function of some kind.
+	* exists in TCS211.  To be investigated further when
-*/
+	* we reach the audio stuff.
-l1a_mmi_outen_cfg_process(msg);
+	*/
+#if 0
+l1a_mmi_outen_cfg_process(msg);
+#endif
 #endif //AUDIO TASK
 // Only processes supported by GSM IDLE in Internal RAM
 #if (GSM_IDLE_RAM > 1)
 #if L1_GPRS
 return;
 }
 // Look for first free location within L1 structure.
 while((neigh_number < 6) && (l1a_l1s_com.bcchn.list[neigh_number].status != NSYNC_FREE))
-	{
-	    if(neigh_number != 5 )
 neigh_number++;
-	}
 // Download neighbour info from request message.
 //----------------------------------------------
 // Sub the serving cell timeslot number to the Neigh./Serving timing
 // difference to format it for L1S use.
 time_alignmt =time_alignmt_mem;
 fn_offset    =fn_offset_mem;
 l1a_sub_timeslot(&time_alignmt, &fn_offset, l1a_l1s_com.dl_tn);
-	if (neigh_number < 6 )
-	{
 l1a_l1s_com.bcchn.list[neigh_number].radio_freq    = ((T_MPHC_NCELL_BCCH_REQ *)(msg->SigP))->radio_freq;
 l1a_l1s_com.bcchn.list[neigh_number].fn_offset     = fn_offset;
 l1a_l1s_com.bcchn.list[neigh_number].time_alignmt  = time_alignmt;
 l1a_l1s_com.bcchn.list[neigh_number].tsc           = ((T_MPHC_NCELL_BCCH_REQ *)(msg->SigP))->tsc;
 l1a_l1s_com.bcchn.list[neigh_number].gprs_priority = TOP_PRIORITY;
 #else
 l1a_l1s_com.bcchn.list[neigh_number].gprs_priority = NORMAL_PRIORITY;
 #endif
-	}
 // Enable L1S activity on this new neighbour task BCCH.
-if (neigh_number < 6 )//OMAPS00090550
 l1a_l1s_com.bcchn.list[neigh_number].status  = NSYNC_PENDING;
 l1a_l1s_com.bcchn.current_list_size         += 1;
 l1a_l1s_com.l1s_en_task[task] = TASK_ENABLED;
 j=0;
 while(!((radio_freq == l1a_l1s_com.bcchn.list[j].radio_freq) &&
 (l1a_l1s_com.bcchn.list[j].status != NSYNC_FREE)) &&
 (j < 6))
 {
-				if(j < 5 ) //OMAPS00090550
-				{
 	j++;
-				}
-				else
-				{
-					j++;
-					break;
-				}
 }
 // If found, reset L1 structure for this carrier.
 if(j<6)
 {
 #endif
 };
 UWORD8  *state      = &l1a.state[I_6MP];
 UWORD32  SignalCode = msg->SignalCode;
-static  UWORD8   sb_attempt;
 #if (L1_12NEIGH == 1)
 static  UWORD8   list_size;
 #endif
 /*                                                       */
 /* Reset messages (input):   MPHC_STOP_CCCH_REQ          */
 /* -----------------------  (MPHC_STOP_CCCH_CON)         */
 /*                                                       */
 /*-------------------------------------------------------*/
-//Nina added
+/*
+* FreeCalypso Frankenstein: the source we got with LoCosto contains
+* some logic, apparently designed to increase opportunities for
+* deep sleep, marked with "Nina added" comments.  This addition by
+* Nina showed up on our radar because it makes use of a new member
+* in the l1s structure which is not present in the TCS211 version
+* of this data structure, which we are not allowed to change while
+* deblobbing L1 one module at a time.  I am going to turn Nina's
+* addition into a conditional compilation option. -- Mychaela
+*/
+#define	NINA_ADDED	0
+#if NINA_ADDED
 INT8 last_page_mode = 2; //REORG;
-//End Nina added
+#endif
 void l1a_idle_serving_cell_paging_process(xSignalHeaderRec *msg)
 {
 enum states
 {
 RESET             = 0,
 l1a_l1s_com.l1s_en_task[EP]   = TASK_DISABLED;  // Reset EP   task enable flag.
 l1a_l1s_com.l1s_en_task[ALLC] = TASK_DISABLED;  // Reset ALLC (reorg) task enable flag.
 // No Paging  => no gauging => no Deep sleep
 //Nina modify to save power, not forbid deep sleep, only force gauging in next paging
+#if NINA_ADDED
 if(l1s.force_gauging_next_paging_due_to_CCHR == 0) // Force gauging next paging
+#endif
 l1s.pw_mgr.enough_gaug = FALSE;  // forbid Deep sleep
 }
 break;
 {
 if (SignalCode == MPHC_START_CCCH_REQ)
 {
 // download page mode from message (msg)
 page_mode = ((T_MPHC_START_CCCH_REQ *)(msg->SigP))->page_mode;
-//Nina added
+#if NINA_ADDED
 if(((last_page_mode == NORMAL) && (page_mode == EXTENDED)) ||
 	((last_page_mode == EXTENDED) && (page_mode == NORMAL)))
 {
 l1s.force_gauging_next_paging_due_to_CCHR = 1;
 }
 			last_page_mode = page_mode;
-//End Nina added
+#endif
 if(page_mode == REORG)
 // Request to enter the PAGING REORGANIZATION paging mode.
 //--------------------------------------------------------
 // L1 must start the Serving cell paging monitoring in PAGING REORGANIZATION
 {
 if(SignalCode == MPHC_START_CCCH_REQ)
 {
 // download paging mode from msg
 page_mode = ((T_MPHC_START_CCCH_REQ *)(msg->SigP))->page_mode;
-//Nina added
+#if NINA_ADDED
 			if(((last_page_mode == NORMAL) && (page_mode == EXTENDED)) ||
 				((last_page_mode == EXTENDED) && (page_mode == NORMAL)))
 			{
 			l1s.force_gauging_next_paging_due_to_CCHR = 1;
 			}
 			last_page_mode = page_mode;
-//End Nina added
+#endif
 if ((page_mode == NORMAL) || (page_mode == REORG))
 {
 // Step in state machine.
 *state = RESET;
 }
 l1a_l1s_com.l1s_en_task[NP] = TASK_ENABLED;  // Set NP task enable flag.
 l1a_l1s_com.l1s_en_task[EP] = TASK_ENABLED;  // Set EP task enable flag also.
 // Paging parameters change => perform the gauging on the next paging
 //Nina modify to save power, not forbid deep sleep, only force gauging in next paging
+#if NINA_ADDED
 if(l1s.force_gauging_next_paging_due_to_CCHR == 0)
+#endif
 l1s.pw_mgr.enough_gaug = FALSE;  // forbid Deep sleep until next gauging
 //End Nina modify
 // end of process
 static WORD16   static_attempt_counter_0;
 static WORD16   static_attempt_counter_1;
-static UWORD8   static_first_synch_flag = TRUE;
 static UWORD8   static_sb_found_flag;
 static UWORD8   static_bsic;
 static UWORD32  static_fn_offset;
 static UWORD32  static_time_alignmt;
 static UWORD8   static_timing_validity;
 };
 UWORD8                *state      = &l1a.state[I_SMSCB];
 UWORD32                SignalCode = msg->SignalCode;
-UWORD32                first_block_0 =0;
+UWORD32                first_block_0;
-UWORD32                first_block_1= 0;
+UWORD32                first_block_1;
-BOOL                   extended_cbch =FALSE; //oamps00090550
+BOOL                   extended_cbch;
-T_CBCH_HEAD_SCHEDULE  *cbch_schedule_ptr= NULL ;
+T_CBCH_HEAD_SCHEDULE  *cbch_schedule_ptr;
 UWORD8                 schedule_length;
 BOOL end_process = 0;
 while(!end_process)
 // End of process.
 return;
 }
 }
-else
+#if 0	/* match TCS211 */
-if(SignalCode == L1C_DEDIC_DONE)
+else
-{
+if(SignalCode == L1C_DEDIC_DONE)
+{
 // Stop SMSCB task.
 l1a_l1s_com.l1s_en_task[SMSCB] = TASK_DISABLED;
 // Set "parameter synchro semaphore for SMSCB task.
 l1a_l1s_com.task_param[SMSCB] = SEMAPHORE_SET;
 	    l1a_l1s_com.norm_cbch_schedule.cbch_state = CBCH_INACTIVE;
 	    l1a_l1s_com.ext_cbch_schedule.cbch_state  = CBCH_INACTIVE;
 	    // Step in state machine.
 *state = RESET;
+}
-}
+#endif
 else
 // No action in this machine for other messages.
 //----------------------------------------------
 {
 }
 break;
 case SET_SCHEDULE:
 {
-if(cbch_schedule_ptr != NULL)
-{
 UWORD8  i,j;
 UWORD8  mf51_offset;
 // Choose schedule table according to the considered CBCH (normal or extended).
 if(extended_cbch) mf51_offset = 4*51;  // Offset to read TB4.
 // Activate SMSCB task.
 l1a_l1s_com.l1s_en_task[SMSCB] = TASK_ENABLED;   // Set SMSCB task enable flag.
 // Step in state machine.
 *state = WAIT_RESULT;
-}
 // End of process.
 return;
 }
 // Step in state machine.
 *state = WAIT_FOR_CHANGE;
 }
 else
-if((SignalCode == MPHC_STOP_CBCH_REQ)||(SignalCode == L1C_DEDIC_DONE))
+//if((SignalCode == MPHC_STOP_CBCH_REQ)||(SignalCode == L1C_DEDIC_DONE))
+if(SignalCode == MPHC_STOP_CBCH_REQ)
 // Request to (may be partially) STOP reading the CBCH.
 //-----------------------------------------------------
 {
 // This process must be reset.
 *state = WAIT_FOR_CHANGE;
 /*-------------------------------------------------------*/
 void l1a_dedicated_process(xSignalHeaderRec *msg)
 {
 enum states
 {
-RESET     = 0,
+RESET          = 0,
-WAIT_INIT = 1,
+WAIT_INIT      = 1,
-WAIT_MSG  = 2
+WAIT_DYN_DWNLD = 2,
+WAIT_MSG       = 3
 };
 T_DEDIC_SET  *free_set;
 UWORD8       *state      = &l1a.state[DEDICATED];
 UWORD32       SignalCode = msg->SignalCode;
 // Set "fset" pointer to the new parameter set.
 l1a_l1s_com.dedic_set.fset = free_set;
-// Give new msg code to L1S.
+/*
-l1a_l1s_com.dedic_set.SignalCode = MPHC_IMMED_ASSIGN_REQ;
+* FreeCalypso: the following logic related to dynamic DSP
+* patching has been reconstructed from our only available
-#if (TRACE_TYPE==5) && FLOWCHART
+* binary object version.
-trace_flowchart_dedic(l1a_l1s_com.dedic_set.SignalCode);
+*/
-#endif
+#if (L1_DYN_DSP_DWNLD == 1)
+if (l1a.dyn_dwnld.semaphore_vect[DEDI_STATE_MACHINE]==GREEN)
-// Set confirmation message name.
+#endif
-l1a.confirm_SignalCode = MPHC_IMMED_ASSIGN_CON;
+{
+// Give new msg code to L1S.
-// step in state machine.
+l1a_l1s_com.dedic_set.SignalCode = MPHC_IMMED_ASSIGN_REQ;
-*state = WAIT_MSG;
+#if (TRACE_TYPE==5) && FLOWCHART
+trace_flowchart_dedic(l1a_l1s_com.dedic_set.SignalCode);
+#endif
+// Set confirmation message name.
+l1a.confirm_SignalCode = MPHC_IMMED_ASSIGN_CON;
+// step in state machine.
+*state = WAIT_MSG;
+}
+#if (L1_DYN_DSP_DWNLD == 1)
+else
+{
+*state = WAIT_DYN_DWNLD;
+#if ((TRACE_TYPE == 1) || (TRACE_TYPE == 4) || (TRACE_TYPE == 5))
+if((trace_info.current_config->l1_dyn_trace) & (1<<L1_DYN_TRACE_DYN_DWNLD))
+{
+char str[30];
+sprintf(str,"DEDI SM blocked by DYN DWNLD\r\n");
+#if(CODE_VERSION == SIMULATION)
+trace_fct_simu_dyn_dwnld(str);
+#else
+rvt_send_trace_cpy((T_RVT_BUFFER)str,trace_info.l1_trace_user_id,strlen(str),RVT_ASCII_FORMAT);
+#endif
+}
+#endif    // (TRACE_TYPE == 1) || (TRACE_TYPE == 4)
+}
+#endif
 }
 break;
 case MPHC_CHANNEL_ASSIGN_REQ:
 // Channel assignement message.
 free_set->cell_desc.time_alignmt     = time_alignmt;
 free_set->cell_desc.fn_offset        = fn_offset;
 free_set->cell_desc.meas.acc         = 0;
 free_set->cell_desc.meas.nbr_meas    = 0;
+#if 0	/* FreeCalypso TCS211 reconstruction */
 #if (L1_FF_MULTIBAND == 0) // TBD
 free_set->cell_desc.traffic_meas_beacon = l1a_l1s_com.last_input_level[radio_freq - l1_config.std.radio_freq_index_offset];
 free_set->cell_desc.traffic_meas        = l1a_l1s_com.last_input_level[radio_freq - l1_config.std.radio_freq_index_offset];
 #else // L1_FF_MULTIBAND = 1 below
 l1_multiband_radio_freq_convert_into_operative_radio_freq(radio_freq);
 free_set->cell_desc.traffic_meas_beacon = l1a_l1s_com.last_input_level[operative_radio_freq];
 free_set->cell_desc.traffic_meas        = l1a_l1s_com.last_input_level[operative_radio_freq];
 #endif // #if (L1_FF_MULTIBAND == 1) else
+#endif
 // Download the message content.
 free_set->chan1.desc           = ((T_MPHC_SYNC_HO_REQ *)(msg->SigP))->handover_command.channel_desc_1;
 free_set->chan1.desc_bef_sti   = ((T_MPHC_SYNC_HO_REQ *)(msg->SigP))->handover_command.channel_desc_1_bef_sti;
 free_set->chan1.mode           = ((T_MPHC_SYNC_HO_REQ *)(msg->SigP))->handover_command.channel_mode_1;
 // end of process.
 end_process = 1;
 }
 break;
+/*
+* FreeCalypso: the following logic related to dynamic DSP
+* patching has been reconstructed from our only available
+* binary object version.
+*/
+#if (L1_DYN_DSP_DWNLD == 1)
+case WAIT_DYN_DWNLD:
+{
+if((SignalCode==API_L1_DYN_DWNLD_FINISHED) && (l1a.dyn_dwnld.semaphore_vect[DEDI_STATE_MACHINE] == GREEN))
+{
+/* replicate the code that would have executed originally */
+// Give new msg code to L1S.
+l1a_l1s_com.dedic_set.SignalCode = MPHC_IMMED_ASSIGN_REQ;
+#if (TRACE_TYPE==5) && FLOWCHART
+trace_flowchart_dedic(l1a_l1s_com.dedic_set.SignalCode);
+#endif
+// Set confirmation message name.
+l1a.confirm_SignalCode = MPHC_IMMED_ASSIGN_CON;
+#if ((TRACE_TYPE == 1) || (TRACE_TYPE == 4) || (TRACE_TYPE == 5))
+if((trace_info.current_config->l1_dyn_trace) & (1<<L1_DYN_TRACE_DYN_DWNLD))
+{
+char str[30];
+sprintf(str,"DEDI SM un-blocked\r\n");
+#if(CODE_VERSION == SIMULATION)
+trace_fct_simu_dyn_dwnld(str);
+#else
+rvt_send_trace_cpy((T_RVT_BUFFER)str,trace_info.l1_trace_user_id,strlen(str),RVT_ASCII_FORMAT);
+#endif
+}
+#endif    // (TRACE_TYPE == 1) || (TRACE_TYPE == 4)
+// step in state machine.
+*state = WAIT_MSG;
+}
+// End process
+end_process = 1;
+}
+break;
+#endif
 case WAIT_MSG:
 {
 switch(SignalCode)
 // switch on input message.
 //-------------------------------
 //         1   |    1   Acouustic devices
 //         1   |    0   speech encoder
 //         0   |    1   speech decoder
 //         0   |    0   no test
-#if ((ANALOG == 1) || (ANALOG == 2) || (ANALOG == 3) || (ANALOG == 11))
+#if ((ANLG_FAM == 1) || (ANLG_FAM == 2) || (ANLG_FAM == 3) || (ANLG_FAM == 11))
 vbctl3 = ( (l1s_dsp_com.dsp_ndb_ptr ->d_dai_onoff & 0xE7FF) |
 (dai_vbctl3[((T_OML1_START_DAI_TEST_REQ *)(msg->SigP))->tested_device] << 11) );
 l1s_dsp_com.dsp_ndb_ptr ->d_dai_onoff = vbctl3 | TRUE;
 #endif
 UWORD32  vbctl3;
 // DAI test is stopped "on fly".
 l1a_l1s_com.dedic_set.aset->dai_mode = 0;
-#if ((ANALOG == 1) || (ANALOG == 2) || (ANALOG == 3))
+#if ((ANLG_FAM == 1) || (ANLG_FAM == 2) || (ANLG_FAM == 3))
 // program vbctl3
 vbctl3 = (l1s_dsp_com.dsp_ndb_ptr ->d_dai_onoff & 0xE7FF);
 l1s_dsp_com.dsp_ndb_ptr ->d_dai_onoff = vbctl3 | TRUE;
 #endif
 };
 UWORD8  *state      = &l1a.state[DEDIC_6];
 UWORD32  SignalCode = msg->SignalCode;
-// use only in packet transfer mode
-// these variables memorize this SBCNF parameters.
-static UWORD32  time_alignmt_mem;
-static UWORD32  fn_offset_mem;
 //#if !L1_R99
 static UWORD8   nb_fb_attempt;
 //#endif
 // For EOTD purpose we need of flag to identify 1st/last SB Serving Cell
 case NSYNC_CONFIG:
 {
 UWORD8   neigh_id = l1a_l1s_com.nsync.first_in_list;
-UWORD32  time_alignmt =0; //omaps00090550
+UWORD32  time_alignmt;
-UWORD32  fn_offset=0; //omaps00090550;
+UWORD32  fn_offset;
 // Request to acquire FB/SB or to confirm FB or SB from one ncell.
 //----------------------------------------------------------------
 // Abort if there is no room for a new neighbour synchro request.
 if(l1a_l1s_com.nsync.current_list_size >= NBR_NEIGHBOURS)
 }
 }
 // disable all tasks
 l1a_l1s_com.l1s_en_task[NSYNC] = TASK_DISABLED;
+l1a_l1s_com.l1s_en_task[FB51]  = TASK_DISABLED;
+l1a_l1s_com.l1s_en_task[FB26]  = TASK_DISABLED;
+l1a_l1s_com.l1s_en_task[SB51]  = TASK_DISABLED;
+l1a_l1s_com.l1s_en_task[SB26]  = TASK_DISABLED;
+l1a_l1s_com.l1s_en_task[SBCNF26]  = TASK_DISABLED;
+l1a_l1s_com.l1s_en_task[SBCNF51]  = TASK_DISABLED;
 // Set semaphores for all neighbor relative task.
 l1a_l1s_com.task_param[NSYNC]= SEMAPHORE_SET;     // Set NSYNC   task semaphore.
 l1a_l1s_com.task_param[FB51] = SEMAPHORE_SET;     // Set FB51    task semaphore.
 l1a_l1s_com.task_param[FB26] = SEMAPHORE_SET;     // Set FB26    task semaphore.
 l1a_l1s_com.nsync.eotd_meas_session = FALSE;
 #endif
 // Disable neighbor sync. tasks.
 l1a_l1s_com.l1s_en_task[NSYNC] = TASK_DISABLED;
+l1a_l1s_com.l1s_en_task[FB51]  = TASK_DISABLED;
+l1a_l1s_com.l1s_en_task[FB26]  = TASK_DISABLED;
+l1a_l1s_com.l1s_en_task[SB51]  = TASK_DISABLED;
+l1a_l1s_com.l1s_en_task[SB26]  = TASK_DISABLED;
+l1a_l1s_com.l1s_en_task[SBCNF26]  = TASK_DISABLED;
+l1a_l1s_com.l1s_en_task[SBCNF51]  = TASK_DISABLED;
 if(array_size != NBR_NEIGHBOURS)
 {
 // Stop some of the Neighb. synchro.
 for(i=0;i<array_size;i++)
 // If found, reset L1 structure for this carrier.
 if(j<NBR_NEIGHBOURS)
 {
 l1a_l1s_com.nsync.list[j].status = NSYNC_FREE;
 l1a_l1s_com.nsync.current_list_size --;
-				if (l1a_l1s_com.nsync.list[l1a_l1s_com.nsync.active_fb_id].radio_freq == radio_freq)
+#if 0	/* FreeCalypso: match TCS211 object */
-l1a_l1s_com.l1s_en_task[FB26]  = TASK_DISABLED;
+if (l1a_l1s_com.nsync.list[l1a_l1s_com.nsync.active_fb_id].radio_freq == radio_freq)
+l1a_l1s_com.l1s_en_task[FB26]  = TASK_DISABLED;
+#endif
 }
 }
 }
 else
 {
 ((l1a.confirm_SignalCode == MPHC_SYNC_HO_CON) ||
 (l1a.confirm_SignalCode == MPHC_PRE_SYNC_HO_CON) ||
 (l1a.confirm_SignalCode == MPHC_ASYNC_HO_CON) ||
 (l1a.confirm_SignalCode == MPHC_HANDOVER_FAIL_CON)) )
 {
+#if 0	/* LoCosto L1 code, doesn't match TCS211 */
 l1a_l1s_com.l1s_en_task[NSYNC] = TASK_DISABLED;
 l1a_l1s_com.l1s_en_task[FB51]  = TASK_DISABLED;
 l1a_l1s_com.l1s_en_task[FB26]  = TASK_DISABLED;
 l1a_l1s_com.l1s_en_task[SB51]  = TASK_DISABLED;
 l1a_l1s_com.l1s_en_task[SB26]  = TASK_DISABLED;
 *state = SELECT_BEST_NSYNC;
 // Enable neighbour sync task.
 l1a_l1s_com.l1s_en_task[NSYNC] = TASK_ENABLED;
 } // if
+#else
+/* code from TSM30 version, matches TCS211 object */
+#if (L1_EOTD ==1)
+// FN and time reference are WRONG for remaining neigbours....
+// --> abort all.
+l1a_l1s_com.nsync.eotd_meas_session = FALSE;
+#endif
+// Step in state machine.
+*state = STOP_NSYNC;
+break;
+#endif
 } // if
 else
 {
 // Channel changes : Restart all neighbors
 }
 break;
 case WAIT_INIT:
 {
+#if 0	/* FreeCalypso: match TCS211 object */
 #if (OP_SAP == 0)
 if (SignalCode == MPHC_UPDATE_BA_LIST)
 #else
 if (SignalCode == MPHC_UPDATE_BA_LIST_REQ)
 #endif /* if (OP_SAP == 0) */
 // step in state machine.
 *state = WAIT_RESULT;
 }
 else
+#endif	/* FreeCalypso TCS211 reconstruction */
 if(SignalCode == L1C_DEDIC_DONE)
 // We enter DEDICATED mode.
 //-------------------------
 {
+#if 0	/* FreeCalypso: match TCS211 object */
 #if (CODE_VERSION == NOT_SIMULATION)
 if (l1a_l1s_com.ba_list.nbr_carrier == 0)
 return;
+#endif
 #endif
 // Set parameter synchro semaphore for D_BAMS task.
 l1a_l1s_com.meas_param |= D_BAMS_MEAS;

FreeCalypso > hg > freecalypso-citrine

comparison L1/cfile/l1_async.c @ 8:b36540edb046