aboutsummaryrefslogtreecommitdiffstats
path: root/Transceiver52M/USRPDevice.h
diff options
context:
space:
mode:
authorThomas Tsou <tom@tsou.cc>2013-10-11 14:55:31 -0400
committerThomas Tsou <tom@tsou.cc>2013-10-18 13:10:17 -0400
commitc064124429890393ee9a447990bc861840d73803 (patch)
treeb5ac147e2b743ff0959a0e8948940e5e45e2d31c /Transceiver52M/USRPDevice.h
parent69d14c9a14c1e9f9ae558e5843ef23195f56f04b (diff)
Transceiver52M: Remove support for ancient libusrp versions
Current functionality with these old versions is questionable. There is no reason to use any version of GNU Radio / libusrp older than 3.3. Version 3.4.2 is the only recommended version for USRP1 users. Non-USRP1 users must use UHD driver from Ettus Research. Signed-off-by: Thomas Tsou <tom@tsou.cc>
Diffstat (limited to 'Transceiver52M/USRPDevice.h')
-rw-r--r--Transceiver52M/USRPDevice.h18
1 files changed, 3 insertions, 15 deletions
diff --git a/Transceiver52M/USRPDevice.h b/Transceiver52M/USRPDevice.h
index 01cf261..f74db47 100644
--- a/Transceiver52M/USRPDevice.h
+++ b/Transceiver52M/USRPDevice.h
@@ -21,29 +21,17 @@
#include "radioDevice.h"
-#ifdef HAVE_LIBUSRP_3_3 // [
-# include <usrp/usrp_standard.h>
-# include <usrp/usrp_bytesex.h>
-# include <usrp/usrp_prims.h>
-#else // HAVE_LIBUSRP_3_3 ][
-# include "usrp_standard.h"
-# include "usrp_bytesex.h"
-# include "usrp_prims.h"
-#endif // !HAVE_LIBUSRP_3_3 ]
+#include <usrp/usrp_standard.h>
+#include <usrp/usrp_bytesex.h>
+#include <usrp/usrp_prims.h>
#include <sys/time.h>
#include <math.h>
#include <string>
#include <iostream>
-
-/** Define types which are not defined in libusrp-3.1 */
-#ifndef HAVE_LIBUSRP_3_2
#include <boost/shared_ptr.hpp>
typedef boost::shared_ptr<usrp_standard_tx> usrp_standard_tx_sptr;
typedef boost::shared_ptr<usrp_standard_rx> usrp_standard_rx_sptr;
-#endif // HAVE_LIBUSRP_3_2
-
-
/** A class to handle a USRP rev 4, with a two RFX900 daughterboards */
class USRPDevice: public RadioDevice {