aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2022-07-07 13:08:53 +0900
committerTakashi Sakamoto <o-takashi@sakamocchi.jp>2022-07-07 13:08:53 +0900
commit8f79025a4ae8b541e9215c40247435768dcf0adf (patch)
treede4acb5993f6b965ac824596a771bea1ace26476
parent1764749a6b3471de97aaa2b2fabdd45124698f60 (diff)
downloadhinawa-rs-8f79025a4ae8b541e9215c40247435768dcf0adf.tar.gz
hinawa: unsupport deprecated FwFcpExtManual::transaction()
Libhinawa v2.1 deprecated FwFcp.transaction(). This commit deletes it. Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
-rw-r--r--hinawa/Gir.toml3
-rw-r--r--hinawa/src/fw_fcp.rs23
2 files changed, 1 insertions, 25 deletions
diff --git a/hinawa/Gir.toml b/hinawa/Gir.toml
index 29c7958..2b8b424 100644
--- a/hinawa/Gir.toml
+++ b/hinawa/Gir.toml
@@ -76,8 +76,7 @@ manual_traits = ["FwFcpExtManual"]
doc_trait_name = "FwFcpExtManual"
[[object.function]]
name = "transaction"
- manual = true
- doc_trait_name = "FwFcpExtManual"
+ ignore = true
[[object.signal]]
name = "responded"
manual = true
diff --git a/hinawa/src/fw_fcp.rs b/hinawa/src/fw_fcp.rs
index a7f63ed..f9458da 100644
--- a/hinawa/src/fw_fcp.rs
+++ b/hinawa/src/fw_fcp.rs
@@ -8,7 +8,6 @@ pub trait FwFcpExtManual {
resp_frame: &mut [u8],
timeout_ms: u32,
) -> Result<usize, glib::Error>;
- fn transaction(&self, req_frame: &[u8], resp_frame: &mut [u8]) -> Result<usize, glib::Error>;
fn connect_responded<F>(&self, f: F) -> SignalHandlerId
where
F: Fn(&Self, &[u8]) + 'static;
@@ -43,28 +42,6 @@ impl<O: IsA<FwFcp>> FwFcpExtManual for O {
}
}
- fn transaction(&self, req_frame: &[u8], resp_frame: &mut [u8]) -> Result<usize, glib::Error> {
- unsafe {
- let mut resp_frame_size = resp_frame.len();
- let mut error = std::ptr::null_mut();
-
- ffi::hinawa_fw_fcp_transaction(
- self.as_ref().to_glib_none().0,
- req_frame.as_ptr(),
- req_frame.len(),
- &mut resp_frame.as_mut_ptr(),
- &mut resp_frame_size,
- &mut error,
- );
-
- if error.is_null() {
- Ok(resp_frame_size)
- } else {
- Err(from_glib_full(error))
- }
- }
- }
-
fn connect_responded<F>(&self, f: F) -> SignalHandlerId
where
F: Fn(&Self, &[u8]) + 'static,