[Feature][ZXW-33]merge ZXW 0428 version
Change-Id: I11f167edfea428d9fab198ff00ff1364932d1b0b
diff --git a/cp/ps/driver/inc/misc/drvs_efuse.h b/cp/ps/driver/inc/misc/drvs_efuse.h
index 2cca866..165021e 100644
--- a/cp/ps/driver/inc/misc/drvs_efuse.h
+++ b/cp/ps/driver/inc/misc/drvs_efuse.h
@@ -49,6 +49,8 @@
DEVICE_ID,
MAX_ENUM
}E_ZDrvEfuse_SecureMsg;
+#else
+#include <linux/soc/zte/efuse/efuse_zx.h>
#endif
/****************************************************************************
@@ -76,8 +78,6 @@
*******************************************************************************/
UINT32 zDrvEfuse_IsSpe(VOID);
-#ifndef _OS_LINUX
-
/*******************************************************************************
* Function: zDrvEfuse_GetSecureMsg
* Description:¸Ãº¯ÊýÓÃÓÚ»ñÈ¡¹«Ô¿¶Ô¡¢°²È«¿ªÆô±ê¼Ç¡¢¹«Ô¿hashÖµ¡¢É豸ID¡£
@@ -90,8 +90,9 @@
*
* Others:
********************************************************************************/
-VOID zDrvEfuse_GetSecureMsg(T_ZDrvEfuse_Secure *secure);
+extern VOID zDrvEfuse_GetSecureMsg(T_ZDrvEfuse_Secure *secure);
+#ifndef _OS_LINUX
/*******************************************************************************
* Function: zDrvEfuse_SetSecureMsg
* Description:¸Ãº¯ÊýÓÃÓÚÉèÖð²È«¿ªÆô±ê¼Ç¡¢¹«Ô¿hashÖµ¡¢É豸ID¡£
diff --git a/cp/ps/driver/inc/misc/drvs_voiceprocess.h b/cp/ps/driver/inc/misc/drvs_voiceprocess.h
index a006449..3b6795f 100755
--- a/cp/ps/driver/inc/misc/drvs_voiceprocess.h
+++ b/cp/ps/driver/inc/misc/drvs_voiceprocess.h
@@ -219,32 +219,33 @@
typedef struct
{
- UINT8 volteIsWb; //g_volteIsWb
- UINT8 isUseSlicCodec; //g_isUseSlicCodec
- UINT8 g_isUseTdm;
+ UINT8 volteIsWb; //1 g_volteIsWb
+ UINT8 isUseSlicCodec; //2 g_isUseSlicCodec
+ UINT8 g_isUseTdm; //3
//for voice data process
- UINT8 voiceInGsmTdMode; //g_voiceInGsmTdMode
- UINT8 voiceInVolteMode; //g_voiceInVolteMode
+ UINT8 voiceInGsmTdMode; //4 g_voiceInGsmTdMode
+ UINT8 voiceInVolteMode; //5 g_voiceInVolteMode
- BOOL innerI2sIsMaster;//arm i2s2 g_innerI2sIsMaster
- BOOL innerI2sIsI2sMode; //g_innerI2sIsI2sMode
- BOOL vpLoopRuning; //g_vpLoopRuning
- BOOL muteEn; //g_vpMuteEn
- //BOOL nxpIsNormal; //g_vpNxpIsNormal
- BOOL vProcIsNormal; //voice processing is normal flag
- T_Vp_I2sStatus vpI2sStatus; //VpI2sStatus
+ BOOL innerI2sIsMaster;//6 arm i2s2 g_innerI2sIsMaster
+ BOOL innerI2sIsI2sMode; //7 g_innerI2sIsI2sMode
+ BOOL vpLoopRuning; //8 g_vpLoopRuning
+ BOOL muteEn; //9 g_vpMuteEn
+ //BOOL nxpIsNormal; //10 g_vpNxpIsNormal
+ BOOL vProcIsNormal; //11 voice processing is normal flag
+ T_Vp_I2sStatus vpI2sStatus; //12 VpI2sStatus
- T_ZDrv_VpPath vpPath;// VP_PATH_HEADSET;//VP_PATH_SPEAKER; //VP_PATH_HANDSET; g_vpPath
- T_ZDrv_VpPath vpLoopPath; //g_vpLoopPath
- T_ZDrv_VpVol vpVol; //g_vpVol
- T_ZDrvVoice_MODE voiceMode; //g_vpVoiceMode
- SINT8 vpInitGain; //s_vpInitGain
- T_Audio_NvFlag audio_ctrlFlag;//USE 32byte
+ T_ZDrv_VpPath vpPath;//13 VP_PATH_HEADSET;//VP_PATH_SPEAKER; //VP_PATH_HANDSET; g_vpPath
+ T_ZDrv_VpPath vpLoopPath; //14 g_vpLoopPath
+ T_ZDrv_VpVol vpVol; //15 g_vpVol
+ T_ZDrvVoice_MODE voiceMode; //16 g_vpVoiceMode
+ SINT8 vpInitGain; //17 s_vpInitGain
+ T_Audio_NvFlag audio_ctrlFlag;//18 USE 32byte
- UINT8 dtmfDirSel;
- UINT32 sample_rate;
- UINT8 useDtmfLoop;
- SINT32 muteCount;//mute_count
+ UINT8 dtmfDirSel;//19
+ UINT32 sample_rate;//20
+ UINT8 useDtmfLoop;//21
+ SINT32 muteCount;//22 mute_count
+ BOOL rxMuteEn; //23
} T_zDrvVoice_GbVar; //T_zDrvVoice_GbVar
typedef struct