Merge "Revert "Added Detection Logic For QMI_PDS Target.""

This commit is contained in:
Linux Build Service Account 2015-02-03 08:36:45 -08:00 committed by Gerrit - the friendly Code Review server
commit 80e8ab5024
2 changed files with 2 additions and 9 deletions

View file

@ -46,7 +46,6 @@
#define MSM8930_ID_2 "116" #define MSM8930_ID_2 "116"
#define APQ8030_ID_1 "157" #define APQ8030_ID_1 "157"
#define APQ8074_ID_1 "184" #define APQ8074_ID_1 "184"
#define PDS_ID_1 "178"
#define LINE_LEN 100 #define LINE_LEN 100
#define STR_LIQUID "Liquid" #define STR_LIQUID "Liquid"
@ -213,12 +212,8 @@ unsigned int loc_get_target(void)
gTarget = TARGET_AUTO; gTarget = TARGET_AUTO;
goto detected; goto detected;
} }
if( !memcmp(rd_hw_platform, STR_MTP, LENGTH(STR_MTP)) ){ if( !memcmp(baseband, STR_APQ, LENGTH(STR_APQ)) ){
if( !memcmp(rd_id, PDS_ID_1, LENGTH(PDS_ID_1))
&& IS_STR_END(rd_id[LENGTH(PDS_ID_1)]) )
gTarget = TARGET_PDS;
}
else if( !memcmp(baseband, STR_APQ, LENGTH(STR_APQ)) ){
if( !memcmp(rd_id, MPQ8064_ID_1, LENGTH(MPQ8064_ID_1)) if( !memcmp(rd_id, MPQ8064_ID_1, LENGTH(MPQ8064_ID_1))
&& IS_STR_END(rd_id[LENGTH(MPQ8064_ID_1)]) ) && IS_STR_END(rd_id[LENGTH(MPQ8064_ID_1)]) )
gTarget = TARGET_MPQ; gTarget = TARGET_MPQ;

View file

@ -35,7 +35,6 @@
#define TARGET_MPQ TARGET_SET(GNSS_NONE,NO_SSC) #define TARGET_MPQ TARGET_SET(GNSS_NONE,NO_SSC)
#define TARGET_MSM_NO_SSC TARGET_SET(GNSS_MSM, NO_SSC) #define TARGET_MSM_NO_SSC TARGET_SET(GNSS_MSM, NO_SSC)
#define TARGET_QCA1530 TARGET_SET(GNSS_QCA1530, NO_SSC) #define TARGET_QCA1530 TARGET_SET(GNSS_QCA1530, NO_SSC)
#define TARGET_PDS TARGET_SET(GNSS_PDS, NO_SSC)
#define TARGET_AUTO TARGET_SET(GNSS_AUTO, NO_SSC) #define TARGET_AUTO TARGET_SET(GNSS_AUTO, NO_SSC)
#define TARGET_UNKNOWN TARGET_SET(GNSS_UNKNOWN, NO_SSC) #define TARGET_UNKNOWN TARGET_SET(GNSS_UNKNOWN, NO_SSC)
#define getTargetGnssType(target) (target>>1) #define getTargetGnssType(target) (target>>1)
@ -62,7 +61,6 @@ typedef enum {
GNSS_GSS, GNSS_GSS,
GNSS_MDM, GNSS_MDM,
GNSS_QCA1530, GNSS_QCA1530,
GNSS_PDS,
GNSS_AUTO, GNSS_AUTO,
GNSS_UNKNOWN GNSS_UNKNOWN
}GNSS_TARGET; }GNSS_TARGET;