From 6925f8a04aa0190638f311292cc69a41c81c905c Mon Sep 17 00:00:00 2001
From: Tushar Janefalkar <tusharj@codeaurora.org>
Date: Mon, 28 Jul 2014 16:58:06 -0700
Subject: [PATCH] Revert "Revert "Remove masks for Glonass""

This reverts commit 08237e52b67a06bb1ed35b5fb4a40aed8cd4c83a.

Change-Id: I4e507ef8777d45825234914841562e7f2901bae0
---
 core/gps_extended_c.h | 10 ----------
 core/loc_core_log.cpp | 19 +++++++++++++------
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/core/gps_extended_c.h b/core/gps_extended_c.h
index 63fe32a9..d4a7dbea 100644
--- a/core/gps_extended_c.h
+++ b/core/gps_extended_c.h
@@ -102,16 +102,6 @@ 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) */
diff --git a/core/loc_core_log.cpp b/core/loc_core_log.cpp
index 430f4b8e..d2eda661 100644
--- a/core/loc_core_log.cpp
+++ b/core/loc_core_log.cpp
@@ -118,13 +118,20 @@ static loc_name_val_s_type loc_eng_aiding_data_bits[] =
     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 ),
-    NAME_VAL( GPS_DELETE_SVDIR_GLO ),
-    NAME_VAL( GPS_DELETE_SVSTEER_GLO ),
-    NAME_VAL( GPS_DELETE_ALMANAC_CORR_GLO ),
+    NAME_VAL( GLO_DELETE_EPHEMERIS ),
+    NAME_VAL( GLO_DELETE_ALMANAC ),
+    NAME_VAL( GLO_DELETE_SVDIR ),
+    NAME_VAL( GLO_DELETE_SVSTEER ),
+    NAME_VAL( GLO_DELETE_ALMANAC_CORR ),
     NAME_VAL( GPS_DELETE_TIME_GPS ),
-    NAME_VAL( GPS_DELETE_TIME_GLO )
+    NAME_VAL( GLO_DELETE_TIME ),
+    NAME_VAL( BDS_DELETE_SVDIR ),
+    NAME_VAL( BDS_DELETE_SVSTEER ),
+    NAME_VAL( BDS_DELETE_TIME ),
+    NAME_VAL( BDS_DELETE_ALMANAC_CORR ),
+    NAME_VAL( BDS_DELETE_EPHEMERIS ),
+    NAME_VAL( BDS_DELETE_ALMANAC ),
+    NAME_VAL( GPS_DELETE_ALL)
 };
 static int loc_eng_aiding_data_bit_num = sizeof(loc_eng_aiding_data_bits) / sizeof(loc_name_val_s_type);