diff options
| author | kurtis.heimerl <kurtis.heimerl@19bc5d8c-e614-43d4-8b26-e1612bc8e597> | 2011-11-28 06:26:01 +0000 |
|---|---|---|
| committer | kurtis.heimerl <kurtis.heimerl@19bc5d8c-e614-43d4-8b26-e1612bc8e597> | 2011-11-28 06:26:01 +0000 |
| commit | 523ae5a69eff0156220a0bb07c4a1a658dd2f0dd (patch) | |
| tree | c10578e37dd1607572ee4380bac9b37361db8c39 /Transceiver52M/UHDDevice.cpp | |
| parent | ac0ee1289a959fd0308be006b74799a617106378 (diff) | |
transceiver, uhd: reject usrp1 if compiled with uhd support
This configuration is invalid because of FPGA based timestamp
support for the USRP1 in the UHD driver.
Kindly inform the user to recompile with libusrp support from
GNU Radio.
Signed-off-by: Thomas Tsou <ttsou@vt.edu>
git-svn-id: http://wush.net/svn/range/software/public/openbts/trunk@2698 19bc5d8c-e614-43d4-8b26-e1612bc8e597
Diffstat (limited to 'Transceiver52M/UHDDevice.cpp')
| -rw-r--r-- | Transceiver52M/UHDDevice.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Transceiver52M/UHDDevice.cpp b/Transceiver52M/UHDDevice.cpp index 32f6d0f..fd15332 100644 --- a/Transceiver52M/UHDDevice.cpp +++ b/Transceiver52M/UHDDevice.cpp @@ -404,7 +404,8 @@ bool uhd_device::parse_dev_type() b100_str2 = mboard_str.find("B100"); if (usrp1_str != std::string::npos) { - LOG(ERR) << "USRP1 is not supported using UHD driver"; + LOG(ALERT) << "USRP1 is not supported using the UHD driver"; + LOG(ALERT) << "Please compile with GNU Radio libusrp support"; return false; } @@ -434,6 +435,10 @@ bool uhd_device::open() return false; } + // Check for a valid device type and set bus type + if (!parse_dev_type()) + return false; + #ifdef EXTREF set_ref_clk(true); #endif @@ -460,10 +465,6 @@ bool uhd_device::open() // Print configuration LOG(INFO) << "\n" << usrp_dev->get_pp_string(); - // Check for a valid device type and set bus type - if (!parse_dev_type()) - return false; - return true; } |