diff options
| author | Josh Blum <josh@joshknows.com> | 2010-10-28 18:23:27 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-10-28 18:23:27 -0700 |
| commit | a8d2c2944b329218af1c0b171b92f775b679b409 (patch) | |
| tree | 02e558d525055cb82e8d00a7a2d75fe324015ae6 /host/lib/usrp/usrp1 | |
| parent | ef8ed898cbc6cb6cd1994d2a8b090112f4f3a664 (diff) | |
| parent | 6a3e499f586513d48ef648aa910e252b7d8b046b (diff) | |
| download | uhd-a8d2c2944b329218af1c0b171b92f775b679b409.tar.gz uhd-a8d2c2944b329218af1c0b171b92f775b679b409.tar.bz2 uhd-a8d2c2944b329218af1c0b171b92f775b679b409.zip | |
Merge branch 'next'
Diffstat (limited to 'host/lib/usrp/usrp1')
| -rw-r--r-- | host/lib/usrp/usrp1/mboard_impl.cpp | 2 | ||||
| -rw-r--r-- | host/lib/usrp/usrp1/usrp1_impl.cpp | 2 |
2 files changed, 2 insertions, 2 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" ); diff --git a/host/lib/usrp/usrp1/usrp1_impl.cpp b/host/lib/usrp/usrp1/usrp1_impl.cpp index 276ca86f6..314384e72 100644 --- a/host/lib/usrp/usrp1/usrp1_impl.cpp +++ b/host/lib/usrp/usrp1/usrp1_impl.cpp @@ -64,7 +64,7 @@ static device_addrs_t usrp1_find(const device_addr_t &hint) ); } catch(...){ - uhd::print_warning( + uhd::warning::post( "Could not locate USRP1 firmware.\n" "Please install the images package.\n" ); |