增加接口 REQ_ReadAP_NVRAM_QC

@@ -178,7 +178,13 @@ META_RESULT SmartPhoneSN::WriteNvramLoop()
             break;
 
         case SP_CHECK_CAL_FT_FLAG_STAGE:
-            if (g_sMetaComm.bCheckCalFlag || g_sMetaComm.bCheckFtFlag)
+	//  <<XIEMENG
+	#ifdef __TOPWELL_QCTEST__	
+    if (g_sMetaComm.bCheckCalFlag || g_sMetaComm.bCheckFtFlag || g_sMetaComm.bCheckQCFlag)
+	#else
+    if (g_sMetaComm.bCheckCalFlag || g_sMetaComm.bCheckFtFlag)
+	#endif
+	//  >>XIEMENG
             {
                 char tmpBuf[2048] = {0};
                 iRet = REQ_ReadModem_NVRAM_Start(WRITE_BARCODE, tmpBuf, 1);
@@ -2468,6 +2474,99 @@ SPMETA_DLL::META_RESULT SmartPhoneSN::REQ_ReadAP_NVRAM_Start(WriteData_Type_e da
     return MetaResult;
 }
 
+
+
+	//  <<XIEMENG
+#ifdef __TOPWELL_QCTEST__	
+int SmartPhoneSN::REQ_ReadAP_NVRAM_QC(void)
+{
+    MTRACE (g_hEBOOT_DEBUG, "SmartPhoneSN::REQ_ReadAP_NVRAM_QC()...");
+	
+    SPMETA_DLL::META_RESULT MetaResult = SPMETA_DLL::META_SUCCESS;   
+    int iBufLen = 0;
+    char *pLID = NULL;
+	CString mytest,mytesttemp;
+    pLID = "AP_CFG_REEB_PRODUCT_INFO_LID";		
+	
+	//    pLID = "AP_CFG_REEB_PRODUCT_INFO_LID";		
+    SPMETA_DLL::FT_NVRAM_READ_REQ sNVRAM_ReadReq;
+    SPMETA_DLL::FT_NVRAM_READ_CNF sNVRAM_ReadCnf;
+    SPMETA_DLL::META_RESULT meta_result;
+    int iWriteBufSize = 0;
+    memset(&sNVRAM_ReadReq, 0, sizeof(SPMETA_DLL::FT_NVRAM_READ_REQ));
+    memset(&sNVRAM_ReadCnf, 0, sizeof(SPMETA_DLL::FT_NVRAM_READ_CNF));
+	
+    MTRACE (g_hEBOOT_DEBUG, "SmartPhoneSN::SP_META_NVRAM_GetRecLen(): Start to get nvram struct size via LID = \"%s\"...", pLID);
+    meta_result = SPMETA_DLL::SP_META_NVRAM_GetRecLen(pLID, &iWriteBufSize);
+    if (  SPMETA_DLL::META_SUCCESS != meta_result)
+    {
+        MTRACE_ERR (g_hEBOOT_DEBUG, "SmartPhoneSN::SP_META_NVRAM_GetRecLen(): Get nvram struct size fail, MetaResult = %s", ResultToString_SP(meta_result));
+        return 0;
+    }
+    else
+    {
+        MTRACE (g_hEBOOT_DEBUG, "SmartPhoneSN::SP_META_NVRAM_GetRecLen(): Get nvram struct size = %d successfully!", iWriteBufSize);
+        if ( NULL != sNVRAM_ReadCnf.buf )
+        {
+            free ( sNVRAM_ReadCnf.buf );	
+            sNVRAM_ReadCnf.buf = NULL;
+        }
+        
+        sNVRAM_ReadReq.LID = pLID;
+        sNVRAM_ReadReq.RID = 1;
+        sNVRAM_ReadCnf.len = iWriteBufSize;
+        sNVRAM_ReadCnf.buf = (unsigned char*) malloc (iWriteBufSize*sizeof(unsigned char));
+        if (NULL == sNVRAM_ReadCnf.buf)
+        {
+            MTRACE_ERR (g_hEBOOT_DEBUG, "Malloc heap memory cause fail!");
+            return	0;
+        }
+    }
+    
+    MTRACE (g_hEBOOT_DEBUG, "SmartPhoneSN::REQ_ReadFromAPNVRAM(): Start to read nvram data...");		
+    meta_result =  REQ_ReadFromAPNVRAM (&sNVRAM_ReadReq, &sNVRAM_ReadCnf);
+	
+	
+    if (meta_result != SPMETA_DLL::META_SUCCESS )
+    {
+		
+		
+		
+        MTRACE_ERR (g_hEBOOT_DEBUG, "REQ_ReadFromAPNVRAM: fail! MetaResult = %s", ResultToString_SP(meta_result));
+        return 0;
+    }
+	
+	{
+		int loop = 0;
+		for (;loop<iWriteBufSize;loop++)
+		{
+			if(loop%50 == 0)
+				mytesttemp.Format(" %d_%x\n",loop,sNVRAM_ReadCnf.buf[loop]);
+			else
+				mytesttemp.Format(" %d_%x",loop,sNVRAM_ReadCnf.buf[loop]);
+			mytest += mytesttemp;
+		}
+	}
+	
+	if(sNVRAM_ReadCnf.buf[g_sMetaComm.QCFlag_index] == 0)
+	{
+		//			::AfxMessageBox("QC test fail");
+		return	0;
+	}
+	else
+	{
+		//			::AfxMessageBox("QC test pass");
+		return 1;
+	}
+	
+	
+	
+	
+}
+
+#endif
+	//  >>XIEMENG
+
 SPMETA_DLL::META_RESULT SmartPhoneSN::REQ_WriteAP_NVRAM_Start(WriteData_Type_e dataType, char *pInData, unsigned short iRID)
 {
     if (!pInData)

@@ -73,6 +73,11 @@ protected:
     virtual SPMETA_DLL::META_RESULT LoadAPDatabase();
 
     virtual SPMETA_DLL::META_RESULT REQ_ReadAP_NVRAM_Start(WriteData_Type_e dataType, char *pOutData, unsigned short iRID);
+	//  <<XIEMENG
+	#ifdef __TOPWELL_QCTEST__
+    virtual int REQ_ReadAP_NVRAM_QC();
+	#endif
+	//  >>XIEMENG
     virtual SPMETA_DLL::META_RESULT REQ_WriteAP_NVRAM_Start(WriteData_Type_e dataType, char *pInData, unsigned short iRID);
     virtual META_RESULT REQ_ReadModem_NVRAM_Start(WriteData_Type_e dataType, char *pOutData, unsigned short iRID);
     virtual META_RESULT REQ_WriteModem_NVRAM_Start(WriteData_Type_e dataType, char *pInData, unsigned short iRID);

@@ -21,6 +21,7 @@
 #endif // _AFX_NO_AFXCMN_SUPPORT
 
 extern const char* g_strToolVersion;
+#define __TOPWELL_QCTEST__
 
 //{{AFX_INSERT_LOCATION}}