Commit 811190b640b69ff2e8e1efb2f7efe3629de6dc04
1 parent
651e5e5e
写号工具第一步是AP模式, 第二部是BP模式
在初始化AP模式之后, 读取手机中的QC flag,到全局变量g_QC_value_from_phone中待用
Showing
3 changed files
with
27 additions
and
15 deletions
| @@ -19,6 +19,7 @@ | @@ -19,6 +19,7 @@ | ||
| 19 | 19 | ||
| 20 | 20 | ||
| 21 | extern CSNWriterDlg *g_pMainDlg; | 21 | extern CSNWriterDlg *g_pMainDlg; |
| 22 | +extern byte g_QC_value_from_phone;// 从手机中读到的QC值 | ||
| 22 | 23 | ||
| 23 | static const GUID GUID_PORT_CLASS_USB2SER = {0x4D36E978L, 0xE325, 0x11CE, {0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18}}; | 24 | static const GUID GUID_PORT_CLASS_USB2SER = {0x4D36E978L, 0xE325, 0x11CE, {0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18}}; |
| 24 | 25 | ||
| @@ -2478,7 +2479,7 @@ SPMETA_DLL::META_RESULT SmartPhoneSN::REQ_ReadAP_NVRAM_Start(WriteData_Type_e da | @@ -2478,7 +2479,7 @@ SPMETA_DLL::META_RESULT SmartPhoneSN::REQ_ReadAP_NVRAM_Start(WriteData_Type_e da | ||
| 2478 | 2479 | ||
| 2479 | // <<XIEMENG | 2480 | // <<XIEMENG |
| 2480 | #ifdef __TOPWELL_QCTEST__ | 2481 | #ifdef __TOPWELL_QCTEST__ |
| 2481 | -int SmartPhoneSN::REQ_ReadAP_NVRAM_QC(void) | 2482 | +byte SmartPhoneSN::REQ_ReadAP_NVRAM_QC(void) |
| 2482 | { | 2483 | { |
| 2483 | MTRACE (g_hEBOOT_DEBUG, "SmartPhoneSN::REQ_ReadAP_NVRAM_QC()..."); | 2484 | MTRACE (g_hEBOOT_DEBUG, "SmartPhoneSN::REQ_ReadAP_NVRAM_QC()..."); |
| 2484 | 2485 | ||
| @@ -2548,18 +2549,7 @@ int SmartPhoneSN::REQ_ReadAP_NVRAM_QC(void) | @@ -2548,18 +2549,7 @@ int SmartPhoneSN::REQ_ReadAP_NVRAM_QC(void) | ||
| 2548 | } | 2549 | } |
| 2549 | } | 2550 | } |
| 2550 | 2551 | ||
| 2551 | - if(sNVRAM_ReadCnf.buf[g_sMetaComm.QCFlag_index] == 0) | ||
| 2552 | - { | ||
| 2553 | - // ::AfxMessageBox("QC test fail"); | ||
| 2554 | - return 0; | ||
| 2555 | - } | ||
| 2556 | - else | ||
| 2557 | - { | ||
| 2558 | - // ::AfxMessageBox("QC test pass"); | ||
| 2559 | - return 1; | ||
| 2560 | - } | ||
| 2561 | - | ||
| 2562 | - | 2552 | + return sNVRAM_ReadCnf.buf[g_sMetaComm.QCFlag_index]; |
| 2563 | 2553 | ||
| 2564 | 2554 | ||
| 2565 | } | 2555 | } |
| @@ -4379,6 +4369,28 @@ void SmartPhoneSN::ThreadMainEntryPoint() | @@ -4379,6 +4369,28 @@ void SmartPhoneSN::ThreadMainEntryPoint() | ||
| 4379 | MTRACE (g_hEBOOT_DEBUG, "SmartPhoneSN::GetSPModemInfo_Ex(): Query modem information end."); | 4369 | MTRACE (g_hEBOOT_DEBUG, "SmartPhoneSN::GetSPModemInfo_Ex(): Query modem information end."); |
| 4380 | } | 4370 | } |
| 4381 | 4371 | ||
| 4372 | + | ||
| 4373 | +#ifdef __TOPWELL_QCTEST__ | ||
| 4374 | + if (g_sMetaComm.bCheckQCFlag) | ||
| 4375 | + { | ||
| 4376 | + g_QC_value_from_phone = REQ_ReadAP_NVRAM_QC(); | ||
| 4377 | + switch(g_QC_value_from_phone) | ||
| 4378 | + { | ||
| 4379 | + case 0: | ||
| 4380 | + UpdateUIMsg("未进行QC测试"); | ||
| 4381 | + bAnyOperationFail = true; | ||
| 4382 | + break; | ||
| 4383 | + case 1: | ||
| 4384 | + UpdateUIMsg("QC测试通过"); | ||
| 4385 | + break; | ||
| 4386 | + default: | ||
| 4387 | + UpdateUIMsg("QC测试失败"); | ||
| 4388 | + bAnyOperationFail = true; | ||
| 4389 | + break; | ||
| 4390 | + } | ||
| 4391 | + } | ||
| 4392 | +#endif | ||
| 4393 | + | ||
| 4382 | //Special case: m_bWriteModemNvram = true && m_sMdInfo.number_of_md = 0 | 4394 | //Special case: m_bWriteModemNvram = true && m_sMdInfo.number_of_md = 0 |
| 4383 | //So skip to load modem database | 4395 | //So skip to load modem database |
| 4384 | MTRACE (g_hEBOOT_DEBUG, "m_bWriteModemNvram = %d,m_sMdInfo.number_of_md = %d", m_bWriteModemNvram, m_sMdInfo.number_of_md); | 4396 | MTRACE (g_hEBOOT_DEBUG, "m_bWriteModemNvram = %d,m_sMdInfo.number_of_md = %d", m_bWriteModemNvram, m_sMdInfo.number_of_md); |
| @@ -75,7 +75,7 @@ protected: | @@ -75,7 +75,7 @@ protected: | ||
| 75 | virtual SPMETA_DLL::META_RESULT REQ_ReadAP_NVRAM_Start(WriteData_Type_e dataType, char *pOutData, unsigned short iRID); | 75 | virtual SPMETA_DLL::META_RESULT REQ_ReadAP_NVRAM_Start(WriteData_Type_e dataType, char *pOutData, unsigned short iRID); |
| 76 | // <<XIEMENG | 76 | // <<XIEMENG |
| 77 | #ifdef __TOPWELL_QCTEST__ | 77 | #ifdef __TOPWELL_QCTEST__ |
| 78 | - virtual int REQ_ReadAP_NVRAM_QC(); | 78 | + virtual byte REQ_ReadAP_NVRAM_QC(); |
| 79 | #endif | 79 | #endif |
| 80 | // >>XIEMENG | 80 | // >>XIEMENG |
| 81 | virtual SPMETA_DLL::META_RESULT REQ_WriteAP_NVRAM_Start(WriteData_Type_e dataType, char *pInData, unsigned short iRID); | 81 | virtual SPMETA_DLL::META_RESULT REQ_WriteAP_NVRAM_Start(WriteData_Type_e dataType, char *pInData, unsigned short iRID); |
| @@ -29,7 +29,7 @@ static char THIS_FILE[] = __FILE__; | @@ -29,7 +29,7 @@ static char THIS_FILE[] = __FILE__; | ||
| 29 | #define MAX_COMPORT_COUNT 255 | 29 | #define MAX_COMPORT_COUNT 255 |
| 30 | unsigned short g_iTotalComPort = MAX_COMPORT_COUNT; | 30 | unsigned short g_iTotalComPort = MAX_COMPORT_COUNT; |
| 31 | unsigned short g_iComportArray[MAX_COMPORT_COUNT] = {0}; | 31 | unsigned short g_iComportArray[MAX_COMPORT_COUNT] = {0}; |
| 32 | - | 32 | +byte g_QC_value_from_phone;// ´ÓÊÖ»úÖжÁµ½µÄQCÖµ |
| 33 | const char *g_strToolVersion = "SN Writer V1.1728.00"; | 33 | const char *g_strToolVersion = "SN Writer V1.1728.00"; |
| 34 | 34 | ||
| 35 | extern CSNWriterDlg *g_pMainDlg; | 35 | extern CSNWriterDlg *g_pMainDlg; |
Please
register
or
login
to post a comment