freecalypso-sw: gsm-fw/L1/cfile/l1

comparison gsm-fw/L1/cfile/l1_sync.c @ 568:ae24e49c41a9

L1: l1_sync.c compiles for XIP

author	Michael Spacefalcon <msokolov@ivan.Harhan.ORG>
date	Sun, 10 Aug 2014 17:52:59 +0000
parents	96a96ec34139
children	9df89f93d311

comparison

equal deleted inserted replaced

-:528fa901ae79
+:ae24e49c41a9
 *  Copyright 2003 (C) Texas Instruments
 *
 ************* Revision Controle System Header *************/
 //#pragma DUPLICATE_FOR_INTERNAL_RAM_START
+#include "config.h"
+#include "l1_confg.h"
 #include "l1_macro.h"
-#include "l1_confg.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
 #define  L1_SYNC_C
 #if (L1_MIDI == 1)
 #include "l1midi_defty.h"
 #endif
 #include "l1_defty.h"
-#include "cust_os.h"
+#include "../../gpf/inc/cust_os.h"
 #include "l1_msgty.h"
 #include "l1_varex.h"
 #include "l1_proto.h"
 #include "l1_mftab.h"
 #include "l1_tabs.h"
 #if L2_L3_SIMUL
 #include "hw_debug.h"
 #endif // L2_L3 SIMUL
-#include "ulpd.h"
+#include "../../bsp/ulpd.h"
-#include "mem.h"
+#include "../../bsp/mem.h"
-#include "inth.h"
+#include "../../bsp/inth.h"
-#include "iq.h"
+#include "../../bsp/iq.h"
 #if L1_GPRS
 #include "l1p_cons.h"
 #include "l1p_msgt.h"
 #include "l1p_deft.h"
 #else
 #include "csmi/sleep.h"
 #endif
 #endif
-#include "sys_conf.h"
+#if (CHIPSET >= 12)
+#include "sys_conf.h"
+#endif
 #if (OP_L1_STANDALONE != 1) && (WCP_PROF == 1)
 #include "prf/prf_api.h"
 #endif
 //Enhanced RSSI    -OMAPS00075410
 #define TOTAL_NO_OF_BITS_IDLE_MEAS    625
 extern UWORD32 qual_acc_idle1[2];
-#include "tpudrv61.h"
+#if (RF_FAM == 61)
+#include "tpudrv61.h"
+#endif
 #if W_A_DSP1
 UWORD8 old_sacch_DSP_bug = FALSE;
 #endif
 #if (TRACE_TYPE == 6)
 #if (GSM_IDLE_RAM_DEBUG == 1)
 (*( volatile unsigned short* )(0xFFFE4802)) |= (1 << 2);    // GPIO-2=1
 #endif
+/*
+* FreeCalypso change: the conditioned-out GPIO twiddling below appears in
+* the LoCosto version of this L1 code without any conditionals around it.
+* Checking the disassembly of the Leonardo binary object confirms that
+* NO GPIO muck takes places in that version.  Needless to say, I am
+* disabling it for FreeCalypso - we don't want to wreak havoc on some
+* target that uses GPIO 0 for something else.
+*/
+#if 0
 // Configure GPIO0 pin as output - Reset Bit 0 i.e. set Bit 0 to 0
 (*( volatile unsigned short* )(0xFFFE4804)) &= (~(1 << 0));    // GPIO-2=1
 // write 1 in GPIO pin 0
 (*( volatile unsigned short* )(0xFFFE4802)) |= (1 << 0);    // GPIO-2=1
+#endif
 // stop the gauging.This function must be called at the
 // begining of the HISR in order to have the IT_GAUGING
 // executed before the Deep sleep decision.
 // GOAL: reduce the wake up time by 1 frame
 // DSP CPU load measurement
 l1_dsp_cpu_load_read();
 }
 #endif
+#if 0
 // write 0 in GPIO pin 0
 (*( volatile unsigned short* )(0xFFFE4802)) &= (~(1 << 0));    // GPIO-2=1
