paulmataruso/openbts
1
0
Fork 0
mirror of https://github.com/RangeNetworks/openbts.git synced 2025-10-23 07:42:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Transceiver52M: Use exception blocks for rate changes

Browse Source 
UHD will throw if something goes awry in these sensitive sections,
so we should catch and shutdown gracefully. There is no recovery
if we can't set rates.

Signed-off-by: Thomas Tsou <tom@tsou.cc>

git-svn-id: http://wush.net/svn/range/software/public/openbts/trunk@6724 19bc5d8c-e614-43d4-8b26-e1612bc8e597
This commit is contained in:
Thomas Tsou
2013-10-17 06:17:39 +00:00
parent 0e0c81de63
commit 83d8630c1b
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Transceiver52M/UHDDevice.cpp
View File

@@ -383,12 +383,18 @@ int uhd_device::set_master_clk(double clk_rate)
{
double actual_clk_rt;
// Set master clock rate
usrp_dev->set_master_clock_rate(clk_rate);
actual_clk_rt = usrp_dev->get_master_clock_rate();
try {
usrp_dev->set_master_clock_rate(clk_rate);
actual_clk_rt = usrp_dev->get_master_clock_rate();
} catch (const std::exception &ex) {
LOG(ALERT) << "UHD clock rate setting failed: " << clk_rate;
LOG(ALERT) << ex.what();
return -1;
}
if (actual_clk_rt != clk_rate) {
LOG(ALERT) << "Failed to set master clock rate";
LOG(ALERT) << "Requested clock rate " << clk_rate;
LOG(ALERT) << "Actual clock rate " << actual_clk_rt;
return -1;
}
@@ -408,8 +414,14 @@ int uhd_device::set_rates(double rate)
}
// Set sample rates
usrp_dev->set_tx_rate(rate);
usrp_dev->set_rx_rate(rate);
try {
usrp_dev->set_tx_rate(rate);
usrp_dev->set_rx_rate(rate);
} catch (const std::exception &ex) {
LOG(ALERT) << "UHD rate setting failed: " << rate;
LOG(ALERT) << ex.what();
return -1;
}
actual_smpl_rt = usrp_dev->get_tx_rate();
tx_offset = actual_smpl_rt - rate;