[Feature][ZXW-237]merge P54U03 version
Only Configure: No
Affected branch: master
Affected module: unknow
Is it affected on both ZXIC and MTK: only ZXIC
Self-test: Yes
Doc Update: No
Change-Id: Id39ef8b992af691eab09c01d4ea26da89e5f4049
diff --git a/cp/ps/driver/inc/misc/drvs_voiceprocess.h b/cp/ps/driver/inc/misc/drvs_voiceprocess.h
index 570a460..a3f11e1 100755
--- a/cp/ps/driver/inc/misc/drvs_voiceprocess.h
+++ b/cp/ps/driver/inc/misc/drvs_voiceprocess.h
@@ -185,20 +185,19 @@
} T_HalAudioLoopTestPra;
-#ifdef ECALL_SUPPORT
typedef enum
{
ECALL_ST_INIT = 0,
- ECALL_ST_OPEN,
- ECALL_ST_START,
- ECALL_ST_IDLE,
- ECALL_ST_RX_IDLE,
- ECALL_ST_TX_IDLE,
- ECALL_ST_INUSE,
- ECALL_ST_RX_INUSE,
- ECALL_ST_TX_INUSE,
- ECALL_ST_STOP,
- ECALL_ST_CLOSE,
+ ECALL_ST_OPEN,//1
+ ECALL_ST_START,//2
+ ECALL_ST_IDLE,//3
+ ECALL_ST_RX_IDLE,//4
+ ECALL_ST_TX_IDLE,//5
+ ECALL_ST_INUSE,//6
+ ECALL_ST_RX_INUSE,//7
+ ECALL_ST_TX_INUSE,//8
+ ECALL_ST_STOP,//9
+ ECALL_ST_CLOSE,//10
ECALL_ST_MAX
} T_Ecall_State;
@@ -210,14 +209,13 @@
ZOSS_SEMAPHORE_ID wrSemaphore;
ZOSS_SEMAPHORE_ID rdSemaphore;
T_Ecall_State ecallSta;
- T_Ecall_State ecallRxSta;
- T_Ecall_State ecallTxSta;
+ T_Ecall_State ecallRxSta;//two state,idle/inuse
+ T_Ecall_State ecallTxSta;//two state,idle/inuse
unsigned char* rxDataBuf;
unsigned char* txDataBuf;
int dataBufSize;
} T_Hal_EcallData;
-#endif
typedef struct
{
@@ -283,9 +281,7 @@
BOOL vpLoopBkRunning;//23
BOOL rxMuteEn; //24
BOOL firstRegZCATFlag; //25
-#ifdef ECALL_SUPPORT
T_Hal_EcallData ecallData;//26
-#endif
} T_zDrvVoice_GbVar; //T_zDrvVoice_GbVar
typedef struct