From: Johnathan Corgan <jcorgan@corganenterprises.com>
Date: Wed, 21 Oct 2009 21:20:15 +0000 (-0700)
Subject: Merge branch 'vrt' of http://gnuradio.org/git/jblum
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=8e003a402af2993f978620741fdf195ac9bf7834;p=debian%2Fgnuradio

Merge branch 'vrt' of http://gnuradio.org/git/jblum

Merge fix: added GRUEL_INCLUDES to vrt Makefile
Merge fix: added missing include in gr-vrt

* 'vrt' of http://gnuradio.org/git/jblum:
  query the model number from the host
  fix so all handlers get called on event
  simplfied the code while i was looking at it
  added access methods for gps stuff
  added access methods and parsing for caldiv if context
  use existing utility method
  reading the lo back and storing it
  use the new htonll and vrt types to send cal and lo freqs
  checking for if context packets and setting up the payload pointer and size
  Reading 64 bit freq out of chunk of context packet.
  copied over vrt context and type headers, updated bits.h as well
  Dump IF-Context packets in hex.
  use gruel/inet.h instead of arap/inet.h
  fix white space
  made rxdspno a parameter for: start/stop streaming, and quadradio32fc
---

8e003a402af2993f978620741fdf195ac9bf7834
diff --cc gr-vrt/src/vrt_source_32fc.cc
index beb5ef26,e56e3f2a..f9375d31
--- a/gr-vrt/src/vrt_source_32fc.cc
+++ b/gr-vrt/src/vrt_source_32fc.cc
@@@ -30,6 -32,9 +32,9 @@@
  #include <gr_io_signature.h>
  #include <missing_pkt_checker.h>
  #include <iostream>
+ #include <gruel/inet.h>
+ #include <cstdio>
 -
++#include <cstring>
  
  #define VERBOSE 1		// define to 0 or 1
  
diff --cc vrt/lib/Makefile.am
index 9832c0cd,9832c0cd..d41343a5
--- a/vrt/lib/Makefile.am
+++ b/vrt/lib/Makefile.am
@@@ -20,7 -20,7 +20,8 @@@ include $(top_srcdir)/Makefile.commo
  AM_CPPFLAGS = \
      $(VRT_INCLUDES) \
      $(BOOST_CPPFLAGS) \
--    $(CPPUNIT_INCLUDES)
++    $(CPPUNIT_INCLUDES) \
++    $(GRUEL_INCLUDES)
  
  bin_PROGRAMS =