diff options
| author | Martin Braun <martin.braun@ettus.com> | 2019-01-03 13:25:35 -0800 |
|---|---|---|
| committer | Brent Stapleton <brent.stapleton@ettus.com> | 2019-01-07 13:57:55 -0800 |
| commit | 5bba40ed740a831537b8986528abf38f8f1cc448 (patch) | |
| tree | a798e0c49088962e877f3b5e6d87aea0482af13c | |
| parent | f1e1a328e9a26eb956d8a2fb015d810bd04d4f96 (diff) | |
| download | uhd-5bba40ed740a831537b8986528abf38f8f1cc448.tar.gz uhd-5bba40ed740a831537b8986528abf38f8f1cc448.tar.bz2 uhd-5bba40ed740a831537b8986528abf38f8f1cc448.zip | |
b200: Fix compiler warnings related to type conversions
These compiler warnings mostly pop up on MSVC. Most of them are due to
inconsistent usage of size_t, uint{8,16,32}_t, and even int.
This commit changes types mostly such that variables have the correct
type to begin with, although it also contains a few explicit type-casts.
| -rw-r--r-- | host/lib/usrp/b200/b200_impl.cpp | 12 | ||||
| -rw-r--r-- | host/lib/usrp/b200/b200_impl.hpp | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/host/lib/usrp/b200/b200_impl.cpp b/host/lib/usrp/b200/b200_impl.cpp index d87f70273..1be8c263b 100644 --- a/host/lib/usrp/b200/b200_impl.cpp +++ b/host/lib/usrp/b200/b200_impl.cpp @@ -1262,9 +1262,9 @@ void b200_impl::update_atrs(void) const bool enb_rx = bool(perif.rx_streamer.lock()); const bool enb_tx = bool(perif.tx_streamer.lock()); const bool is_rx2 = perif.ant_rx2; - const size_t rxonly = (enb_rx)? ((is_rx2)? STATE_RX1_RX2 : STATE_RX1_TXRX) : STATE_OFF; - const size_t txonly = (enb_tx)? (STATE_TX1_TXRX) : STATE_OFF; - size_t fd = STATE_OFF; + const uint32_t rxonly = (enb_rx)? ((is_rx2)? STATE_RX1_RX2 : STATE_RX1_TXRX) : STATE_OFF; + const uint32_t txonly = (enb_tx)? (STATE_TX1_TXRX) : STATE_OFF; + uint32_t fd = STATE_OFF; if (enb_rx and enb_tx) fd = STATE_FDX1_TXRX; if (enb_rx and not enb_tx) fd = rxonly; if (not enb_rx and enb_tx) fd = txonly; @@ -1280,9 +1280,9 @@ void b200_impl::update_atrs(void) const bool enb_rx = bool(perif.rx_streamer.lock()); const bool enb_tx = bool(perif.tx_streamer.lock()); const bool is_rx2 = perif.ant_rx2; - const size_t rxonly = (enb_rx)? ((is_rx2)? STATE_RX2_RX2 : STATE_RX2_TXRX) : STATE_OFF; - const size_t txonly = (enb_tx)? (STATE_TX2_TXRX) : STATE_OFF; - size_t fd = STATE_OFF; + const uint32_t rxonly = (enb_rx)? ((is_rx2)? STATE_RX2_RX2 : STATE_RX2_TXRX) : STATE_OFF; + const uint32_t txonly = (enb_tx)? (STATE_TX2_TXRX) : STATE_OFF; + uint32_t fd = STATE_OFF; if (enb_rx and enb_tx) fd = STATE_FDX2_TXRX; if (enb_rx and not enb_tx) fd = rxonly; if (not enb_rx and enb_tx) fd = txonly; diff --git a/host/lib/usrp/b200/b200_impl.hpp b/host/lib/usrp/b200/b200_impl.hpp index f691b371f..3c562f8b3 100644 --- a/host/lib/usrp/b200/b200_impl.hpp +++ b/host/lib/usrp/b200/b200_impl.hpp @@ -45,8 +45,8 @@ static const uint16_t B200_FPGA_COMPAT_NUM = 16; static const uint16_t B205_FPGA_COMPAT_NUM = 7; static const double B200_BUS_CLOCK_RATE = 100e6; static const uint32_t B200_GPSDO_ST_NONE = 0x83; -static const size_t B200_MAX_RATE_USB2 = 53248000; // bytes/s -static const size_t B200_MAX_RATE_USB3 = 500000000; // bytes/s +static constexpr double B200_MAX_RATE_USB2 = 53248000; // bytes/s +static constexpr double B200_MAX_RATE_USB3 = 500000000; // bytes/s #define FLIP_SID(sid) (((sid)<<16)|((sid)>>16)) |