aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp_clock/octoclock/octoclock_uart.cpp
diff options
context:
space:
mode:
authorNicholas Corgan <nick.corgan@ettus.com>2015-08-19 11:13:20 -0700
committerMartin Braun <martin.braun@ettus.com>2015-09-01 13:23:19 -0700
commit0ce526f302de68ece342545b4533aab699336028 (patch)
tree5d61c92a78ddb09225930701d53239c163a21e6b /host/lib/usrp_clock/octoclock/octoclock_uart.cpp
parent4cfa04f771649245148b7c993d52fdd34225b08e (diff)
downloaduhd-0ce526f302de68ece342545b4533aab699336028.tar.gz
uhd-0ce526f302de68ece342545b4533aab699336028.tar.bz2
uhd-0ce526f302de68ece342545b4533aab699336028.zip
Fixed minor warnings
* Unreferenced exceptions in try-catch statements * Incorrect function documentation * Unlabelled unused variables
Diffstat (limited to 'host/lib/usrp_clock/octoclock/octoclock_uart.cpp')
-rw-r--r--host/lib/usrp_clock/octoclock/octoclock_uart.cpp8
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];