diff options
author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2022-07-07 13:08:53 +0900 |
---|---|---|
committer | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2022-07-07 13:08:53 +0900 |
commit | 1764749a6b3471de97aaa2b2fabdd45124698f60 (patch) | |
tree | 1c57f86d36918b363e9eb98404ce0a9278372436 | |
parent | 1afa23ae1942ce97c5936782af52b2b002fe5c55 (diff) | |
download | hinawa-rs-1764749a6b3471de97aaa2b2fabdd45124698f60.tar.gz |
hinawa: unsupport deprecated FwReqExtManual::transaction()
Libhinawa v2.1 deprecates Hinawa.FwReq.transaction().
This commit deletes it.
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
-rw-r--r-- | hinawa/Gir.toml | 3 | ||||
-rw-r--r-- | hinawa/examples/read-quadlet.rs | 11 | ||||
-rw-r--r-- | hinawa/src/fw_req.rs | 39 |
3 files changed, 10 insertions, 43 deletions
diff --git a/hinawa/Gir.toml b/hinawa/Gir.toml index ccd7309..29c7958 100644 --- a/hinawa/Gir.toml +++ b/hinawa/Gir.toml @@ -49,8 +49,7 @@ manual_traits = ["FwReqExtManual"] doc_trait_name = "FwReqExtManual" [[object.function]] name = "transaction" - manual = true - doc_trait_name = "FwReqExtManual" + ignore = true [[object.function]] name = "error_quark" manual = true diff --git a/hinawa/examples/read-quadlet.rs b/hinawa/examples/read-quadlet.rs index 0356bcc..7510739 100644 --- a/hinawa/examples/read-quadlet.rs +++ b/hinawa/examples/read-quadlet.rs @@ -23,8 +23,15 @@ fn main() { let req = hinawa::FwReq::new(); let mut frames = [0; 4]; - req.transaction(&node, FwTcode::ReadQuadletRequest, OFFSET, 4, &mut frames) - .unwrap(); + req.transaction_sync( + &node, + FwTcode::ReadQuadletRequest, + OFFSET, + 4, + &mut frames, + 100, + ) + .unwrap(); assert_eq!(0x31333934, u32::from_be_bytes(frames)); diff --git a/hinawa/src/fw_req.rs b/hinawa/src/fw_req.rs index a486b36..6f73e5d 100644 --- a/hinawa/src/fw_req.rs +++ b/hinawa/src/fw_req.rs @@ -19,14 +19,6 @@ pub trait FwReqExtManual { frame: &mut [u8], timeout_ms: u32, ) -> Result<(), glib::Error>; - fn transaction<P: IsA<FwNode>>( - &self, - node: &P, - tcode: FwTcode, - addr: u64, - length: usize, - frame: &mut [u8], - ) -> Result<(), glib::Error>; fn connect_responded<F>(&self, f: F) -> SignalHandlerId where F: Fn(&Self, FwRcode, &[u8]) + 'static; @@ -97,37 +89,6 @@ impl<O: IsA<FwReq>> FwReqExtManual for O { } } - fn transaction<P: IsA<FwNode>>( - &self, - node: &P, - tcode: FwTcode, - addr: u64, - length: usize, - frame: &mut [u8], - ) -> Result<(), glib::Error> { - unsafe { - let mut frame_size = frame.len(); - let mut error = std::ptr::null_mut(); - - ffi::hinawa_fw_req_transaction( - self.as_ref().to_glib_none().0, - node.as_ref().to_glib_none().0, - tcode.into_glib(), - addr, - length, - &mut frame.as_mut_ptr(), - &mut frame_size, - &mut error, - ); - - if error.is_null() { - Ok(()) - } else { - Err(from_glib_full(error)) - } - } - } - fn connect_responded<F>(&self, f: F) -> SignalHandlerId where F: Fn(&Self, FwRcode, &[u8]) + 'static, |