FreeCalypso > hg > freecalypso-sw
changeset 563:a418c48046ad
L1: l1_init.c compiles
| author | Michael Spacefalcon <msokolov@ivan.Harhan.ORG> |
|---|---|
| date | Fri, 08 Aug 2014 02:28:45 +0000 |
| parents | b1358d6c4496 |
| children | b0af3534ef35 |
| files | gsm-fw/L1/cfile/Makefile gsm-fw/L1/cfile/l1_init.c gsm-fw/L1/dsp/leadapi.h |
| diffstat | 3 files changed, 33 insertions(+), 30 deletions(-) [+] |
line wrap: on
line diff
--- a/gsm-fw/L1/cfile/Makefile Tue Aug 05 22:03:06 2014 +0000 +++ b/gsm-fw/L1/cfile/Makefile Fri Aug 08 02:28:45 2014 +0000 @@ -7,7 +7,7 @@ INTSED= ../intram.sed IOBJS= l1_api_hisr.o l1_cmplx_intram.o l1_ctl.o l1_drive.o l1_func.o -XOBJS= l1_afunc.o l1_async.o l1_cmplx.o +XOBJS= l1_afunc.o l1_async.o l1_cmplx.o l1_init.o all: ${IOBJS} ${XOBJS}
--- a/gsm-fw/L1/cfile/l1_init.c Tue Aug 05 22:03:06 2014 +0000 +++ b/gsm-fw/L1/cfile/l1_init.c Fri Aug 08 02:28:45 2014 +0000 @@ -9,7 +9,8 @@ #define L1_INIT_C - #include "l1_confg.h" +#include "config.h" +#include "l1_confg.h" #if (CODE_VERSION == SIMULATION) #include <string.h> @@ -82,10 +83,10 @@ #else // NO SIMULATION #include <string.h> - #include "tm_defs.h" + /* #include "tm_defs.h" */ #include "l1_types.h" #include "sys_types.h" - #include "leadapi.h" + #include "../dsp/leadapi.h" #include "l1_const.h" #include "l1_macro.h" #include "l1_time.h" @@ -97,10 +98,10 @@ #endif - #include "spi_drv.h" - #include "abb.h" + #include "../../bsp/abb+spi/spi_drv.h" + #include "../../bsp/abb+spi/abb.h" #if (ANALOG != 11) - #include "abb_core_inth.h" + #include "../../bsp/abb+spi/abb_core_inth.h" #endif #if TESTMODE @@ -128,7 +129,7 @@ #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" @@ -140,15 +141,15 @@ #if (CHIPSET == 12) || (CHIPSET == 15) #include "sys_inth.h" #else - #include "mem.h" - #include "inth.h" - #include "dma.h" - #include "iq.h" + #include "../../bsp/mem.h" + #include "../../bsp/inth.h" + #include "../../bsp/dma.h" + #include "../../bsp/iq.h" #endif - #include "clkm.h" - #include "rhea_arm.h" - #include "ulpd.h" + #include "../../bsp/clkm.h" + #include "../../bsp/rhea_arm.h" + #include "../../bsp/ulpd.h" #include "l1_proto.h" @@ -201,10 +202,13 @@ #include "bspTwl3029_Aud_Map.h" #include "bspTwl3029_Madc.h" #endif + +#if (RF_FAM == 61) //OMAPS148175 #include "l1_drp_if.h" #include "drp_main.h" -// +#endif + #if (ANALOG == 11) #if (L1_MADC_ON == 1) extern BspTwl3029_MadcResults l1_madc_results; @@ -239,7 +243,7 @@ extern void l1_api_dump(void); #endif - #if (TRACE_TYPE==3) +#if (TRACE_TYPE==3) void reset_stats(); #endif // TRACE_TYPE @@ -263,10 +267,6 @@ extern void L1_trace_string(char *s); #endif -#if ((TRACE_TYPE==1) || (TRACE_TYPE==2) || (TRACE_TYPE==3) || (TRACE_TYPE==4) || (TRACE_TYPE==7)) - extern void L1_trace_string(char *s); -#endif - #if (RF_FAM == 60 || RF_FAM == 61) extern const UWORD8 drp_ref_sw[] ; extern T_DRP_REGS_STR *drp_regs; @@ -356,7 +356,7 @@ (*(volatile UWORD16 *)l1s_tpu_com.reg_cmd) &= ~TPU_CTRL_D_ENBL; - #if (DSP == 33) || (DSP == 34) || (DSP == 35) || (DSP == 36) || (DSP == 37) || (DSP == 38) || (DSP == 39) + #if (DSP >= 33) l1s_dsp_com.dsp_ndb_ptr->d_dsp_page = l1s_dsp_com.dsp_w_page; #else l1s_dsp_com.dsp_param_ptr->d_dsp_page = l1s_dsp_com.dsp_w_page; @@ -586,15 +586,15 @@ // Intialize the AFC #if (DSP == 38) || (DSP == 39) - #if (CODE_VERSION != SIMULATION) - l1s_dsp_com.dsp_ndb_ptr->d_drp_afc_add_api = C_DRP_DCXO_XTAL_DSP_ADDRESS; - #endif - #endif + #if (CODE_VERSION != SIMULATION) + l1s_dsp_com.dsp_ndb_ptr->d_drp_afc_add_api = C_DRP_DCXO_XTAL_DSP_ADDRESS; + #endif - #if (L1_DRP_IQ_SCALING == 1) + #if (L1_DRP_IQ_SCALING == 1) l1s_dsp_com.dsp_ndb_ptr->d_dsp_iq_scaling_factor = 1; - #else + #else l1s_dsp_com.dsp_ndb_ptr->d_dsp_iq_scaling_factor = 0; + #endif #endif } @@ -702,7 +702,7 @@ void l1_abb_power_on(void) { #if (CODE_VERSION != SIMULATION) - #if (CHIPSET == 12) + #if (CHIPSET != 15) T_SPI_DEV *Abb; T_SPI_DEV init_spi_device; UWORD16 Abb_Status; @@ -778,7 +778,7 @@ // APCDEL1 will be initialized on rach only .... dsp_ndb_ptr->d_apcdel1 =l1_config.params.apcdel1; - #if (DSP == 33) || (DSP == 34) || (DSP == 35) || (DSP == 36) || (DSP == 37) || (DSP == 38) || (DSP == 39) + #if (DSP >= 33) // To increase the robustness the IOTA register are reseted to 0 // if OMEGA, NAUSICA is used dsp_ndb_ptr->d_bulgcal = 0x0000; @@ -949,8 +949,10 @@ l1s.pw_mgr.modules_status = 0; // all clocks ON l1s.pw_mgr.paging_scheduled = FALSE; +#if 0 /* removed in FreeCalypso */ // variable for afc bypass mode l1s.pw_mgr.afc_bypass_mode = AFC_BYPASS_MODE; +#endif // 32 Khz gauging .... l1s.pw_mgr.gaug_count = 0;