5g-team
/
srsRAN_4G
mirror of https://github.com/pvnis/srsRAN_4G.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UHD: minor aesthetic corrections

Browse Source
master
Xavier Arteaga 5 years ago committed by Xavier Arteaga
parent 0f24d510ac
commit 180fb42dc3
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File

16
lib/src/phy/rf/rf_uhd_rfnoc.h
Unescape Escape View File

@ -69,13 +69,13 @@ private:
typedef uhd::rfnoc::duc_block_ctrl duc_ctrl_t; typedef uhd::rfnoc::duc_block_ctrl duc_ctrl_t;
#endif // UHD_ENABLE_CUSTOM_RFNOC #endif // UHD_ENABLE_CUSTOM_RFNOC
const std::string DMA_FIFO_BLOCK_NAME = "DmaFIFO"; const std::string DMA_FIFO_BLOCK_NAME = "DmaFIFO";
const double SETUP_TIME_S = 1.0; const std::chrono::milliseconds SETUP_TIME_MS = std::chrono::milliseconds(1000UL);
const uhd::fs_path TREE_MBOARD_SENSORS = "/mboards/0/sensors"; const uhd::fs_path TREE_MBOARD_SENSORS = "/mboards/0/sensors";
const uhd::fs_path TREE_RX_SENSORS = "/mboards/0/dboards/A/rx_frontends/0/sensors"; const uhd::fs_path TREE_RX_SENSORS = "/mboards/0/dboards/A/rx_frontends/0/sensors";
const std::string TX_ANTENNA_PORT = "TX/RX"; const std::string TX_ANTENNA_PORT = "TX/RX";
const std::string RX_ANTENNA_PORT = "RX2"; const std::string RX_ANTENNA_PORT = "RX2";
const size_t spp = 246; const size_t spp = 246;
// Primary parameters // Primary parameters
double master_clock_rate = 184.32e6; double master_clock_rate = 184.32e6;
@ -191,7 +191,7 @@ private:
} }
// Sleep for some time // Sleep for some time
std::this_thread::sleep_for(std::chrono::milliseconds(int64_t(1000 * SETUP_TIME_S))); std::this_thread::sleep_for(SETUP_TIME_MS);
// Create DDC control // Create DDC control
ddc_ctrl.resize(nof_radios); ddc_ctrl.resize(nof_radios);

6
lib/src/phy/rf/rf_uhd_safe.h
Unescape Escape View File

@ -37,7 +37,7 @@ class rf_uhd_safe_interface
{ {
private: private:
#ifdef ENABLE_UHD_X300_FW_RESET #ifdef ENABLE_UHD_X300_FW_RESET
const double X300_SLEEP_TIME_S = 5.0; const std::chrono::milliseconds X300_SLEEP_TIME_MS = std::chrono::milliseconds(5000UL);
#endif /* ENABLE_UHD_X300_FW_RESET */ #endif /* ENABLE_UHD_X300_FW_RESET */
virtual uhd_error usrp_make_internal(const uhd::device_addr_t& dev_addr) = 0; virtual uhd_error usrp_make_internal(const uhd::device_addr_t& dev_addr) = 0;
@ -98,8 +98,8 @@ protected:
} }
// Sleep for some time // Sleep for some time
Info("Wait " << std::to_string(X300_SLEEP_TIME_S) << " seconds"); Info("Wait " << X300_SLEEP_TIME_MS.count() << " ms");
std::this_thread::sleep_for(std::chrono::milliseconds(int64_t(1000 * X300_SLEEP_TIME_S))); std::this_thread::sleep_for(X300_SLEEP_TIME_MS);
// Try opening the device one more time // Try opening the device one more time
return usrp_make_internal(dev_addr); return usrp_make_internal(dev_addr);

Write Preview
Loading…
Cancel
Save