Deleting gps_telemetry.cc and gps_telemetry.h. Most of the functions were not used anywhere, the others have been moved to places in which make sense.

git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@107 64b25241-fba3-4117-9849-534c7e92360d

src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.cc

@@ -33,16 +33,16 @@
  * \todo Clean this code and move the telemetry definitions to GPS_L1_CA system definitions file
  */
 
+#include "gps_l1_ca_telemetry_decoder_cc.h"
 #include <iostream>
 #include <sstream>
 #include <bitset>
 #include <gnuradio/gr_io_signature.h>
 #include <glog/log_severity.h>
 #include <glog/logging.h>
-#include "gps_l1_ca_telemetry_decoder_cc.h"
 #include "control_message_factory.h"
 
-
+#define _lrotl(X,N)             ((X << N) ^ (X >> (32-N)))      //!< Used in the parity check algorithm
 
 
 using google::LogMessage;
@@ -121,6 +121,38 @@ gps_l1_ca_telemetry_decoder_cc::~gps_l1_ca_telemetry_decoder_cc() {
 
 }
 
+
+
+bool gps_l1_ca_telemetry_decoder_cc::gps_word_parityCheck(unsigned int gpsword)
+{
+  unsigned int d1,d2,d3,d4,d5,d6,d7,t,parity;
+
+  /* XOR as many bits in parallel as possible.  The magic constants pick
+       up bits which are to be XOR'ed together to implement the GPS parity
+       check algorithm described in IS-GPS-200E.  This avoids lengthy shift-
+       and-xor loops. */
+
+  d1 = gpsword & 0xFBFFBF00;
+  d2 = _lrotl(gpsword,1) & 0x07FFBF01;
+  d3 = _lrotl(gpsword,2) & 0xFC0F8100;
+  d4 = _lrotl(gpsword,3) & 0xF81FFE02;
+  d5 = _lrotl(gpsword,4) & 0xFC00000E;
+  d6 = _lrotl(gpsword,5) & 0x07F00001;
+  d7 = _lrotl(gpsword,6) & 0x00003000;
+
+  t = d1 ^ d2 ^ d3 ^ d4 ^ d5 ^ d6 ^ d7;
+
+  // Now XOR the 5 6-bit fields together to produce the 6-bit final result.
+
+  parity = t ^ _lrotl(t,6) ^ _lrotl(t,12) ^ _lrotl(t,18) ^ _lrotl(t,24);
+  parity = parity & 0x3F;
+  if (parity == (gpsword&0x3F))
+    return(true);
+  else
+    return(false);
+
+}
+
 int gps_l1_ca_telemetry_decoder_cc::general_work (int noutput_items, gr_vector_int &ninput_items,
     gr_vector_const_void_star &input_items,	gr_vector_void_star &output_items) {
   int corr_value=0;
@@ -247,7 +279,7 @@ int gps_l1_ca_telemetry_decoder_cc::general_work (int noutput_items, gr_vector_i
         {
         d_GPS_frame_4bytes ^= 0x3FFFFFC0; // invert the data bits (using XOR)
         }
-      if (gps_word_parityCheck(d_GPS_frame_4bytes)) {
+      if (gps_l1_ca_telemetry_decoder_cc::gps_word_parityCheck(d_GPS_frame_4bytes)) {
         memcpy(&d_GPS_FSM.d_GPS_frame_4bytes,&d_GPS_frame_4bytes,sizeof(char)*4);
         d_GPS_FSM.d_preamble_time_ms=d_preamble_time_seconds*1000.0;
         d_GPS_FSM.Event_gps_word_valid();

src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.h

@@ -31,15 +31,17 @@
 #ifndef GNSS_SDR_GPS_L1_CA_TELEMETRY_DECODER_CC_H
 #define	GNSS_SDR_GPS_L1_CA_TELEMETRY_DECODER_CC_H
 
+
+#include "GPS_L1_CA.h"
+#include "gps_l1_ca_subframe_fsm.h"
+#include "concurrent_queue.h"
 #include <fstream>
 #include <bitset>
 #include <gnuradio/gr_block.h>
-//#include <gnuradio/gr_sync_block.h>
 #include <gnuradio/gr_msg_queue.h>
-#include "GPS_L1_CA.h"
-#include "gps_telemetry.h"
-#include "gps_l1_ca_subframe_fsm.h"
-#include "concurrent_queue.h"
+//#include <gnuradio/gr_sync_block.h>
+
+
 
 class gps_l1_ca_telemetry_decoder_cc;
 
@@ -64,6 +66,8 @@ private:
   gps_l1_ca_telemetry_decoder_cc(unsigned int satellite, long if_freq, long fs_in,unsigned
       int vector_length, gr_msg_queue_sptr queue, bool dump);
 
+  bool gps_word_parityCheck(unsigned int gpsword);
+
   // constants
   unsigned short int d_preambles_bits[8];
 

src/algorithms/telemetry_decoder/libs/gps_l1_ca_subframe_fsm.h

@@ -45,7 +45,6 @@
 #include <iostream>
 #include <cstring>
 #include "GPS_L1_CA.h"
-#include "gps_telemetry.h"
 #include "gps_navigation_message.h"
 
 namespace sc = boost::statechart;