aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/b100/b100_impl.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'host/lib/usrp/b100/b100_impl.cpp')
-rw-r--r--host/lib/usrp/b100/b100_impl.cpp14
1 files changed, 10 insertions, 4 deletions
diff --git a/host/lib/usrp/b100/b100_impl.cpp b/host/lib/usrp/b100/b100_impl.cpp
index baf2b6ae3..24a87a3c8 100644
--- a/host/lib/usrp/b100/b100_impl.cpp
+++ b/host/lib/usrp/b100/b100_impl.cpp
@@ -1,5 +1,5 @@
//
-// Copyright 2012-2013 Ettus Research LLC
+// Copyright 2012-2014 Ettus Research LLC
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -137,7 +137,7 @@ static device::sptr b100_make(const device_addr_t &device_addr){
}
UHD_STATIC_BLOCK(register_b100_device){
- device::register_device(&b100_find, &b100_make);
+ device::register_device(&b100_find, &b100_make, device::USRP);
}
/***********************************************************************
@@ -148,7 +148,9 @@ b100_impl::b100_impl(const device_addr_t &device_addr){
b100_impl_constructor_begin:
initialization_count++;
+ _type = device::USRP;
_tree = property_tree::make();
+ _ignore_cal_file = device_addr.has_key("ignore-cal-file");
//extract the FPGA path for the B100
std::string b100_fpga_image = find_image_path(
@@ -608,9 +610,13 @@ sensor_value_t b100_impl::get_ref_locked(void){
}
void b100_impl::set_rx_fe_corrections(const double lo_freq){
- apply_rx_fe_corrections(this->get_tree()->subtree("/mboards/0"), "A", lo_freq);
+ if(not _ignore_cal_file){
+ apply_rx_fe_corrections(this->get_tree()->subtree("/mboards/0"), "A", lo_freq);
+ }
}
void b100_impl::set_tx_fe_corrections(const double lo_freq){
- apply_tx_fe_corrections(this->get_tree()->subtree("/mboards/0"), "A", lo_freq);
+ if(not _ignore_cal_file){
+ apply_tx_fe_corrections(this->get_tree()->subtree("/mboards/0"), "A", lo_freq);
+ }
}