diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-06-17 14:35:17 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-06-17 14:35:17 -0700 |
| commit | f693349f12a66cfad2159779757e2ea1d6d483be (patch) | |
| tree | 1c335011ec094ab03b3faaf892792b60ed3b80c4 /host/lib/usrp_clock/octoclock/octoclock_eeprom.cpp | |
| parent | e103b5e67061c9b22cce2e36cf9b40a8213ecb82 (diff) | |
| parent | 9cc4e16b77d074c8d416725ead1afb8898007eb3 (diff) | |
| download | uhd-f693349f12a66cfad2159779757e2ea1d6d483be.tar.gz uhd-f693349f12a66cfad2159779757e2ea1d6d483be.tar.bz2 uhd-f693349f12a66cfad2159779757e2ea1d6d483be.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/lib/usrp_clock/octoclock/octoclock_eeprom.cpp')
| -rw-r--r-- | host/lib/usrp_clock/octoclock/octoclock_eeprom.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/host/lib/usrp_clock/octoclock/octoclock_eeprom.cpp b/host/lib/usrp_clock/octoclock/octoclock_eeprom.cpp index 49d1a0442..8ac38011d 100644 --- a/host/lib/usrp_clock/octoclock/octoclock_eeprom.cpp +++ b/host/lib/usrp_clock/octoclock/octoclock_eeprom.cpp @@ -1,5 +1,5 @@ // -// Copyright 2014-2015 Ettus Research LLC +// Copyright 2014-2016 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 @@ -46,7 +46,8 @@ void octoclock_eeprom_t::_load(){ const octoclock_fw_eeprom_t *eeprom_in = reinterpret_cast<const octoclock_fw_eeprom_t*>(pkt_in->data); octoclock_packet_t pkt_out; - pkt_out.sequence = uhd::htonx<boost::uint32_t>(std::rand()); + // To avoid replicating sequence numbers between sessions + pkt_out.sequence = boost::uint32_t(std::rand()); size_t len = 0; UHD_OCTOCLOCK_SEND_AND_RECV(xport, SEND_EEPROM_CMD, pkt_out, len, octoclock_data); @@ -94,7 +95,8 @@ void octoclock_eeprom_t::_store() const { const octoclock_packet_t *pkt_in = reinterpret_cast<const octoclock_packet_t *>(octoclock_data); octoclock_packet_t pkt_out; - pkt_out.sequence = uhd::htonx<boost::uint32_t>(std::rand()); + // To avoid replicating sequence numbers between sessions + pkt_out.sequence = boost::uint32_t(std::rand()); pkt_out.len = sizeof(octoclock_fw_eeprom_t); size_t len = 0; |