FreeCalypso > hg > freecalypso-sw
changeset 604:45bf440cc677
gsm-fw/L1/audio_include: initial preen over the imported LoCosto headers
| author | Michael Spacefalcon <msokolov@ivan.Harhan.ORG> |
|---|---|
| date | Thu, 28 Aug 2014 19:08:09 +0000 |
| parents | d638de8cc6b8 |
| children | 527956ce73c7 |
| files | gsm-fw/L1/audio_include/l1audio_abb.h gsm-fw/L1/audio_include/l1audio_btapi.h gsm-fw/L1/audio_include/l1audio_const.h gsm-fw/L1/audio_include/l1audio_defty.h gsm-fw/L1/audio_include/l1audio_msgty.h gsm-fw/L1/audio_include/l1audio_signa.h |
| diffstat | 6 files changed, 138 insertions(+), 135 deletions(-) [+] |
line wrap: on
line diff
--- a/gsm-fw/L1/audio_include/l1audio_abb.h Thu Aug 28 18:40:12 2014 +0000 +++ b/gsm-fw/L1/audio_include/l1audio_abb.h Thu Aug 28 19:08:09 2014 +0000 @@ -5,7 +5,7 @@ * */ -#if (ANLG_FAM != 11) +#if (ANALOG != 11) #define ABB_L1_WRITE(addr,data) (((data) << 6) | (addr) | 0x01) @@ -26,7 +26,7 @@ void ABB_Audio_Delay_Init (UWORD8 delay); UWORD16 ABB_Read_DLGain (void); #endif -#if (ANLG_FAM == 11) +#if (ANALOG == 11) UWORD16 l1_audio_abb_Read_DLGain (void); #endif
--- a/gsm-fw/L1/audio_include/l1audio_btapi.h Thu Aug 28 18:40:12 2014 +0000 +++ b/gsm-fw/L1/audio_include/l1audio_btapi.h Thu Aug 28 19:08:09 2014 +0000 @@ -1,8 +1,9 @@ /**************************************************** / FILE NAME:- BT_L1_API.h file. / ****************************************************/ -#include "l1sw.cfg" -#include "l1_types.h" +#include "../../config.h" +#include "../include/l1_confg.h" +#include "../include/l1_types.h" #if(L1_BT_AUDIO==1) /**************************************************** @@ -106,4 +107,3 @@ /****************************************************/ #endif -
--- a/gsm-fw/L1/audio_include/l1audio_const.h Thu Aug 28 18:40:12 2014 +0000 +++ b/gsm-fw/L1/audio_include/l1audio_const.h Thu Aug 28 19:08:09 2014 +0000 @@ -60,7 +60,7 @@ #endif #define L1S_PCM_DOWNLOAD_STATE 34 // l1s_pcm_download_manager() #define L1S_PCM_UPLOAD_STATE 35 // l1s_pcm_upload_manager() -#define L1S_FIR_STATE 36 // l1s_fir_manager() + #define L1S_FIR_STATE 36 // l1s_fir_manager() //---------------------------------------- @@ -69,7 +69,7 @@ // bit in d_tch_mode for audio features #define B_VOICE_MEMO_DTX (TRUE_L << 5) -#if (DSP == 34) || (DSP == 35) || (DSP == 36) || (DSP == 37) || (DSP == 38) || (DSP == 39) +#if (DSP >= 34) #define B_VM_VOCODER_SELECT (TRUE_L << 6) #endif @@ -396,7 +396,7 @@ #define AUDIO_SP_MP3_CONF 2 #define AUDIO_SP_EXTAUDIO_CONF 3 -#if (ANLG_FAM == 3) +#if (ANALOG == 3) // sampling frequency #define AUDIO_SP_FREQ_8 7 #define AUDIO_SP_FREQ_11 6 @@ -407,7 +407,7 @@ #define AUDIO_SP_FREQ_48 0 #endif -#if (ANLG_FAM == 11 || CODE_VERSION == SIMULATION) +#if (ANALOG == 11 || CODE_VERSION == SIMULATION) // sampling frequency index for Triton. This would be set in the //SRW[0:3] bits of the CTRL5 register. #define AUDIO_SP_FREQ_8 0
--- a/gsm-fw/L1/audio_include/l1audio_defty.h Thu Aug 28 18:40:12 2014 +0000 +++ b/gsm-fw/L1/audio_include/l1audio_defty.h Thu Aug 28 19:08:09 2014 +0000 @@ -7,17 +7,18 @@ * ************* Revision Controle System Header *************/ -#include "l1sw.cfg" +#include "../../include/config.h" +#include "../include/l1_confg.h" #include "l1audio_msgty.h" -#include "l1audio_cust.h" +#include "../audio_cust0/l1audio_cust.h" #include "l1audio_const.h" #include "l1audio_btapi.h" #if (AUDIO_TASK == 1) #if (KEYBEEP) - /***************************************************************************************/ - /* Keybeep l1a_l1s_com structure... */ - /***************************************************************************************/ + /**************************************************************************/ + /* Keybeep l1a_l1s_com structure... */ + /**************************************************************************/ typedef struct { BOOL start; @@ -33,9 +34,9 @@ #endif #if (TONE) - /***************************************************************************************/ - /* Tone l1a_l1s_com structure... */ - /***************************************************************************************/ + /**************************************************************************/ + /* Tone l1a_l1s_com structure... */ + /**************************************************************************/ typedef struct { BOOL start; @@ -51,9 +52,9 @@ #endif #if (MELODY_E1) - /***************************************************************************************/ - /* Melody l1a_l1s_com structure... */ - /***************************************************************************************/ + /**************************************************************************/ + /* Melody l1a_l1s_com structure... */ + /**************************************************************************/ typedef struct { BOOL start; @@ -81,9 +82,9 @@ } T_MELODY_TASK; - /***************************************************************************************/ - /* Melody l1s structure... */ - /***************************************************************************************/ + /**************************************************************************/ + /* Melody l1s structure... */ + /**************************************************************************/ typedef struct { @@ -100,9 +101,9 @@ #endif #if (VOICE_MEMO) - /***************************************************************************************/ - /* Voice memo l1a_l1s_com structure... */ - /***************************************************************************************/ + /**************************************************************************/ + /* Voice memo l1a_l1s_com structure... */ + /**************************************************************************/ typedef struct { @@ -160,9 +161,9 @@ } T_VM_TASK; - /***************************************************************************************/ - /* Voice memo l1s structure... */ - /***************************************************************************************/ + /**************************************************************************/ + /* Voice memo l1s structure... */ + /**************************************************************************/ typedef struct { @@ -193,9 +194,9 @@ #endif #if (L1_PCM_EXTRACTION) - /***************************************************************************************/ - /* PCM extraction l1a_l1s_com structure... */ - /***************************************************************************************/ + /**************************************************************************/ + /* PCM extraction l1a_l1s_com structure... */ + /**************************************************************************/ typedef struct { @@ -246,9 +247,9 @@ } T_PCM_TASK; - /***************************************************************************************/ - /* PCM l1s structure... */ - /***************************************************************************************/ + /**************************************************************************/ + /* PCM l1s structure... */ + /**************************************************************************/ typedef struct { @@ -278,9 +279,9 @@ #endif /* L1_PCM_EXTRACTION */ #if (L1_VOICE_MEMO_AMR) - /***************************************************************************************/ - /* Voice memo amr l1a_l1s_com structure... */ - /***************************************************************************************/ + /**************************************************************************/ + /* Voice memo amr l1a_l1s_com structure... */ + /**************************************************************************/ typedef struct { @@ -334,9 +335,9 @@ } T_VM_AMR_TASK; - /***************************************************************************************/ - /* Voice memo l1s structure... */ - /***************************************************************************************/ + /**************************************************************************/ + /* Voice memo l1s structure... */ + /**************************************************************************/ typedef struct { @@ -368,9 +369,9 @@ #endif // L1_VOICE_MEMO_AMR #if (SPEECH_RECO) - /***************************************************************************************/ - /* Speech recogniton l1a_l1s_com structure... */ - /***************************************************************************************/ + /**************************************************************************/ + /* Speech recogniton l1a_l1s_com structure... */ + /**************************************************************************/ typedef struct { @@ -579,9 +580,9 @@ T_AUDIO_MODE_TASK; #endif #if (MELODY_E2) - /***************************************************************************************/ - /* Melody format E2 l1a_l1s_com structure... */ - /***************************************************************************************/ + /**************************************************************************/ + /* Melody format E2 l1a_l1s_com structure... */ + /**************************************************************************/ typedef struct { BOOL start; @@ -610,9 +611,9 @@ } T_MELODY_E2_TASK; - /***************************************************************************************/ - /* Melody format E2 l1s structure... */ - /***************************************************************************************/ + /**************************************************************************/ + /* Melody format E2 l1s structure... */ + /**************************************************************************/ typedef struct { UWORD8 error_id; @@ -638,9 +639,9 @@ } T_L1S_MELODY_E2_COMMON_VAR; - /***************************************************************************************/ - /* Melody format E2 audio background structure... */ - /***************************************************************************************/ + /**************************************************************************/ + /* Melody format E2 audio background structure... */ + /**************************************************************************/ typedef struct { API *API_address; @@ -651,9 +652,9 @@ } T_AUDIO_BACK_MELODY_E2; #endif // MELODY_E2 #if (L1_CPORT == 1) - /***************************************************************************************/ - /* Cport l1a_l1s_com structure... */ - /***************************************************************************************/ + /**************************************************************************/ + /* Cport l1a_l1s_com structure... */ + /**************************************************************************/ typedef struct { BOOL start; @@ -722,9 +723,9 @@ #endif #if (L1_STEREOPATH == 1) - /***************************************************************************************/ - /* Stereopath l1a_l1s_com structure... */ - /***************************************************************************************/ + /**************************************************************************/ + /* Stereopath l1a_l1s_com structure... */ + /**************************************************************************/ typedef struct { BOOL start; @@ -770,9 +771,9 @@ #endif #if (L1_ANR == 1) - /***************************************************************************************/ - /* ANR l1a_l1s_com structure... */ - /***************************************************************************************/ + /**************************************************************************/ + /* ANR l1a_l1s_com structure... */ + /**************************************************************************/ typedef struct { BOOL update; @@ -797,9 +798,9 @@ #endif #if (L1_ANR == 2) - /***************************************************************************************/ - /* ANR 2.13 l1a_l1s_com structure... */ - /***************************************************************************************/ + /**************************************************************************/ + /* ANR 2.13 l1a_l1s_com structure... */ + /**************************************************************************/ typedef struct { BOOL update; @@ -825,9 +826,9 @@ #endif #if (L1_IIR == 1) - /***************************************************************************************/ - /* IIR l1a_l1s_com structure... */ - /***************************************************************************************/ + /**************************************************************************/ + /* IIR l1a_l1s_com structure... */ + /**************************************************************************/ typedef struct { BOOL update; @@ -859,9 +860,9 @@ #endif #if (L1_WCM == 1) - /***************************************************************************************/ - /* WCM 1.x l1a_l1s_com structure... */ - /***************************************************************************************/ + /**************************************************************************/ + /* WCM 1.x l1a_l1s_com structure... */ + /**************************************************************************/ typedef struct { BOOL update; @@ -877,9 +878,9 @@ #endif #if (L1_IIR == 2) - /***************************************************************************************/ - /* IIR 4.x l1a_l1s_com structure... */ - /***************************************************************************************/ + /**************************************************************************/ + /* IIR 4.x l1a_l1s_com structure... */ + /**************************************************************************/ typedef struct { BOOL update; @@ -895,7 +896,7 @@ #endif -#if (L1_AGC_UL == 1 || L1_AGC_DL == 1) + #if (L1_AGC_UL == 1 || L1_AGC_DL == 1) typedef struct { BOOL update; @@ -904,14 +905,14 @@ #endif #if (L1_AGC_UL == 1) - /***************************************************************************************/ - /* AGC UL l1a_l1s_com structure... */ - /***************************************************************************************/ + /**************************************************************************/ + /* AGC UL l1a_l1s_com structure... */ + /**************************************************************************/ typedef struct { T_AGC_CONTROL agc_ul_control; - UWORD16 control; + UWORD16 control; UWORD16 frame_size; WORD16 targeted_level; WORD16 signal_up; @@ -934,14 +935,14 @@ #endif #if (L1_AGC_DL == 1) - /***************************************************************************************/ - /* AGC DL l1a_l1s_com structure... */ - /***************************************************************************************/ + /**************************************************************************/ + /* AGC DL l1a_l1s_com structure... */ + /**************************************************************************/ typedef struct { T_AGC_CONTROL agc_dl_control; - UWORD16 control; + UWORD16 control; UWORD16 frame_size; WORD16 targeted_level; WORD16 signal_up; @@ -964,9 +965,9 @@ #endif #if (L1_DRC == 1) - /***************************************************************************************/ - /* DRC 1.x l1a_l1s_com structure... */ - /***************************************************************************************/ + /**************************************************************************/ + /* DRC 1.x l1a_l1s_com structure... */ + /**************************************************************************/ typedef struct { BOOL update; @@ -981,9 +982,9 @@ T_AQI_DRC_TASK; - /***************************************************************************************/ - /* MP3 MCU-DSP API */ - /***************************************************************************************/ + /**************************************************************************/ + /* MP3 MCU-DSP API */ + /**************************************************************************/ typedef struct { API_SIGNED d_drc_speech_mode_samp_f; @@ -995,7 +996,7 @@ API_SIGNED d_drc_expansion_ratio_md_hg; API_SIGNED d_drc_max_amplification_fb_bs; API_SIGNED d_drc_max_amplification_md_hg; - API_SIGNED d_drc_compression_knee_fb_bs; + API_SIGNED d_drc_compression_knee_fb_bs; API_SIGNED d_drc_compression_knee_md_hg; API_SIGNED d_drc_compression_ratio_fb_bs; API_SIGNED d_drc_compression_ratio_md_hg; @@ -1016,9 +1017,9 @@ #endif #if (L1_LIMITER == 1) - /***************************************************************************************/ - /* LIMITER l1a_l1s_com structure... */ - /***************************************************************************************/ + /**************************************************************************/ + /* LIMITER l1a_l1s_com structure... */ + /**************************************************************************/ typedef struct { BOOL update; @@ -1051,9 +1052,9 @@ #endif #if (L1_ES == 1) - /***************************************************************************************/ - /* ES l1a_l1s_com structure... */ - /***************************************************************************************/ + /**************************************************************************/ + /* ES l1a_l1s_com structure... */ + /**************************************************************************/ typedef struct { BOOL update; @@ -1120,7 +1121,7 @@ typedef enum { - L1_INVALID = 0xFF, + L1_INVALID = 0xFF, L1_AUDIO_UL_OFF = 0, L1_AUDIO_UL_SWITCHON_STARTED = 1, L1_AUDIO_UL_ON = 2, @@ -1168,7 +1169,7 @@ T_L1S_AUDIO_ONOFF_MANAGER; #endif // L1_AUDIO_MCU_ONOFF - + #if(L1_MIDI_BUFFER == 1) typedef struct {
--- a/gsm-fw/L1/audio_include/l1audio_msgty.h Thu Aug 28 18:40:12 2014 +0000 +++ b/gsm-fw/L1/audio_include/l1audio_msgty.h Thu Aug 28 19:08:09 2014 +0000 @@ -9,7 +9,8 @@ #ifndef _L1AUDIO_MSGTY_H #define _L1AUDIO_MSGTY_H -#include "l1sw.cfg" +#include "../../include/config.h" +#include "../include/l1_confg.h" #if (AUDIO_TASK == 1) @@ -716,7 +717,7 @@ { WORD16 mode; WORD16 frame_size; - WORD16 num_sub_frames; + WORD16 num_sub_frames; WORD16 ratio; WORD16 threshold; WORD16 gain[16]; @@ -793,7 +794,7 @@ typedef enum { - AGC_NO_ACTION = -1, + AGC_NO_ACTION = -1, AGC_STOPPED = 0, AGC_STARTED = 1, AGC_UPDATED = 2 @@ -810,7 +811,7 @@ T_RV_HDR header; #endif T_AGC_CONTROL agc_ul_control; - T_MMI_AQI_AGC_PARAMS parameters; + T_MMI_AQI_AGC_PARAMS parameters; } T_MMI_AQI_AGC_UL_REQ ; @@ -843,7 +844,7 @@ T_RV_HDR header; #endif T_AGC_CONTROL agc_dl_control; - T_MMI_AQI_AGC_PARAMS parameters; + T_MMI_AQI_AGC_PARAMS parameters; } T_MMI_AQI_AGC_DL_REQ ; @@ -1149,24 +1150,24 @@ #endif // AUDIO_TASK - typedef struct - { - UWORD8 outen1; - UWORD8 outen2; - UWORD8 outen3; - UWORD8 classD; - } T_MMI_OUTEN_CFG_REQ; +typedef struct +{ + UWORD8 outen1; + UWORD8 outen2; + UWORD8 outen3; + UWORD8 classD; +} T_MMI_OUTEN_CFG_REQ; - typedef struct - { -#if (OP_RIV_AUDIO == 1) - T_RV_HDR header; -#endif - UWORD8 outen1; - UWORD8 outen2; - UWORD8 outen3; - UWORD8 classD; - } T_MMI_OUTEN_CFG_READ_CON; +typedef struct +{ + #if (OP_RIV_AUDIO == 1) + T_RV_HDR header; + #endif + UWORD8 outen1; + UWORD8 outen2; + UWORD8 outen3; + UWORD8 classD; +} T_MMI_OUTEN_CFG_READ_CON; #endif // _L1AUDIO_MSGTY_H
--- a/gsm-fw/L1/audio_include/l1audio_signa.h Thu Aug 28 18:40:12 2014 +0000 +++ b/gsm-fw/L1/audio_include/l1audio_signa.h Thu Aug 28 19:08:09 2014 +0000 @@ -7,7 +7,8 @@ * ************* Revision Controle System Header *************/ -#include "l1sw.cfg" +#include "../../include/config.h" +#include "../include/l1_confg.h" #if (AUDIO_TASK == 1) #define P_AUDIO ( 0x18 ) @@ -181,20 +182,20 @@ #define MMI_AQI_ANR_CON ( ( P_AUDIO << 8 ) | 132) #endif -#if (L1_IIR == 2) + #if (L1_IIR == 2) #define MMI_AQI_IIR_DL_REQ ( ( P_AUDIO << 8 ) | 134) #define MMI_AQI_IIR_DL_CON ( ( P_AUDIO << 8 ) | 135) #endif - #define MMI_OUTEN_CFG_REQ ( ( P_AUDIO << 8) | 152) - #define MMI_OUTEN_CFG_CON ( ( P_AUDIO << 8) | 153) - #define MMI_OUTEN_CFG_READ_REQ ( ( P_AUDIO << 8) | 154) - #define MMI_OUTEN_CFG_READ_CON ( ( P_AUDIO << 8) | 155) + #define MMI_OUTEN_CFG_REQ ( ( P_AUDIO << 8) | 152) + #define MMI_OUTEN_CFG_CON ( ( P_AUDIO << 8) | 153) + #define MMI_OUTEN_CFG_READ_REQ ( ( P_AUDIO << 8) | 154) + #define MMI_OUTEN_CFG_READ_CON ( ( P_AUDIO << 8) | 155) -#if(L1_BT_AUDIO==1) - #define MMI_BT_ENABLE_REQ ((P_AUDIO<<8)|167) - #define MMI_BT_DISABLE_REQ ((P_AUDIO<<8)|169) -#endif + #if(L1_BT_AUDIO==1) + #define MMI_BT_ENABLE_REQ ((P_AUDIO<<8)|167) + #define MMI_BT_DISABLE_REQ ((P_AUDIO<<8)|169) + #endif // Messages L1S -> L1A #if (KEYBEEP) @@ -302,11 +303,11 @@ #define L1_AQI_ANR_CON ( ( P_AUDIO << 8 ) | 133 ) #endif -#if (L1_IIR == 2) + #if (L1_IIR == 2) #define L1_AQI_IIR_DL_CON ( ( P_AUDIO << 8 ) | 136) #endif -#if (L1_WCM == 1) + #if (L1_WCM == 1) #define L1_AQI_WCM_CON ( ( P_AUDIO << 8 ) | 151 ) #endif @@ -335,8 +336,8 @@ #endif #endif - #if (L1_EXTERNAL_AUDIO_VOICE_ONOFF == 1 || L1_EXT_MCU_AUDIO_VOICE_ONOFF == 1) - #define L1_AUDIO_ONOFF_CON ( ( P_AUDIO << 8 ) | 126 ) - #endif + #if (L1_EXTERNAL_AUDIO_VOICE_ONOFF == 1 || L1_EXT_MCU_AUDIO_VOICE_ONOFF == 1) + #define L1_AUDIO_ONOFF_CON ( ( P_AUDIO << 8 ) | 126 ) + #endif #endif // AUDIO_TASK == 1