aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp_clock/octoclock
diff options
context:
space:
mode:
authorNicholas Corgan <nick.corgan@ettus.com>2015-03-27 09:35:29 -0700
committerNicholas Corgan <nick.corgan@ettus.com>2015-03-27 09:35:29 -0700
commit1200721b696751edaceb70a332861f84fb8c16d5 (patch)
tree15a56b1a54b5b059779d00115a9f58af991035ac /host/lib/usrp_clock/octoclock
parenta712b026a806cd1c106d62fd9278536fcc0a8b62 (diff)
downloaduhd-1200721b696751edaceb70a332861f84fb8c16d5.tar.gz
uhd-1200721b696751edaceb70a332861f84fb8c16d5.tar.bz2
uhd-1200721b696751edaceb70a332861f84fb8c16d5.zip
Warning fixes
* CMake now not applying C++ flags to C files * GCC 4.4: anti-aliasing rules * MSVC: narrowing, differences in subclass function parameters * Clang: uninitialized variables
Diffstat (limited to 'host/lib/usrp_clock/octoclock')
-rw-r--r--host/lib/usrp_clock/octoclock/octoclock_eeprom.cpp4
-rw-r--r--host/lib/usrp_clock/octoclock/octoclock_uart.cpp1
2 files changed, 3 insertions, 2 deletions
diff --git a/host/lib/usrp_clock/octoclock/octoclock_eeprom.cpp b/host/lib/usrp_clock/octoclock/octoclock_eeprom.cpp
index 6d54cac70..93c317191 100644
--- a/host/lib/usrp_clock/octoclock/octoclock_eeprom.cpp
+++ b/host/lib/usrp_clock/octoclock/octoclock_eeprom.cpp
@@ -60,7 +60,7 @@ static const std::string bytes_to_string(const byte_vector_t &bytes){
* Implementation
**********************************************************************/
void octoclock_eeprom_t::_load(){
- boost::uint32_t octoclock_data[udp_simple::mtu];
+ boost::uint8_t octoclock_data[udp_simple::mtu];
const octoclock_packet_t *pkt_in = reinterpret_cast<const octoclock_packet_t*>(octoclock_data);
const octoclock_fw_eeprom_t *eeprom_in = reinterpret_cast<const octoclock_fw_eeprom_t*>(pkt_in->data);
@@ -109,7 +109,7 @@ void octoclock_eeprom_t::_load(){
}
void octoclock_eeprom_t::_store() const {
- boost::uint32_t octoclock_data[udp_simple::mtu];
+ boost::uint8_t octoclock_data[udp_simple::mtu];
const octoclock_packet_t *pkt_in = reinterpret_cast<const octoclock_packet_t *>(octoclock_data);
octoclock_packet_t pkt_out;
diff --git a/host/lib/usrp_clock/octoclock/octoclock_uart.cpp b/host/lib/usrp_clock/octoclock/octoclock_uart.cpp
index eb3f40d9c..e879c4b70 100644
--- a/host/lib/usrp_clock/octoclock/octoclock_uart.cpp
+++ b/host/lib/usrp_clock/octoclock/octoclock_uart.cpp
@@ -111,6 +111,7 @@ namespace uhd{
void octoclock_uart_iface::_update_cache(){
octoclock_packet_t pkt_out;
pkt_out.len = 0;
+ pkt_out.sequence = 0;
size_t len = 0;
boost::uint8_t octoclock_data[udp_simple::mtu];