diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-09-01 15:20:42 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-09-01 15:20:42 -0700 |
| commit | 6464a000150858b5d65a53490f0593d5ba1e4ca6 (patch) | |
| tree | a199c3773d683d9e37fa300900291c3628cff6e4 /host/lib/usrp_clock/octoclock/octoclock_uart.cpp | |
| parent | d697bff4547b6a7fb95e127ec12e2989fc6fc2e5 (diff) | |
| parent | 8adefb1d80f08a53856fef45b80ed5a07f0a9a26 (diff) | |
| download | uhd-6464a000150858b5d65a53490f0593d5ba1e4ca6.tar.gz uhd-6464a000150858b5d65a53490f0593d5ba1e4ca6.tar.bz2 uhd-6464a000150858b5d65a53490f0593d5ba1e4ca6.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/lib/usrp_clock/octoclock/octoclock_uart.cpp')
| -rw-r--r-- | host/lib/usrp_clock/octoclock/octoclock_uart.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/host/lib/usrp_clock/octoclock/octoclock_uart.cpp b/host/lib/usrp_clock/octoclock/octoclock_uart.cpp index e879c4b70..f366bac30 100644 --- a/host/lib/usrp_clock/octoclock/octoclock_uart.cpp +++ b/host/lib/usrp_clock/octoclock/octoclock_uart.cpp @@ -1,5 +1,5 @@ // -// Copyright 2014 Ettus Research LLC +// Copyright 2014-2015 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 @@ -91,7 +91,7 @@ namespace uhd{ while(boost::get_system_time() < exit_time){ _update_cache(); - for(char ch = _getchar(); ch != -1; ch = _getchar()){ + for(char ch = _getchar(); ch != 0; ch = _getchar()){ if(ch == '\r') continue; //Skip carriage returns _rxbuff += ch; @@ -111,7 +111,7 @@ namespace uhd{ void octoclock_uart_iface::_update_cache(){ octoclock_packet_t pkt_out; pkt_out.len = 0; - pkt_out.sequence = 0; + pkt_out.sequence = 0; size_t len = 0; boost::uint8_t octoclock_data[udp_simple::mtu]; @@ -146,7 +146,7 @@ namespace uhd{ char octoclock_uart_iface::_getchar(){ if(LOCAL_STATE_AHEAD){ - return -1; + return 0; } char ch = _cache[_state.pos]; |