diff options
author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2023-07-23 18:09:54 +0900 |
---|---|---|
committer | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2023-10-03 21:45:12 +0900 |
commit | 71029764c4114e1fdb97496756e5e921f769bff4 (patch) | |
tree | f051554e9ed8189b33041a3af7bb4519e6679f70 | |
parent | 7884354d1debd7134aab82f3eca528cc1541e256 (diff) | |
download | libhinawa-71029764c4114e1fdb97496756e5e921f769bff4.tar.gz |
fw_fcp: remove deprecated function
Hinawa.FwFcp.transaction() has been deprecated since version 2.1.
This commit removes it.
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
-rw-r--r-- | src/fw_fcp.c | 40 | ||||
-rw-r--r-- | src/fw_fcp.h | 6 | ||||
-rw-r--r-- | src/hinawa.map | 2 | ||||
-rwxr-xr-x | tests/fw-fcp | 1 |
4 files changed, 1 insertions, 48 deletions
diff --git a/src/fw_fcp.c b/src/fw_fcp.c index 0bb20cb..f938ebb 100644 --- a/src/fw_fcp.c +++ b/src/fw_fcp.c @@ -513,46 +513,6 @@ gboolean hinawa_fw_fcp_avc_transaction_with_tstamp(HinawaFwFcp *self, tstamp, error); } -/** - * hinawa_fw_fcp_transaction: - * @self: A [class@FwFcp]. - * @req_frame: (array length=req_frame_size)(in): An array with elements for request byte data. The - * value of this argument should point to the array and immutable. - * @req_frame_size: The size of array for request in byte unit. - * @resp_frame: (array length=resp_frame_size)(inout): An array with elements for response byte - * data. Callers should give it for buffer with enough space against the request - * since this library performs no reallocation. Due to the reason, the value of this - * argument should point to the pointer to the array and immutable. The content of - * array is mutable. - * @resp_frame_size: The size of array for response in byte unit. The value of this argument should - * point to the numerical number and mutable. - * @error: A [struct@GLib.Error]. Error can be generated with four domains; Hinawa.FwNodeError, - * Hinawa.FwReqError, and Hinawa.FwFcpError. - * - * Finish the pair of command and response transactions for FCP. The value of - * [property@FwFcp:timeout] property is used to wait for response transaction since the command - * transaction is initiated. - * - * Since: 1.4. - * Deprecated: 2.1: Use [method@FwFcp.avc_transaction], instead. - */ -void hinawa_fw_fcp_transaction(HinawaFwFcp *self, - const guint8 *req_frame, gsize req_frame_size, - guint8 *const *resp_frame, gsize *resp_frame_size, - GError **error) -{ - guint timeout_ms; - struct waiter w; - guint tstamp[3]; - - g_return_if_fail(HINAWA_IS_FW_FCP(self)); - - g_object_get(G_OBJECT(self), "timeout", &timeout_ms, NULL); - - (void)complete_avc_transaction(self, req_frame, req_frame_size, resp_frame, resp_frame_size, - timeout_ms, &w, tstamp, error); -} - static HinawaFwRcode handle_requested3_signal(HinawaFwResp *resp, HinawaFwTcode tcode, guint64 offset, guint src, guint dst, guint card, guint generation, guint tstamp, const guint8 *frame, guint length) diff --git a/src/fw_fcp.h b/src/fw_fcp.h index 346682b..a026d23 100644 --- a/src/fw_fcp.h +++ b/src/fw_fcp.h @@ -48,12 +48,8 @@ struct _HinawaFwFcpClass { HinawaFwFcp *hinawa_fw_fcp_new(void); -void hinawa_fw_fcp_transaction(HinawaFwFcp *self, - const guint8 *req_frame, gsize req_frame_size, - guint8 *const *resp_frame, gsize *resp_frame_size, - GError **error); - gboolean hinawa_fw_fcp_bind(HinawaFwFcp *self, HinawaFwNode *node, GError **error); + void hinawa_fw_fcp_unbind(HinawaFwFcp *self); gboolean hinawa_fw_fcp_command(HinawaFwFcp *self, const guint8 *cmd, gsize cmd_size, diff --git a/src/hinawa.map b/src/hinawa.map index eb0db3d..53e25f8 100644 --- a/src/hinawa.map +++ b/src/hinawa.map @@ -42,8 +42,6 @@ HINAWA_1_4_0 { } HINAWA_1_3_0; HINAWA_2_0_0 { - "hinawa_fw_fcp_transaction"; - "hinawa_fw_resp_set_resp_frame"; } HINAWA_1_4_0; diff --git a/tests/fw-fcp b/tests/fw-fcp index 2d601a4..d685f46 100755 --- a/tests/fw-fcp +++ b/tests/fw-fcp @@ -16,7 +16,6 @@ props = ( ) methods = ( 'new', - 'transaction', 'bind', 'unbind', 'command', |