diff options
author | Josh Blum <josh@joshknows.com> | 2010-12-14 13:13:25 -0800 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2010-12-14 13:13:25 -0800 |
commit | 546e877ea461404550f01a1066242c2f2610ad9d (patch) | |
tree | 839e6f3904342af8f6f35e71fd8b8604409e4dbc /host/include | |
parent | 3ed60b62eaf2d907ec7797f61ca60420bfd2ee5b (diff) | |
parent | 4d9b9ae7e9fe36bf7c1e2e60a37845e9cc4ecee3 (diff) | |
download | uhd-546e877ea461404550f01a1066242c2f2610ad9d.tar.gz uhd-546e877ea461404550f01a1066242c2f2610ad9d.tar.bz2 uhd-546e877ea461404550f01a1066242c2f2610ad9d.zip |
Merge branch 'packet_router' into next
Diffstat (limited to 'host/include')
-rw-r--r-- | host/include/uhd/types/clock_config.hpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/host/include/uhd/types/clock_config.hpp b/host/include/uhd/types/clock_config.hpp index 9342fbb7b..5966dcf3a 100644 --- a/host/include/uhd/types/clock_config.hpp +++ b/host/include/uhd/types/clock_config.hpp @@ -32,12 +32,10 @@ namespace uhd{ REF_AUTO = 'a', //automatic (device specific) REF_INT = 'i', //internal reference REF_SMA = 's', //external sma port - REF_MIMO = 'm' //mimo cable (usrp2 only) } ref_source; enum pps_source_t { PPS_INT = 'i', //there is no internal PPS_SMA = 's', //external sma port - PPS_MIMO = 'm' //mimo cable (usrp2 only) } pps_source; enum pps_polarity_t { PPS_NEG = 'n', //negative edge |