+#endif
 }
 #endif // NO SIMULATION
 //#pragma GSM_IDLE_DUPLICATE_FOR_INTERNAL_RAM_END
 // Serving cell measurements...
 // Accumulate the new measurement with the partial result.
 // Compensate AGC for current measurement value.
 l1a_l1s_com.Scell_info.meas.acc += l1a_l1s_com.Scell_IL_for_rxlev;
-	  static_s_rxlev_cntr++;
+static_s_rxlev_cntr++;
 // **********
 // Reporting
 // **********
 if (static_read_index==static_nbmeas_to_report)
 qual_acc_idle1[0]= 0;
 qual_acc_idle1[1] =0;
 // Reset pointer for debugg.
 pch_msg = NULL;
-		static_s_rxlev_cntr = 0;
+	static_s_rxlev_cntr = 0;
 }
 }// end of READ
 // **********
 (new_channel_type != TCH_F) &&
 (new_channel_type != TCH_H))
 {
 l1a_l1s_com.dedic_set.stop_tch = TRUE;
+	/*
+	 * FreeCalypso change: this module was failing to compile without
+	 * AUDIO_TASK enabled because of the following code;
+	 * conditional has been added.
+	 */
+#if AUDIO_TASK
 // If audio enabling was forced by L1S because of a HO failure, do not force it anymore.
 // Restore it in the state required by the MMI if the feature is compiled.
 if (l1a_l1s_com.audio_forced_by_l1s == TRUE)
 {
 #if (L1_EXTERNAL_AUDIO_VOICE_ONOFF == 1)
 #else // L1_EXTERNAL_AUDIO_VOICE_ONOFF
 l1s_dsp_com.dsp_ndb_ptr->d_toneskb_init |= (API) B_AUDIO_OFF_STOP;
 #endif // L1_EXTERNAL_AUDIO_VOICE_ONOFF
 l1a_l1s_com.audio_forced_by_l1s = FALSE;
 }
+#endif
 }
 // The new channel becomes the ACTIVE one.
 l1a_l1s_com.dedic_set.aset = l1a_l1s_com.dedic_set.fset;
 UWORD8 channel_type = l1a_l1s_com.dedic_set.aset->chan1.desc.channel_type;
 if((channel_type == TCH_F) || (channel_type == TCH_H))
 {
 l1a_l1s_com.dedic_set.stop_tch = TRUE;
+/* FreeCalypso change: same situation as earlier in this function */
+#if AUDIO_TASK
 // If audio enabling was forced by L1S because of a HO failure, do not force it anymore.
 // Restore it in the state required by the MMI if the feature is compiled.
 if (l1a_l1s_com.audio_forced_by_l1s == TRUE)
 {
 #if (L1_EXTERNAL_AUDIO_VOICE_ONOFF == 1)
 #else // L1_EXTERNAL_AUDIO_VOICE_ONOFF
 l1s_dsp_com.dsp_ndb_ptr->d_toneskb_init |= (API) B_AUDIO_OFF_STOP;
 #endif // L1_EXTERNAL_AUDIO_VOICE_ONOFF
 l1a_l1s_com.audio_forced_by_l1s = FALSE;
 }
+#endif
 #if (AMR == 1)
 // Reset DTX AMR status
 l1s.dtx_amr_dl_on=FALSE;
 #endif
 l1a_l1s_com.l1s_en_task[TCHD]  = TASK_DISABLED;
 l1a_l1s_com.l1s_en_task[TCHTF] = TASK_DISABLED;
 l1a_l1s_com.l1s_en_task[TCHA]  = TASK_DISABLED;
-		// Reset active dedicated set.
+// Reset active dedicated set.
-		l1a_l1s_com.dedic_set.aset = NULL;
+l1a_l1s_com.dedic_set.aset = NULL;
-	}
+}
-	else
+else
-	{
+{
-	     if (l1a_l1s_com.audio_forced_by_l1s == TRUE)
+/* FreeCalypso change: same AUDIO_TASK situation as earlier */
-	    {
+#if AUDIO_TASK
-		  #if (L1_EXTERNAL_AUDIO_VOICE_ONOFF == 1)
+if (l1a_l1s_com.audio_forced_by_l1s == TRUE)
-			if (l1a_l1s_com.audio_onoff_task.parameters.onoff_value == FALSE)
+{
-			{
+#if (L1_EXTERNAL_AUDIO_VOICE_ONOFF == 1)
-			  l1s_dsp_com.dsp_ndb_ptr->d_toneskb_init |= (API) B_AUDIO_OFF_STOP;
+if (l1a_l1s_com.audio_onoff_task.parameters.onoff_value == FALSE)
-			}
+{
-		  #else // L1_EXTERNAL_AUDIO_VOICE_ONOFF
+l1s_dsp_com.dsp_ndb_ptr->d_toneskb_init |= (API) B_AUDIO_OFF_STOP;
-			l1s_dsp_com.dsp_ndb_ptr->d_toneskb_init |= (API) B_AUDIO_OFF_STOP;
+}
-		  #endif // L1_EXTERNAL_AUDIO_VOICE_ONOFF
+#else // L1_EXTERNAL_AUDIO_VOICE_ONOFF
-			l1a_l1s_com.audio_forced_by_l1s = FALSE;
+l1s_dsp_com.dsp_ndb_ptr->d_toneskb_init |= (API) B_AUDIO_OFF_STOP;
-}
+#endif // L1_EXTERNAL_AUDIO_VOICE_ONOFF
-#if (AMR == 1)
+l1a_l1s_com.audio_forced_by_l1s = FALSE;
-	  // Reset DTX AMR status
+}
-	 l1s.dtx_amr_dl_on=FALSE;
+#endif
-	 #endif
+#if (AMR == 1)
+// Reset DTX AMR status
-	}
+l1s.dtx_amr_dl_on=FALSE;
+#endif
-// Clear d_ra_conf => default value
+}
-l1s_dsp_com.dsp_ndb_ptr->d_ra_conf = 0;
+// Clear d_ra_conf => default value
-	// Reset input msg.
+l1s_dsp_com.dsp_ndb_ptr->d_ra_conf = 0;
-	l1a_l1s_com.dedic_set.SignalCode = NULL;
+// Reset input msg.
+l1a_l1s_com.dedic_set.SignalCode = NULL;
 #if ((REL99 == 1) && (FF_BHO == 1))
 // this is required in BHO as you need to retain the previous channel info.
 //This is checked in HO_REQ to L1S.....In normal handover this does not happen
 if(l1a_l1s_com.dedic_set.handover_type == NORMAL_HANDOVER)
 {
 // Stop TCH/F and TCH/H (stop Omega) (used in SYNCHRO task)
 if((channel_type == TCH_F) || (channel_type == TCH_H))
 {
 l1a_l1s_com.dedic_set.stop_tch = TRUE;
+	/*
+	 * FreeCalypso change: same AUDIO_TASK conditional issue as earlier.
+	 */
+	#if AUDIO_TASK
 // CQ: Force the Audio ON to avoid having the DSP reseting the VDLON and producing a pop noise
 // on single ended outputs.
 l1s_dsp_com.dsp_ndb_ptr->d_toneskb_init |= (API) B_AUDIO_ON_START;
 l1s.l1_audio_it_com = TRUE;
 l1a_l1s_com.audio_forced_by_l1s = TRUE;
+	#endif
 }
 // Clear ciphering setting in MCU-DSP com.
 l1ddsp_load_ciph_param(0, &(l1a_l1s_com.dedic_set.aset->ciph_key));

FreeCalypso > hg > freecalypso-sw

comparison gsm-fw/L1/cfile/l1_sync.c @ 568:ae24e49c41a9