From 2124941746a1e407145097a7b42993ca1c1c4296 Mon Sep 17 00:00:00 2001
From: Bhavna Sharma <sbhavna@codeaurora.org>
Date: Tue, 17 Jul 2018 14:48:32 -0700
Subject: [PATCH] Add support for multiband data

CRs-Fixed: 2289264

Change-Id: I5339870e8be3247b445203dad39e6f8522a64575
---
 location/LocationDataTypes.h | 4 +++-
 utils/gps_extended_c.h       | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/location/LocationDataTypes.h b/location/LocationDataTypes.h
index 1f2a422a..4b5b86da 100644
--- a/location/LocationDataTypes.h
+++ b/location/LocationDataTypes.h
@@ -37,7 +37,7 @@
 
 #define GNSS_NI_REQUESTOR_MAX  (256)
 #define GNSS_NI_MESSAGE_ID_MAX (2048)
-#define GNSS_SV_MAX            (64)
+#define GNSS_SV_MAX            (176)
 #define GNSS_MEASUREMENTS_MAX  (64)
 #define GNSS_UTC_TIME_OFFSET   (3657)
 
@@ -888,6 +888,7 @@ typedef struct {
     float azimuth;     // azimuth of SV (in degrees)
     GnssSvOptionsMask gnssSvOptionsMask; // Bitwise OR of GnssSvOptionsBits
     float carrierFrequencyHz; // carrier frequency of the signal tracked
+    GnssSignalTypeMask gnssSignalTypeMask; // Specifies GNSS signal type
 } GnssSv;
 
 struct GnssConfigSetAssistanceServer {
@@ -948,6 +949,7 @@ typedef struct {
 typedef struct {
     size_t size;                 // set to sizeof(GnssSvNotification)
     size_t count;                // number of SVs in the GnssSv array
+    bool gnssSignalTypeMaskValid;
     GnssSv gnssSvs[GNSS_SV_MAX]; // information on a number of SVs
 } GnssSvNotification;
 
diff --git a/utils/gps_extended_c.h b/utils/gps_extended_c.h
index 8062cfdd..77d09de3 100644
--- a/utils/gps_extended_c.h
+++ b/utils/gps_extended_c.h
@@ -1403,6 +1403,8 @@ typedef struct
     /*  Extended Time Information - Cumulative Number of Clock Resets */
     uint8_t numClockResets_valid;  /**< Must be set to true if numClockResets is being passed */
     uint32_t numClockResets;
+    bool                                     gnssSignalTypeMaskValid;
+    GnssSignalTypeMask                       gnssSignalTypeMask;
 
 } GnssSvMeasurementSet;