[Commit-gnuradio] r9323 - gnuradio/branches/developers/trondeau/dbs/gr-usrp/src

[trondeau]

Author: trondeau
Date: 2008-08-18 21:32:40 -0600 (Mon, 18 Aug 2008)
New Revision: 9323

Modified:
   gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/Makefile.am
   gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1.i
   gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1_sink.i
   gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1_sink_c.cc
   gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1_sink_c.h
   gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1_sink_s.cc
   gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1_sink_s.h
Log:
adding short sink back

Modified: gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/Makefile.am   
2008-08-19 03:06:53 UTC (rev 9322)
+++ gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/Makefile.am   
2008-08-19 03:32:40 UTC (rev 9323)
@@ -69,6 +69,7 @@
        usrp1_base.h                    \
        usrp1_sink_base.h               \
        usrp1_sink_c.h                  \
+       usrp1_sink_s.h                  \
        usrp1_source_base.h             \
        usrp1_source_c.h                \
        usrp1_source_s.h
@@ -84,6 +85,7 @@
        usrp1_base.cc                   \
        usrp1_sink_base.cc              \
        usrp1_sink_c.cc                 \
+       usrp1_sink_s.cc                 \
        usrp1_source_base.cc            \
        usrp1_source_c.cc               \
        usrp1_source_s.cc

Modified: gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1.i
===================================================================
--- gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1.i       
2008-08-19 03:06:53 UTC (rev 9322)
+++ gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1.i       
2008-08-19 03:32:40 UTC (rev 9323)
@@ -33,6 +33,7 @@
 #include "usrp1_source_s.h"
 #include "usrp1_sink_base.h"
 #include "usrp1_sink_c.h"
+#include "usrp1_sink_s.h"
 #include "usrp_standard.h"
 #include "usrp_spi_defs.h"
 #include <db_base.h>

Modified: gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1_sink.i
===================================================================
--- gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1_sink.i  
2008-08-19 03:06:53 UTC (rev 9322)
+++ gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1_sink.i  
2008-08-19 03:32:40 UTC (rev 9323)
@@ -23,7 +23,7 @@
 %{
 #include "usrp1_sink_base.h"
 #include "usrp1_sink_c.h"
-  //#include "usrp1_source_s.h"
+#include "usrp1_source_s.h"
 %}
 
 // ================================================================
@@ -135,29 +135,28 @@
 
 // ----------------------------------------------------------------
 
-#if 0
 GR_SWIG_BLOCK_MAGIC(usrp1,sink_s)
 
 usrp1_sink_s_sptr
-usrp1_make_sink_s (int which_board,
-                  unsigned int interp_rate,
-                  int nchan,
-                  int mux,
-                  int fusb_block_size,
-                  int fusb_nblocks,
-                  const std::string fpga_filename,
-                  const std::string firmware_filename
+usrp1_make_sink_s (int which_board=0,
+                  unsigned int interp_rate=128,
+                  int nchan=1,
+                  int mux=0x98,
+                  int fusb_block_size=0,
+                  int fusb_nblocks=0,
+                  const std::string fpga_filename="",
+                  const std::string firmware_filename=""
                   ) throw (std::runtime_error);
 
 
 class usrp1_sink_s : public usrp1_sink_base {
  protected:
   usrp1_sink_s (int which_board, unsigned int interp_rate,
-               int nchan, int mux);
+               int nchan, int mux, int fusb_block_size, int fusb_nblocks,
+               const std::string fpga_filename, const std::string 
fgpa_filename);
 
  public:
   ~usrp1_sink_s ();
 };
 
-#endif
 

Modified: gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1_sink_c.cc
===================================================================
--- gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1_sink_c.cc       
2008-08-19 03:06:53 UTC (rev 9322)
+++ gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1_sink_c.cc       
2008-08-19 03:32:40 UTC (rev 9323)
@@ -69,11 +69,6 @@
                     fpga_filename, firmware_filename)
 {
   _ensure_rev2(which_board);
-  
-  //int dbid = daughterboard_id(which_board);
-
-  //d_db[0] = (db1_base*)instantiate_dbs(dbid, this->d_usrp, which_board);
-  //d_db[1] = (db1_base*)instantiate_dbs(dbid, this->d_usrp, which_board);
 }
 
 usrp1_sink_c::~usrp1_sink_c ()

Modified: gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1_sink_c.h
===================================================================
--- gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1_sink_c.h        
2008-08-19 03:06:53 UTC (rev 9322)
+++ gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1_sink_c.h        
2008-08-19 03:32:40 UTC (rev 9323)
@@ -24,7 +24,6 @@
 #define INCLUDED_USRP1_SINK_C_H
 
 #include <usrp1_sink_base.h>
-#include <db_boards.h>
 
 class usrp1_sink_c;
 typedef boost::shared_ptr<usrp1_sink_c> usrp1_sink_c_sptr;

Modified: gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1_sink_s.cc
===================================================================
--- gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1_sink_s.cc       
2008-08-19 03:06:53 UTC (rev 9322)
+++ gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1_sink_s.cc       
2008-08-19 03:32:40 UTC (rev 9323)
@@ -67,6 +67,7 @@
                     fusb_block_size, fusb_nblocks,
                     fpga_filename, firmware_filename)
 {
+  _ensure_rev2(which_board);
   set_output_multiple (512 / sizeof(short));   // don't change
 }
 

Modified: gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1_sink_s.h
===================================================================
--- gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1_sink_s.h        
2008-08-19 03:06:53 UTC (rev 9322)
+++ gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1_sink_s.h        
2008-08-19 03:32:40 UTC (rev 9323)
@@ -32,14 +32,14 @@
 // public shared_ptr constructor
 
 usrp1_sink_s_sptr
-usrp1_make_sink_s (int which_board,
-                  unsigned int interp_rate,
-                  int nchan,
-                  int mux,
-                  int fusb_block_size,
-                  int fusb_nblocks,
-                  const std::string fpga_filename,
-                  const std::string firmware_filename
+usrp1_make_sink_s (int which_board=0,
+                  unsigned int interp_rate=128,
+                  int nchan=1,
+                  int mux=0x98,
+                  int fusb_block_size=0,
+                  int fusb_nblocks=0,
+                  const std::string fpga_filename="",
+                  const std::string firmware_filename=""
                   ) throw (std::runtime_error);
 
 /*!