From 08237e52b67a06bb1ed35b5fb4a40aed8cd4c83a Mon Sep 17 00:00:00 2001
From: Tushar Janefalkar <tusharj@codeaurora.org>
Date: Tue, 17 Jun 2014 11:23:10 -0700
Subject: [PATCH] Revert "Remove masks for Glonass"

This reverts commit 7d128bf31e4692db64cb94b2c03154db00cb2d77

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

diff --git a/core/gps_extended_c.h b/core/gps_extended_c.h
index d4a7dbea..63fe32a9 100644
--- a/core/gps_extended_c.h
+++ b/core/gps_extended_c.h
@@ -102,6 +102,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) */
diff --git a/core/loc_core_log.cpp b/core/loc_core_log.cpp
index d2eda661..430f4b8e 100644
--- a/core/loc_core_log.cpp
+++ b/core/loc_core_log.cpp
@@ -118,20 +118,13 @@ 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( 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_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( GPS_DELETE_TIME_GPS ),
-    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)
+    NAME_VAL( GPS_DELETE_TIME_GLO )
 };
 static int loc_eng_aiding_data_bit_num = sizeof(loc_eng_aiding_data_bits) / sizeof(loc_name_val_s_type);