query the model number from the host

diff --git a/gr-vrt/src/vrt_quadradio_source_32fc.h b/gr-vrt/src/vrt_quadradio_source_32fc.h
index 45dad1f89ab313106aac88da4b3cc2a99e889c83..bb3935c466d159c0ec011dc7e719edc6613f254f 100644 (file)
--- a/gr-vrt/src/vrt_quadradio_source_32fc.h
+++ b/gr-vrt/src/vrt_quadradio_source_32fc.h
@@ -120,8 +120,9 @@ public:
   double get_lo_freq(void){return d_lo_freq;}
   bool get_lo_locked(void){return d_lo_locked;}
   double get_caldiv_temp(void){return d_caldiv_temp;}
-  int get_caldiv_serial(void){return d_caldiv_rev;}
-  int get_caldiv_revision(void){return d_caldiv_ser;}
+  int get_caldiv_revision(void){return d_caldiv_rev;}
+  int get_caldiv_serial(void){return d_caldiv_ser;}
+  int get_caldiv_model(void){return d_caldiv_mod;}
   
   //gps public access methods
   int get_utc_time(void){return d_utc_time;}

diff --git a/gr-vrt/src/vrt_source_32fc.cc b/gr-vrt/src/vrt_source_32fc.cc
index 3035813cc54a9c5821de5ac3c3485e2ffc8519af..e56e3f2ad272d6ee4b452a041119aaf1ac66545c 100644 (file)
--- a/gr-vrt/src/vrt_source_32fc.cc
+++ b/gr-vrt/src/vrt_source_32fc.cc
@@ -178,8 +178,9 @@ vrt_source_32fc::work(int noutput_items,
     d_cal_locked = bool(ntohx(h.get_if_context()->caldiv.cal_locked));
     d_cal_enabled = bool(ntohx(h.get_if_context()->caldiv.cal_enabled));
     d_caldiv_temp = vrt_temp_to_double(ntohx(h.get_if_context()->caldiv.temp));
-    d_caldiv_ser = ntohx(h.get_if_context()->caldiv.ser);
     d_caldiv_rev = ntohx(h.get_if_context()->caldiv.rev);
+    d_caldiv_ser = ntohx(h.get_if_context()->caldiv.ser);
+    d_caldiv_mod = ntohx(h.get_if_context()->caldiv.mod);
     //extract gps stuff
     d_utc_time = ntohx(h.get_if_context()->gps.formatted_gps.integer_secs);
     d_altitude = vrt_altitude_to_double(ntohx(h.get_if_context()->gps.formatted_gps.altitude));

diff --git a/gr-vrt/src/vrt_source_32fc.h b/gr-vrt/src/vrt_source_32fc.h
index 46d80f4426e033eaee0c158dd32f5094a639d7fd..c43170e83beb779b553dedd072200f5e9604940e 100644 (file)
--- a/gr-vrt/src/vrt_source_32fc.h
+++ b/gr-vrt/src/vrt_source_32fc.h
@@ -43,6 +43,7 @@ protected:
   double d_caldiv_temp;
   int    d_caldiv_rev;
   int    d_caldiv_ser;
+  int    d_caldiv_mod;
   
   //gps settings parsed from if context
   int    d_utc_time;

diff --git a/vrt/include/vrt/if_context.h b/vrt/include/vrt/if_context.h
index b1d5424597a54664141d5002429b5ca1e649a314..24aba7a9e6da47a666cf2b33e6ecadded1e8e7b4 100644 (file)
--- a/vrt/include/vrt/if_context.h
+++ b/vrt/include/vrt/if_context.h
@@ -216,6 +216,7 @@ typedef struct caldiv_if_cntx_tag {
   uint32_t temp;
   uint32_t rev;
   uint32_t ser;
+  uint32_t mod;
 } __attribute__((packed)) caldiv_if_cntx_t;
 
 // FIXME the rest...