[Commit-gnuradio] r11383 - in gnuradio/branches/developers/jcorgan/usrp-headers: gr-usrp/apps gr-usrp/src usrp/host/include/usrp usrp/host/lib/legacy usrp/host/swig

[jcorgan]

Author: jcorgan
Date: 2009-07-08 18:16:33 -0600 (Wed, 08 Jul 2009)
New Revision: 11383

Added:
   
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/include/usrp/db_base.i
Removed:
   
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/lib/legacy/db_base.i
Modified:
   gnuradio/branches/developers/jcorgan/usrp-headers/gr-usrp/apps/Makefile.am
   gnuradio/branches/developers/jcorgan/usrp-headers/gr-usrp/src/usrp_base.cc
   gnuradio/branches/developers/jcorgan/usrp-headers/gr-usrp/src/usrp_base.h
   
gnuradio/branches/developers/jcorgan/usrp-headers/gr-usrp/src/usrp_sink_base.cc
   
gnuradio/branches/developers/jcorgan/usrp-headers/gr-usrp/src/usrp_sink_base.h
   gnuradio/branches/developers/jcorgan/usrp-headers/gr-usrp/src/usrp_sink_c.cc
   gnuradio/branches/developers/jcorgan/usrp-headers/gr-usrp/src/usrp_sink_s.cc
   
gnuradio/branches/developers/jcorgan/usrp-headers/gr-usrp/src/usrp_source_base.cc
   
gnuradio/branches/developers/jcorgan/usrp-headers/gr-usrp/src/usrp_source_base.h
   
gnuradio/branches/developers/jcorgan/usrp-headers/gr-usrp/src/usrp_source_c.cc
   
gnuradio/branches/developers/jcorgan/usrp-headers/gr-usrp/src/usrp_source_s.cc
   gnuradio/branches/developers/jcorgan/usrp-headers/gr-usrp/src/usrp_standard.i
   gnuradio/branches/developers/jcorgan/usrp-headers/gr-usrp/src/usrp_swig.i
   
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/include/usrp/Makefile.am
   
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/lib/legacy/Makefile.am
   gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/swig/usrp_prims.i
Log:
gr-usrp compiling, branch passes make check

Modified: 
gnuradio/branches/developers/jcorgan/usrp-headers/gr-usrp/apps/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/usrp-headers/gr-usrp/apps/Makefile.am  
2009-07-08 23:05:54 UTC (rev 11382)
+++ gnuradio/branches/developers/jcorgan/usrp-headers/gr-usrp/apps/Makefile.am  
2009-07-09 00:16:33 UTC (rev 11383)
@@ -24,9 +24,7 @@
 # For compiling within the GNU Radio build tree
 AM_CPPFLAGS=$(STD_DEFINES_AND_INCLUDES) \
         -I$(top_srcdir)/gr-usrp/src \
-        -I$(top_srcdir)/usrp/host/lib/legacy \
-        -I\${abs_top_builddir}/usrp/host/lib/legacy \
-        -I$(top_srcdir)/usrp/firmware/include \
+        $(USRP_INCLUDES) \
         $(WITH_INCLUDES)
 
 GR_USRP_LA=$(top_builddir)/gr-usrp/src/libgnuradio-usrp.la

Modified: 
gnuradio/branches/developers/jcorgan/usrp-headers/gr-usrp/src/usrp_base.cc
===================================================================
--- gnuradio/branches/developers/jcorgan/usrp-headers/gr-usrp/src/usrp_base.cc  
2009-07-08 23:05:54 UTC (rev 11382)
+++ gnuradio/branches/developers/jcorgan/usrp-headers/gr-usrp/src/usrp_base.cc  
2009-07-09 00:16:33 UTC (rev 11383)
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2008 Free Software Foundation, Inc.
+ * Copyright 2004,2008,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -23,7 +23,7 @@
 #include <config.h>
 #endif
 #include <usrp_base.h>
