Merge "Detect APQ8074 HW"

This commit is contained in:
Linux Build Service Account 2013-05-17 06:43:18 -07:00 committed by Gerrit - the friendly Code Review server
commit c1470ca5c7

View file

@ -45,11 +45,13 @@
#define MSM8930_ID_1 "142" #define MSM8930_ID_1 "142"
#define MSM8930_ID_2 "116" #define MSM8930_ID_2 "116"
#define APQ8030_ID_1 "157" #define APQ8030_ID_1 "157"
#define APQ8074_ID_1 "126"
#define LINE_LEN 100 #define LINE_LEN 100
#define STR_LIQUID "Liquid" #define STR_LIQUID "Liquid"
#define STR_SURF "Surf" #define STR_SURF "Surf"
#define STR_MTP "MTP" #define STR_MTP "MTP"
#define STR_APQ "apq"
#define IS_STR_END(c) ((c) == '\0' || (c) == '\n' || (c) == '\r') #define IS_STR_END(c) ((c) == '\0' || (c) == '\n' || (c) == '\r')
#define LENGTH(s) (sizeof(s) - 1) #define LENGTH(s) (sizeof(s) - 1)
#define GPS_CHECK_NO_ERROR 0 #define GPS_CHECK_NO_ERROR 0
@ -105,6 +107,9 @@ targetEnumType get_target(void)
else if((!memcmp(rd_id, APQ8030_ID_1, LENGTH(APQ8030_ID_1)) && IS_STR_END(rd_id[LENGTH(APQ8030_ID_1)]))) else if((!memcmp(rd_id, APQ8030_ID_1, LENGTH(APQ8030_ID_1)) && IS_STR_END(rd_id[LENGTH(APQ8030_ID_1)])))
target = TARGET_APQ8030_STANDALONE; target = TARGET_APQ8030_STANDALONE;
} }
else if( (!memcmp(rd_hw_platform, STR_APQ, LENGTH(STR_APQ)) && IS_STR_END(rd_hw_platform[LENGTH(STR_APQ)])) &&
(!memcmp(rd_id, APQ8074_ID_1, LENGTH(APQ8074_ID_1)) && IS_STR_END(rd_id[LENGTH(APQ8074_ID_1)])) )
target = TARGET_APQ8064_STANDALONE;
else if( !memcmp(rd_id, MPQ8064_ID_1, LENGTH(MPQ8064_ID_1)) && IS_STR_END(rd_id[LENGTH(MPQ8064_ID_1)]) ) else if( !memcmp(rd_id, MPQ8064_ID_1, LENGTH(MPQ8064_ID_1)) && IS_STR_END(rd_id[LENGTH(MPQ8064_ID_1)]) )
target = TARGET_MPQ8064; target = TARGET_MPQ8064;
else if( (!memcmp(rd_id, MSM8930_ID_1, LENGTH(MSM8930_ID_1)) && IS_STR_END(rd_id[LENGTH(MSM8930_ID_1)])) || else if( (!memcmp(rd_id, MSM8930_ID_1, LENGTH(MSM8930_ID_1)) && IS_STR_END(rd_id[LENGTH(MSM8930_ID_1)])) ||