diff options
| author | Josh Blum <josh@joshknows.com> | 2010-10-27 16:37:08 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-10-27 16:37:08 -0700 |
| commit | f9edd3865ca0f61a9e80fd917521b49292d5ecb1 (patch) | |
| tree | 5afaf7a691dbb5849c624c8af46501ddd414be9e /host/lib/usrp/usrp1/mboard_impl.cpp | |
| parent | 971f6de77c6b67515b5d37d748e823da155b310c (diff) | |
| parent | 630c007bbbabce90ffe3578d47ad7acc187bdc30 (diff) | |
| download | uhd-f9edd3865ca0f61a9e80fd917521b49292d5ecb1.tar.gz uhd-f9edd3865ca0f61a9e80fd917521b49292d5ecb1.tar.bz2 uhd-f9edd3865ca0f61a9e80fd917521b49292d5ecb1.zip | |
Merge branch 'next' into flow_ctrl
Conflicts:
host/include/uhd/types/metadata.hpp
Diffstat (limited to 'host/lib/usrp/usrp1/mboard_impl.cpp')
| -rw-r--r-- | host/lib/usrp/usrp1/mboard_impl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/host/lib/usrp/usrp1/mboard_impl.cpp b/host/lib/usrp/usrp1/mboard_impl.cpp index fe3774eb4..669b20efa 100644 --- a/host/lib/usrp/usrp1/mboard_impl.cpp +++ b/host/lib/usrp/usrp1/mboard_impl.cpp @@ -98,7 +98,7 @@ static boost::uint32_t calc_rx_mux( // for all quadrature sources: Z = 0 // for mixed sources: warning + Z = 0 int Z = (num_quads > 0)? 0 : 1; - if (num_quads != 0 and num_reals != 0) uhd::print_warning( + if (num_quads != 0 and num_reals != 0) uhd::warning::post( "Mixing real and quadrature rx subdevices is not supported.\n" "The Q input to the real source(s) will be non-zero.\n" ); |