-#include <usrp_basic.h>
+#include <usrp/usrp_basic.h>
 
 class truth_table_element_t 
 {

Modified: 
gnuradio/branches/developers/jcorgan/usrp-headers/gr-usrp/src/usrp_base.h
===================================================================
--- gnuradio/branches/developers/jcorgan/usrp-headers/gr-usrp/src/usrp_base.h   
2009-07-08 23:05:54 UTC (rev 11382)
+++ gnuradio/branches/developers/jcorgan/usrp-headers/gr-usrp/src/usrp_base.h   
2009-07-09 00:16:33 UTC (rev 11383)
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2008 Free Software Foundation, Inc.
+ * Copyright 2004,2008,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -24,8 +24,8 @@
 #include <gr_sync_block.h>
 #include <stdexcept>
 #include <boost/shared_ptr.hpp>
-#include <db_base.h>
-#include <usrp_subdev_spec.h>
+#include <usrp/db_base.h>
+#include <usrp/usrp_subdev_spec.h>
 
 class usrp_basic;
 

Modified: 
gnuradio/branches/developers/jcorgan/usrp-headers/gr-usrp/src/usrp_sink_base.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/usrp-headers/gr-usrp/src/usrp_sink_base.cc 
    2009-07-08 23:05:54 UTC (rev 11382)
+++ 
gnuradio/branches/developers/jcorgan/usrp-headers/gr-usrp/src/usrp_sink_base.cc 
    2009-07-09 00:16:33 UTC (rev 11383)
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2008 Free Software Foundation, Inc.
+ * Copyright 2004,2008,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -26,7 +26,7 @@
 
 #include <usrp_sink_base.h>
 #include <gr_io_signature.h>
-#include <usrp_standard.h>
+#include <usrp/usrp_standard.h>
 #include <assert.h>
 #include <cstdio>
 

Modified: 
gnuradio/branches/developers/jcorgan/usrp-headers/gr-usrp/src/usrp_sink_base.h
===================================================================
--- 
gnuradio/branches/developers/jcorgan/usrp-headers/gr-usrp/src/usrp_sink_base.h  
    2009-07-08 23:05:54 UTC (rev 11382)
+++ 
gnuradio/branches/developers/jcorgan/usrp-headers/gr-usrp/src/usrp_sink_base.h  
    2009-07-09 00:16:33 UTC (rev 11383)
@@ -1,7 +1,7 @@
 
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2006,2008 Free Software Foundation, Inc.
+ * Copyright 2004,2006,2008,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -26,8 +26,8 @@
 
 #include <usrp_base.h>
 #include <stdexcept>
-#include <usrp_tune_result.h>
-#include <usrp_dbid.h>
+#include <usrp/usrp_tune_result.h>
+#include <usrp/usrp_dbid.h>
 
 class usrp_standard_tx;
 

Modified: 
gnuradio/branches/developers/jcorgan/usrp-headers/gr-usrp/src/usrp_sink_c.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/usrp-headers/gr-usrp/src/usrp_sink_c.cc    
    2009-07-08 23:05:54 UTC (rev 11382)
+++ 
gnuradio/branches/developers/jcorgan/usrp-headers/gr-usrp/src/usrp_sink_c.cc    
    2009-07-09 00:16:33 UTC (rev 11383)
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2006 Free Software Foundation, Inc.
+ * Copyright 2004,2006,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -26,8 +26,8 @@
 
 #include <usrp_sink_c.h>
 #include <gr_io_signature.h>
-#include <usrp_standard.h>
-#include <usrp_bytesex.h>
+#include <usrp/usrp_standard.h>
+#include <usrp/usrp_bytesex.h>
 
 usrp_sink_c_sptr
 usrp_make_sink_c (int which_board,

Modified: 
gnuradio/branches/developers/jcorgan/usrp-headers/gr-usrp/src/usrp_sink_s.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/usrp-headers/gr-usrp/src/usrp_sink_s.cc    
    2009-07-08 23:05:54 UTC (rev 11382)
+++ 
gnuradio/branches/developers/jcorgan/usrp-headers/gr-usrp/src/usrp_sink_s.cc    
    2009-07-09 00:16:33 UTC (rev 11383)
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2006 Free Software Foundation, Inc.
+ * Copyright 2004,2006,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -26,8 +26,8 @@
 
 #include <usrp_sink_s.h>
 #include <gr_io_signature.h>
-#include <usrp_standard.h>
-#include <usrp_bytesex.h>
+#include <usrp/usrp_standard.h>
+#include <usrp/usrp_bytesex.h>
 
 usrp_sink_s_sptr
 usrp_make_sink_s (int which_board,

Modified: 
gnuradio/branches/developers/jcorgan/usrp-headers/gr-usrp/src/usrp_source_base.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/usrp-headers/gr-usrp/src/usrp_source_base.cc
   2009-07-08 23:05:54 UTC (rev 11382)
+++ 
gnuradio/branches/developers/jcorgan/usrp-headers/gr-usrp/src/usrp_source_base.cc
   2009-07-09 00:16:33 UTC (rev 11383)
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2008 Free Software Foundation, Inc.
+ * Copyright 2004,2008,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -26,7 +26,7 @@
 
 #include <usrp_source_base.h>
 #include <gr_io_signature.h>
-#include <usrp_standard.h>
+#include <usrp/usrp_standard.h>
 #include <assert.h>
 #include <cstdio>
 

Modified: 
gnuradio/branches/developers/jcorgan/usrp-headers/gr-usrp/src/usrp_source_base.h
===================================================================
--- 
gnuradio/branches/developers/jcorgan/usrp-headers/gr-usrp/src/usrp_source_base.h
    2009-07-08 23:05:54 UTC (rev 11382)
+++ 
gnuradio/branches/developers/jcorgan/usrp-headers/gr-usrp/src/usrp_source_base.h
    2009-07-09 00:16:33 UTC (rev 11383)
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2008 Free Software Foundation, Inc.
+ * Copyright 2004,2008,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -25,8 +25,8 @@
 
 #include <usrp_base.h>
 #include <stdexcept>
-#include <usrp_tune_result.h>
-#include <usrp_dbid.h>
+#include <usrp/usrp_tune_result.h>
+#include <usrp/usrp_dbid.h>
 
 class usrp_standard_rx;
 

Modified: 
gnuradio/branches/developers/jcorgan/usrp-headers/gr-usrp/src/usrp_source_c.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/usrp-headers/gr-usrp/src/usrp_source_c.cc  
    2009-07-08 23:05:54 UTC (rev 11382)
+++ 
gnuradio/branches/developers/jcorgan/usrp-headers/gr-usrp/src/usrp_source_c.cc  
    2009-07-09 00:16:33 UTC (rev 11383)
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2006 Free Software Foundation, Inc.
+ * Copyright 2004,2006,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -26,8 +26,8 @@
 
 #include <usrp_source_c.h>
 #include <gr_io_signature.h>
-#include <usrp_standard.h>
-#include <usrp_bytesex.h>
+#include <usrp/usrp_standard.h>
+#include <usrp/usrp_bytesex.h>
 
 static const int NBASIC_SAMPLES_PER_ITEM = 2;  // I & Q
 

Modified: 
gnuradio/branches/developers/jcorgan/usrp-headers/gr-usrp/src/usrp_source_s.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/usrp-headers/gr-usrp/src/usrp_source_s.cc  
    2009-07-08 23:05:54 UTC (rev 11382)
+++ 
gnuradio/branches/developers/jcorgan/usrp-headers/gr-usrp/src/usrp_source_s.cc  
    2009-07-09 00:16:33 UTC (rev 11383)
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2006 Free Software Foundation, Inc.
+ * Copyright 2004,2006,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -26,8 +26,8 @@
 
 #include <usrp_source_s.h>
 #include <gr_io_signature.h>
-#include <usrp_standard.h>
-#include <usrp_bytesex.h>
+#include <usrp/usrp_standard.h>
+#include <usrp/usrp_bytesex.h>
 
 static const int NBASIC_SAMPLES_PER_ITEM = 1;
 

Modified: 
gnuradio/branches/developers/jcorgan/usrp-headers/gr-usrp/src/usrp_standard.i
===================================================================
--- 
gnuradio/branches/developers/jcorgan/usrp-headers/gr-usrp/src/usrp_standard.i   
    2009-07-08 23:05:54 UTC (rev 11382)
+++ 
gnuradio/branches/developers/jcorgan/usrp-headers/gr-usrp/src/usrp_standard.i   
    2009-07-09 00:16:33 UTC (rev 11383)
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2008 Free Software Foundation, Inc.
+ * Copyright 2008,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -23,13 +23,13 @@
 // FIXME: move to usrp/usrpm component
 
 %{
-#include <usrp_standard.h>
+#include <usrp/usrp_standard.h>
 #include <usrp_spi_defs.h>
-#include <usrp_dbid.h>
+#include <usrp/usrp_dbid.h>
 %}
 
 %include <usrp_spi_defs.h>
-%include <usrp_dbid.h>
+%include <usrp/usrp_dbid.h>
 
 %constant int FPGA_MODE_NORMAL   = usrp_standard_rx::FPGA_MODE_NORMAL;
 %constant int FPGA_MODE_LOOPBACK = usrp_standard_rx::FPGA_MODE_LOOPBACK;

Modified: 
gnuradio/branches/developers/jcorgan/usrp-headers/gr-usrp/src/usrp_swig.i
===================================================================
--- gnuradio/branches/developers/jcorgan/usrp-headers/gr-usrp/src/usrp_swig.i   
2009-07-08 23:05:54 UTC (rev 11382)
+++ gnuradio/branches/developers/jcorgan/usrp-headers/gr-usrp/src/usrp_swig.i   
2009-07-09 00:16:33 UTC (rev 11383)
@@ -26,8 +26,8 @@
 #include <vector>
 %}
 
-%include <usrp_subdev_spec.h>
-%include <db_base.i>
+%include <usrp/usrp_subdev_spec.h>
+%include <usrp/db_base.i>
 %include <fpga_regs_common.h>
 %include <fpga_regs_standard.h>
 %include "usrp_standard.i"

Modified: 
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/include/usrp/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/include/usrp/Makefile.am
        2009-07-08 23:05:54 UTC (rev 11382)
+++ 
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/include/usrp/Makefile.am
        2009-07-09 00:16:33 UTC (rev 11383)
@@ -42,3 +42,8 @@
        usrp_standard.h \
        usrp_subdev_spec.h \
        usrp_tune_result.h
+
+if PYTHON
+swiginclude_HEADERS = \
+       db_base.i
+endif

Copied: 
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/include/usrp/db_base.i
 (from rev 11377, 
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/lib/legacy/db_base.i)
===================================================================
--- 
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/include/usrp/db_base.i
                          (rev 0)
+++ 
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/include/usrp/db_base.i
  2009-07-09 00:16:33 UTC (rev 11383)
@@ -0,0 +1,102 @@
+/* -*- c++ -*- */
+//
+// Copyright 2008,2009 Free Software Foundation, Inc.
+// 
+// This file is part of GNU Radio
+// 
+// GNU Radio is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3, or (at your option)
+// any later version.
+// 
+// GNU Radio is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with GNU Radio; see the file COPYING.  If not, write to
+// the Free Software Foundation, Inc., 51 Franklin Street,
+// Boston, MA 02110-1301, USA.
+//
+
+
+%{
+#include <usrp/db_base.h>
+%}
+
+%include <gr_shared_ptr.i>
+
+class usrp_tune_result
+{
+public:  
+  usrp_tune_result(double baseband=0, double dxc=0, 
+                  double residual=0, bool inv=0);
+  ~usrp_tune_result();
+
+  double baseband_freq;
+  double dxc_freq;
+  double residual_freq;
+  bool  inverted;
+};
+
+struct freq_result_t
+{
+  bool  ok;
+  double baseband_freq;
+};
+
+class db_base
+{
+ private:
+  db_base(boost::shared_ptr<usrp_basic> usrp, int which);
+
+ public:
+  virtual ~db_base();
+
+  int dbid();
+  std::string name();
+  std::string side_and_name();
+  int which() { return d_which; }
+
+  bool bypass_adc_buffers(bool bypass);
+  bool set_atr_mask(int v);
+  bool set_atr_txval(int v);
+  bool set_atr_rxval(int v);
+  bool set_atr_tx_delay(int v);
+  bool set_atr_rx_delay(int v);
+  bool set_lo_offset(double offset);
+  double lo_offset() { return d_lo_offset; }
+
+  virtual float gain_min() = 0;
+  virtual float gain_max() = 0;
+  virtual float gain_db_per_step() = 0;
+  virtual double freq_min() = 0;
+  virtual double freq_max() = 0;
+  virtual struct freq_result_t set_freq(double target_freq) = 0;
+  virtual bool set_gain(float gain) = 0;
+  virtual bool is_quadrature() = 0;
+  virtual bool i_and_q_swapped();
+  virtual bool spectrum_inverted();
+  virtual bool set_enable(bool on);
+  virtual bool set_auto_tr(bool on);
+  virtual bool select_rx_antenna(int which_antenna);
+  virtual bool select_rx_antenna(const std::string &antenna);
+  virtual bool set_bw(float bw);
+};
+
+// Create templates for db's, vectors of db's, and vector of vectors of db's
+typedef boost::shared_ptr<db_base> db_base_sptr;
+%template(db_base_sptr) boost::shared_ptr<db_base>;
+%template(db_base_sptr_vector) std::vector<db_base_sptr>;
+%template(db_base_sptr_vector_vector) std::vector<std::vector<db_base_sptr> >;
+
+// Set better class name in Python
+// Enable freq_range and gain_range from public methods of class not 
implemented in C++
+// And create a dummy wrapper for backwards compatability with some of the 
example code
+%pythoncode %{
+  db_base_sptr.__repr__ = lambda self: "<db_base::%s>" % (self.name(),)
+  db_base_sptr.freq_range = lambda self: (self.freq_min(), self.freq_max(), 1)
+  db_base_sptr.gain_range = lambda self: (self.gain_min(), self.gain_max(), 
self.gain_db_per_step())
+
+%}


Property changes on: 
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/include/usrp/db_base.i
___________________________________________________________________
Added: svn:mergeinfo
   + 
/gnuradio/branches/developers/eb/t348/usrp/host/lib/legacy/db_base.i:10638-10648
/gnuradio/branches/developers/eb/t364/usrp/host/lib/legacy/db_base.i:11016-11017
/gnuradio/branches/developers/eb/t367/usrp/host/lib/legacy/db_base.i:11021-11025
/gnuradio/branches/developers/eb/t371/usrp/host/lib/legacy/db_base.i:10958-10971
/gnuradio/branches/developers/eb/t378/usrp/host/lib/legacy/db_base.i:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp/host/lib/legacy/db_base.i:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/usrp/host/lib/legacy/db_base.i:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp/host/lib/legacy/db_base.i:10667-10677
/gnuradio/branches/developers/jblum/wxgui/usrp/host/lib/legacy/db_base.i:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/usrp/host/lib/legacy/db_base.i:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp/host/lib/legacy/db_base.i:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp/host/lib/legacy/db_base.i:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp/host/lib/legacy/db_base.i:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp/host/lib/legacy/db_base.i:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/db_base.i:11124-11148
/gnuradio/branches/developers/jcorgan/t161/usrp/host/lib/legacy/db_base.i:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp/host/lib/legacy/db_base.i:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp/host/lib/legacy/db_base.i:10540-10546
/gnuradio/branches/developers/trondeau/qt/usrp/host/lib/legacy/db_base.i:11235-11360

Modified: 
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/lib/legacy/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/lib/legacy/Makefile.am
  2009-07-08 23:05:54 UTC (rev 11382)
+++ 
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/lib/legacy/Makefile.am
  2009-07-09 00:16:33 UTC (rev 11383)
@@ -163,8 +163,6 @@
        gen_usrp_dbid.py                \
        check_data.py                   \
        dump_data.py
-
-swiginclude_HEADERS = db_base.i
 endif
 
 # common way for generating sources from templates when using

Modified: 
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/swig/usrp_prims.i
===================================================================
--- 
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/swig/usrp_prims.i   
    2009-07-08 23:05:54 UTC (rev 11382)
+++ 
gnuradio/branches/developers/jcorgan/usrp-headers/usrp/host/swig/usrp_prims.i   
    2009-07-09 00:16:33 UTC (rev 11383)
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2003,2004 Free Software Foundation, Inc.
+ * Copyright 2003,2004,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -36,7 +36,7 @@
 
 
 %{
-#include <usrp_prims.h>
+#include <usrp/usrp_prims.h>
 %}