Bugfix in register_base.rs

Function parameters were out of order
cameleon-rs · Jan 12, 2024 · 957ac08 · 957ac08
1 parent 1e34b0a
commit 957ac08
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/device/src/u3v/async_read.rs b/device/src/u3v/async_read.rs
@@ -233,7 +233,7 @@ fn poll_completed(
             let remaining = deadline.saturating_duration_since(Instant::now());
             let timeval = libc::timeval {
                 tv_sec: remaining.as_secs().try_into().unwrap(),
-                tv_usec: remaining.subsec_micros().try_into().unwrap(),
+                tv_usec: remaining.subsec_micros().into(),
             };
 
             if libusb_try_lock_events(ctx.as_raw()) == 0_i32 {

diff --git a/genapi/src/register_base.rs b/genapi/src/register_base.rs
@@ -76,7 +76,7 @@ impl RegisterBase {
     ) -> GenApiResult<R> {
         let length = self.length(device, store, cx)?;
         let address = self.address(device, store, cx)?;
-        if let Some(cache) = cx.get_cache(nid, length, address) {
+        if let Some(cache) = cx.get_cache(nid, address, length) {
             f(cache)
         } else {
             let mut buf = vec![0; length as usize];