Merge utils from http://gnuradio.org/git/trondeau.git

[debian/gnuradio] / gr-usrp / src / usrp_source_base.cc

diff --git a/gr-usrp/src/usrp_source_base.cc b/gr-usrp/src/usrp_source_base.cc
index b875737ce08b70cece30e111cb61f6fec3c4a54f..5a5e20f3e3decb142c4c940c0d112712aa3532c4 100644 (file)
--- a/gr-usrp/src/usrp_source_base.cc
+++ b/gr-usrp/src/usrp_source_base.cc
@@ -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,8 +26,9 @@
 
 #include <usrp_source_base.h>
 #include <gr_io_signature.h>
-#include <usrp_standard.h>
+#include <usrp/usrp_standard.h>
 #include <assert.h>
+#include <cstdio>
 
 static const int OUTPUT_MULTIPLE_BYTES = 4 * 1024;
 
@@ -291,8 +292,11 @@ usrp_source_base::pick_rx_subdevice()
     USRP_DBID_FLEX_2400_RX,
     USRP_DBID_TV_RX,
     USRP_DBID_TV_RX_REV_2,
+    USRP_DBID_TV_RX_REV_3,
+    USRP_DBID_TV_RX_MIMO,
+    USRP_DBID_TV_RX_REV_2_MIMO,
+    USRP_DBID_TV_RX_REV_3_MIMO,
     USRP_DBID_DBS_RX,
-    USRP_DBID_DBS_RX_REV_2_1,
     USRP_DBID_BASIC_RX
   };