From 59dda49cce33584590e5e83b0b5c8e937f4bf1ab Mon Sep 17 00:00:00 2001
From: Michael du Breuil <michael@swiftradioplanes.com>
Date: Sun, 19 Jul 2015 20:13:50 -0700
Subject: [PATCH] AP_GPS: Fix missing reserved fields in the UBX-RXM-RAWX
 message

---
 libraries/AP_GPS/AP_GPS_UBLOX.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libraries/AP_GPS/AP_GPS_UBLOX.h b/libraries/AP_GPS/AP_GPS_UBLOX.h
index 656bd1dba7..92433cbc35 100644
--- a/libraries/AP_GPS/AP_GPS_UBLOX.h
+++ b/libraries/AP_GPS/AP_GPS_UBLOX.h
@@ -77,7 +77,7 @@ private:
         uint8_t numTrkChHw;
         uint8_t numTrkChUse;
         uint8_t numConfigBlocks;
-        struct configBlock {
+        PACKED struct configBlock {
             uint8_t gnssId;
             uint8_t resTrkCh;
             uint8_t maxTrkCh;
@@ -260,12 +260,13 @@ private:
         uint8_t numMeas;
         uint8_t recStat;
         uint8_t reserved1[3];
-        struct ubx_rxm_rawx_sv {
+        PACKED struct ubx_rxm_rawx_sv {
             double prMes;
             double cpMes;
             float doMes;
             uint8_t gnssId;
             uint8_t svId;
+            uint8_t reserved2;
             uint8_t freqId;
             uint16_t locktime;
             uint8_t cno;
@@ -273,6 +274,7 @@ private:
             uint8_t cpStdev;
             uint8_t doStdev;
             uint8_t trkStat;
+            uint8_t reserved3;
         } svinfo[UBLOX_MAX_RXM_RAWX_SATS];
     };
 #endif