# HG changeset patch # User Michael Spacefalcon # Date 1405007378 0 # Node ID ed6071292a5c11d73e57f56af3771e18827de7ae # Parent 57ad8f4d5cb57e0bd555992475aa426dd57af4b0 L1: first C module compiles: ind_os.c diff -r 57ad8f4d5cb5 -r ed6071292a5c gsm-fw/L1/cust0/Makefile --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gsm-fw/L1/cust0/Makefile Thu Jul 10 15:49:38 2014 +0000 @@ -0,0 +1,10 @@ +CC= arm-elf-gcc +CFLAGS= -O2 -fno-builtin -mthumb-interwork +LD= arm-elf-ld + +IOBJS= ind_os.o + +all: ${IOBJS} + +clean: + rm -f *.[oa] *.out *errs diff -r 57ad8f4d5cb5 -r ed6071292a5c gsm-fw/L1/cust0/ind_os.c --- a/gsm-fw/L1/cust0/ind_os.c Thu Jul 10 15:02:48 2014 +0000 +++ b/gsm-fw/L1/cust0/ind_os.c Thu Jul 10 15:49:38 2014 +0000 @@ -32,18 +32,18 @@ //#endif #if TESTMODE - #include "l1tm_defty.h" + #include "../tm_include/l1tm_defty.h" #endif -#include "l1audio_const.h" -#include "l1audio_cust.h" -#include "l1audio_defty.h" -#include "l1_defty.h" -#include "l1_msgty.h" -#include "l1_varex.h" +#include "../audio_include/l1audio_const.h" +#include "../audio_cust0/l1audio_cust.h" +#include "../audio_include/l1audio_defty.h" +#include "../include/l1_defty.h" +#include "../include/l1_msgty.h" +#include "../include/l1_varex.h" #if (CHIPSET == 2 || CHIPSET == 3 || CHIPSET == 4 || CHIPSET == 5 || CHIPSET == 6 || CHIPSET == 7 || CHIPSET == 8 || CHIPSET == 10 || CHIPSET == 11 || CHIPSET == 12) - #include "ulpd.h" + #include "../../bsp/ulpd.h" #endif extern UWORD32 TCD_Priority_Groups; @@ -73,7 +73,7 @@ /*-------------------------------------------------------*/ - /* int OS_get_inactivity_ticks() */ + /* int OS_get_inactivity_ticks() */ /*-------------------------------------------------------*/ /* Parameters : none */ /* Return : Number of ticks of inactivity */ @@ -123,7 +123,7 @@ else return TMD_Timer; } - + // Returns not activity if no timer active if (TMD_Timer_State == TM_NOT_ACTIVE) return -1; @@ -143,8 +143,8 @@ /* are already protected or not */ /*-------------------------------------------------------*/ void OS_system_protect (void) - { - NU_Protect((NU_PROTECT*) &TCD_System_Protect); + { + NU_Protect((NU_PROTECT*) &TCD_System_Protect); } /*-------------------------------------------------------*/ @@ -155,6 +155,6 @@ /* Functionality : unprotect the system structures */ /*-------------------------------------------------------*/ void OS_system_Unprotect (void) - { - NU_Unprotect(); + { + NU_Unprotect(); } diff -r 57ad8f4d5cb5 -r ed6071292a5c gsm-fw/L1/include/l1_defty.h --- a/gsm-fw/L1/include/l1_defty.h Thu Jul 10 15:02:48 2014 +0000 +++ b/gsm-fw/L1/include/l1_defty.h Thu Jul 10 15:49:38 2014 +0000 @@ -7,7 +7,7 @@ * ************* Revision Controle System Header *************/ #if(L1_DYN_DSP_DWNLD == 1) - #include "l1_dyn_dwl_defty.h" + #include "../dyn_dwl_include/l1_dyn_dwl_defty.h" #endif typedef struct @@ -421,7 +421,7 @@ // bit [12.13] -> b_tch_loop, tch loops A/B/C. API hole; // (10) unused hole. -#if ((ANLG_FAM == 1) || (ANLG_FAM == 2) || (ANLG_FAM == 3)) +#if ((ANALOG == 1) || (ANALOG == 2) || (ANALOG == 3)) API d_ctrl_abb; // (11) Bit field indicating the analog baseband register to send. // bit [0] -> b_ramp: the ramp information(a_ramp[]) is located in NDB // bit [1.2] -> unused @@ -552,9 +552,9 @@ API d_dai_onoff; API d_auxdac; - #if (ANLG_FAM == 1) + #if (ANALOG == 1) API d_vbctrl; - #elif ((ANLG_FAM == 2) || (ANLG_FAM == 3)) + #elif ((ANALOG == 2) || (ANALOG == 3)) API d_vbctrl1; #endif @@ -660,7 +660,7 @@ API d_gea_mode_ovly; API a_gea_kc_ovly[4]; -#if (ANLG_FAM == 3) +#if (ANALOG == 3) // SYREN specific registers API d_vbpop; API d_vau_delay_init; @@ -669,7 +669,7 @@ API d_vaus_vol; API d_vaud_pll; API d_hole3_ndb[1]; -#elif ((ANLG_FAM == 1) || (ANLG_FAM == 2)) +#elif ((ANALOG == 1) || (ANALOG == 2)) API d_hole3_ndb[7]; @@ -896,9 +896,9 @@ API d_dai_onoff; API d_auxdac; - #if (ANLG_FAM == 1) + #if (ANALOG == 1) API d_vbctrl; - #elif ((ANLG_FAM == 2) || (ANLG_FAM == 3)) + #elif ((ANALOG == 2) || (ANALOG == 3)) API d_vbctrl1; #endif @@ -1157,7 +1157,7 @@ // bit [2] -> b_dtx. // OMEGA...........................(MCU -> DSP). - #if ((ANLG_FAM == 1) || (ANLG_FAM == 2)) + #if ((ANALOG == 1) || (ANALOG == 2)) API a_ramp[16]; #if (MELODY_E1) API d_melo_osc_used; @@ -1215,9 +1215,9 @@ API d_dai_onoff; API d_auxdac; - #if (ANLG_FAM == 1) + #if (ANALOG == 1) API d_vbctrl; - #elif (ANLG_FAM == 2) + #elif (ANALOG == 2) API d_vbctrl1; #endif @@ -1387,7 +1387,7 @@ // OMEGA...........................(MCU -> DSP). -#if ((ANLG_FAM == 1) || (ANLG_FAM == 2)) +#if ((ANALOG == 1) || (ANALOG == 2)) API a_ramp[16]; #if (MELODY_E1) API d_melo_osc_used; @@ -1443,9 +1443,9 @@ API d_bulqoff; API d_dai_onoff; API d_auxdac; - #if (ANLG_FAM == 1) + #if (ANALOG == 1) API d_vbctrl; - #elif (ANLG_FAM == 2) + #elif (ANALOG == 2) API d_vbctrl1; #endif API d_bbctrl; @@ -2834,7 +2834,7 @@ BOOL dco_enabled; #endif - #if (ANLG_FAM == 1) + #if (ANALOG == 1) UWORD16 debug1; UWORD16 afcctladd; UWORD16 vbuctrl; @@ -2848,7 +2848,7 @@ UWORD16 vbctrl; UWORD16 apcdel1; #endif - #if (ANLG_FAM == 2) + #if (ANALOG == 2) UWORD16 debug1; UWORD16 afcctladd; UWORD16 vbuctrl; @@ -2865,7 +2865,7 @@ UWORD16 apcdel1; UWORD16 apcdel2; #endif - #if (ANLG_FAM == 3) + #if (ANALOG == 3) UWORD16 debug1; UWORD16 afcctladd; UWORD16 vbuctrl; diff -r 57ad8f4d5cb5 -r ed6071292a5c gsm-fw/L1/include/l1_proto.h --- a/gsm-fw/L1/include/l1_proto.h Thu Jul 10 15:02:48 2014 +0000 +++ b/gsm-fw/L1/include/l1_proto.h Thu Jul 10 15:49:38 2014 +0000 @@ -134,7 +134,7 @@ /* prototypes of L1_FUNC functions */ /**************************************/ void dsp_power_on (void); -#if ((ANLG_FAM == 1) || (ANLG_FAM == 2) || (ANLG_FAM == 3)) +#if ((ANALOG == 1) || (ANALOG == 2) || (ANALOG == 3)) void l1_abb_power_on (void); #endif void tpu_init (void); @@ -517,7 +517,7 @@ WORD8 l1ctl_encode_delta1 (UWORD16 radio_freq); WORD8 l1ctl_encode_delta2 (UWORD16 radio_freq); void Cust_get_ramp_tab (API *a_ramp, UWORD8 txpwr_ramp_up, UWORD8 txpwr_ramp_down, UWORD16 radio_freq); -#if ((ANLG_FAM == 1) || (ANLG_FAM == 2) || (ANLG_FAM == 3)) +#if ((ANALOG == 1) || (ANALOG == 2) || (ANALOG == 3)) UWORD16 Cust_get_pwr_data(UWORD8 txpwr, UWORD16 radio_freq); #endif diff -r 57ad8f4d5cb5 -r ed6071292a5c gsm-fw/L1/include/l1_time.h --- a/gsm-fw/L1/include/l1_time.h Thu Jul 10 15:02:48 2014 +0000 +++ b/gsm-fw/L1/include/l1_time.h Thu Jul 10 15:49:38 2014 +0000 @@ -140,7 +140,7 @@ #if (CODE_VERSION==SIMULATION) #define TULSET_DURATION ( 16L ) // Uplink power on setup time #define BULRUDEL_DURATION ( 2L ) - #if ((ANLG_FAM == 1) || (ANLG_FAM == 2) || (ANLG_FAM == 3)) + #if ((ANALOG == 1) || (ANALOG == 2) || (ANALOG == 3)) // 16 qbits are added because the Calibration time is reduced of 4 GSM bit // due to a slow APC ramp of OMEGA (Cf. START_TX_NB) #define UL_VEGA_DELAY ( TULSET_DURATION + BULRUDEL_DURATION +16L ) // = 18qbits, TX Vega delay