Added more delete assistance data flags
Removed FEATURE_DELEXT flag that is no longer needed after adding the flags for this feature to gps_extended.h Change-Id: Id8a095309892e2eb328a02ef17e4aa1b1b54e815
This commit is contained in:
parent
c326530244
commit
112647bd23
4 changed files with 12 additions and 21 deletions
|
@ -2,10 +2,6 @@ ifneq ($(BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE),)
|
|||
|
||||
LOCAL_PATH := $(call my-dir)
|
||||
|
||||
GPS_DIR_LIST :=
|
||||
|
||||
FEATURE_DELEXT := false
|
||||
|
||||
# add RPC dirs if RPC is available
|
||||
ifneq ($(TARGET_NO_RPC),true)
|
||||
|
||||
|
@ -15,15 +11,6 @@ GPS_DIR_LIST += $(LOCAL_PATH)/libloc_api/
|
|||
|
||||
endif #TARGET_NO_RPC
|
||||
|
||||
ifeq ($(BOARD_USES_QCOM_HARDWARE), true)
|
||||
#add QMI libraries for QMI targets
|
||||
QMI_BOARD_PLATFORM_LIST := msm8960
|
||||
QMI_BOARD_PLATFORM_LIST += msm8974
|
||||
QMI_BOARD_PLATFORM_LIST += msm8226
|
||||
QMI_BOARD_PLATFORM_LIST += msm8610
|
||||
endif
|
||||
|
||||
|
||||
GPS_DIR_LIST += $(LOCAL_PATH)/libloc_api_50001/
|
||||
|
||||
#call the subfolders
|
||||
|
|
|
@ -25,10 +25,6 @@ LOCAL_CFLAGS += \
|
|||
-fno-short-enums \
|
||||
-D_ANDROID_
|
||||
|
||||
ifeq ($(FEATURE_DELEXT), true)
|
||||
LOCAL_CFLAGS += -DFEATURE_DELEXT
|
||||
endif #FEATURE_DELEXT
|
||||
|
||||
LOCAL_C_INCLUDES:= \
|
||||
$(TARGET_OUT_HEADERS)/gps.utils
|
||||
|
||||
|
|
|
@ -38,6 +38,16 @@ typedef int16_t AGpsBearerType;
|
|||
#define AGPS_APN_BEARER_IPV6 1
|
||||
#define AGPS_APN_BEARER_IPV4V6 2
|
||||
|
||||
#define GPS_DELETE_ALMANAC_CORR 0x00001000
|
||||
#define GPS_DELETE_FREQ_BIAS_EST 0x00002000
|
||||
#define GPS_DELETE_EPHEMERIS_GLO 0x00004000
|
||||
#define GPS_DELETE_ALMANAC_GLO 0x00008000
|
||||
#define GPS_DELETE_SVDIR_GLO 0x00010000
|
||||
#define GPS_DELETE_SVSTEER_GLO 0x00020000
|
||||
#define GPS_DELETE_ALMANAC_CORR_GLO 0x00040000
|
||||
#define GPS_DELETE_TIME_GPS 0x00080000
|
||||
#define GPS_DELETE_TIME_GLO 0x00100000
|
||||
|
||||
/** GPS extended callback structure. */
|
||||
typedef struct {
|
||||
/** set to sizeof(GpsCallbacks) */
|
||||
|
|
|
@ -166,9 +166,8 @@ static loc_name_val_s_type loc_eng_aiding_data_bits[] =
|
|||
NAME_VAL( GPS_DELETE_SVSTEER ),
|
||||
NAME_VAL( GPS_DELETE_SADATA ),
|
||||
NAME_VAL( GPS_DELETE_RTI ),
|
||||
NAME_VAL( GPS_DELETE_CELLDB_INFO )
|
||||
#ifdef FEATURE_DELEXT
|
||||
,NAME_VAL( GPS_DELETE_ALMANAC_CORR ),
|
||||
NAME_VAL( GPS_DELETE_CELLDB_INFO ),
|
||||
NAME_VAL( GPS_DELETE_ALMANAC_CORR ),
|
||||
NAME_VAL( GPS_DELETE_FREQ_BIAS_EST ),
|
||||
NAME_VAL( GPS_DELETE_EPHEMERIS_GLO ),
|
||||
NAME_VAL( GPS_DELETE_ALMANAC_GLO ),
|
||||
|
@ -177,7 +176,6 @@ static loc_name_val_s_type loc_eng_aiding_data_bits[] =
|
|||
NAME_VAL( GPS_DELETE_ALMANAC_CORR_GLO ),
|
||||
NAME_VAL( GPS_DELETE_TIME_GPS ),
|
||||
NAME_VAL( GPS_DELETE_TIME_GLO )
|
||||
#endif
|
||||
};
|
||||
static int loc_eng_aiding_data_bit_num = sizeof(loc_eng_aiding_data_bits) / sizeof(loc_name_val_s_type);
|
||||
|
||||
|
|
Loading…
Reference in a new issue