Merge branch 'maint'

Conflicts:
	host/docs/gpsdo.rst

3 files changed, 3 insertions, 7 deletions

diff --git a/host/docs/gpsdo.rst b/host/docs/gpsdo.rst
index f5e6f5e57..fcd9b30f5 100644
--- a/host/docs/gpsdo.rst
+++ b/host/docs/gpsdo.rst
@@ -75,6 +75,6 @@ format using the **time.h** library in C, **boost::posix_time** in C++, etc.
 
 Other information can be fetched as well. You can query the lock status
 with the **gps_locked** sensor, as well as obtain raw NMEA sentences using
-the **gps_gpgsa**, **gps_gprmc**, and **gps_gpgga** sensors. Location
+the **gps_gprmc**, and **gps_gpgga** sensors. Location
 information can be parsed out of the **gps_gpgga** sensor by using **gpsd** or
 another NMEA parser.
diff --git a/host/lib/usrp/b100/codec_ctrl.cpp b/host/lib/usrp/b100/codec_ctrl.cpp
index 4f9036039..278713ce1 100644
--- a/host/lib/usrp/b100/codec_ctrl.cpp
+++ b/host/lib/usrp/b100/codec_ctrl.cpp
@@ -105,7 +105,7 @@ b100_codec_ctrl_impl::b100_codec_ctrl_impl(spi_iface::sptr iface){
     _ad9862_regs.dll_mode = ad9862_regs_t::DLL_MODE_FAST;
 
     //write the register settings to the codec
-    for (uint8_t addr = 0; addr <= 25; addr++){
+    for (boost::uint8_t addr = 0; addr <= 25; addr++){
         this->send_reg(addr);
     }
 
diff --git a/host/lib/usrp/gps_ctrl.cpp b/host/lib/usrp/gps_ctrl.cpp
index 45fa1f39e..f3bdded60 100644
--- a/host/lib/usrp/gps_ctrl.cpp
+++ b/host/lib/usrp/gps_ctrl.cpp
@@ -98,7 +98,6 @@ public:
     std::vector<std::string> ret = boost::assign::list_of
         ("gps_gpgga")
         ("gps_gprmc")
-        ("gps_gpgsa")
         ("gps_time")
         ("gps_locked");
     return ret;
@@ -106,8 +105,7 @@ public:
 
   uhd::sensor_value_t get_sensor(std::string key) {
     if(key == "gps_gpgga"
-    or key == "gps_gprmc"
-    or key == "gps_gpgsa") {
+    or key == "gps_gprmc") {
         return sensor_value_t(
                  boost::to_upper_copy(key),
                  get_nmea(boost::to_upper_copy(key.substr(4,8))),
@@ -140,8 +138,6 @@ private:
      sleep(milliseconds(FIREFLY_STUPID_DELAY_MS));
     _send("GPS:GPRMC 1\n");
      sleep(milliseconds(FIREFLY_STUPID_DELAY_MS));
-    _send("GPS:GPGSA 1\n");
-     sleep(milliseconds(FIREFLY_STUPID_DELAY_MS));
   }
  
   //retrieve a raw NMEA sentence