stevefan1999
/
artiq-zynq
forked from M-Labs/artiq-zynq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

satman: fixed timeout millisecond/u64 mismatch

This commit is contained in:
mwojcik 2021-08-30 15:06:46 +02:00
parent be0baf5da8
commit db9b744825
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/satman/repeater.rs
View File

@ -20,7 +20,7 @@ fn rep_link_rx_up(repno: u8) -> bool {
enum RepeaterState { enum RepeaterState {
Down, Down,
SendPing { ping_count: u16 }, SendPing { ping_count: u16 },
WaitPingReply { ping_count: u16, timeout: u64 }, WaitPingReply { ping_count: u16, timeout: Milliseconds },
Up, Up,
Failed Failed
} }
@ -169,7 +169,7 @@ impl Repeater {
} }
fn recv_aux_timeout(&self, timeout: u32, timer: GlobalTimer) -> Result<drtioaux::Packet, drtioaux::Error> { fn recv_aux_timeout(&self, timeout: u32, timer: GlobalTimer) -> Result<drtioaux::Packet, drtioaux::Error> {
let max_time = timer.get_time() + Milliseconds(timeout); let max_time = timer.get_time() + Milliseconds(timeout.into());
loop { loop {
if !rep_link_rx_up(self.repno) { if !rep_link_rx_up(self.repno) {
return Err(drtioaux::Error::LinkDown); return Err(drtioaux::Error::LinkDown);