aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2023-07-23 18:09:54 +0900
committerTakashi Sakamoto <o-takashi@sakamocchi.jp>2023-10-03 21:45:12 +0900
commit0e6e653163475815ca12a1c0faf006bfba86bd71 (patch)
tree0f5ca6ff3d756c4c866fb03d9e173a9726eab184
parent7d03d4289f53ed779856ad095d241c865b8a85d5 (diff)
downloadlibhinawa-0e6e653163475815ca12a1c0faf006bfba86bd71.tar.gz
fw_req: remove deprecated function
Both Hinawa.FwReq.transaction_async() and Hinawa.FwReq.transaction_sync() have been deprecated since version 2.6. This commit removes them. Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
-rw-r--r--src/fw_req.c69
-rw-r--r--src/fw_req.h10
-rw-r--r--src/hinawa.map3
-rwxr-xr-xtests/fw-req2
4 files changed, 0 insertions, 84 deletions
diff --git a/src/fw_req.c b/src/fw_req.c
index b9515f3..eeda9e7 100644
--- a/src/fw_req.c
+++ b/src/fw_req.c
@@ -303,38 +303,6 @@ gboolean hinawa_fw_req_request(HinawaFwReq *self, HinawaFwNode *node, HinawaFwTc
return initiate_transaction(self, node, tcode, addr, length, frame, frame_size, error);
}
-/**
- * hinawa_fw_req_transaction_async:
- * @self: A [class@FwReq].
- * @node: A [class@FwNode].
- * @tcode: A transaction code of [enum@FwTcode].
- * @addr: A destination address of target device
- * @length: The range of address in byte unit.
- * @frame: (array length=frame_size)(inout): An array with elements for 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 for read and lock
- * transaction.
- * @frame_size: The size of array in byte unit. The value of this argument should point to the
- * numerical number and mutable for read and lock transaction.
- * @error: A [struct@GLib.Error]. Error can be generated with two domains; Hinawa.FwNodeError and
- * Hinawa.FwReqError.
- *
- * Execute request subaction of transactions to the given node according to given code. When the
- * response subaction arrives and read the contents, [signal@FwReq::responded2] signal handler is called
- * as long as event dispatcher runs.
- *
- * Since: 2.1.
- * Deprecated: 2.6: Use [method@FwReq.request] instead.
- */
-void hinawa_fw_req_transaction_async(HinawaFwReq *self, HinawaFwNode *node,
- HinawaFwTcode tcode, guint64 addr, gsize length,
- guint8 *const *frame, gsize *frame_size,
- GError **error)
-{
- (void)initiate_transaction(self, node, tcode, addr, length, frame, frame_size, error);
-}
-
struct waiter {
guint rcode;
guint request_tstamp;
@@ -441,43 +409,6 @@ static gboolean complete_transaction(HinawaFwReq *self, HinawaFwNode *node, Hina
}
/**
- * hinawa_fw_req_transaction_sync:
- * @self: A [class@FwReq].
- * @node: A [class@FwNode].
- * @tcode: A transaction code of [enum@FwTcode].
- * @addr: A destination address of target device
- * @length: The range of address in byte unit.
- * @frame: (array length=frame_size)(inout): An array with elements for 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 for read and lock
- * transaction.
- * @frame_size: The size of array in byte unit. The value of this argument should point to the
- * numeric number and mutable for read and lock transaction.
- * @timeout_ms: The timeout to wait for response subaction of the transaction since request
- * subaction is initiated, in milliseconds.
- * @error: A [struct@GLib.Error]. Error can be generated with two domains; Hinawa.FwNodeError and
- * Hinawa.FwReqError.
- *
- * Execute request subaction of transaction to the given node according to given code, then wait
- * for response subaction within the given timeout. The [property@FwReq:timeout] property of
- * instance is ignored.
- *
- * Since: 2.1.
- * Deprecated: 2.6. Use [method@FwReq.transaction_with_tstamp] instead.
- */
-void hinawa_fw_req_transaction_sync(HinawaFwReq *self, HinawaFwNode *node,
- HinawaFwTcode tcode, guint64 addr, gsize length,
- guint8 *const *frame, gsize *frame_size, guint timeout_ms,
- GError **error)
-{
- struct waiter w;
-
- (void)complete_transaction(self, node, tcode, addr, length, frame, frame_size, timeout_ms,
- &w, error);
-}
-
-/**
* hinawa_fw_req_transaction_with_tstamp:
* @self: A [class@FwReq].
* @node: A [class@FwNode].
diff --git a/src/fw_req.h b/src/fw_req.h
index 7aa0a15..8836ace 100644
--- a/src/fw_req.h
+++ b/src/fw_req.h
@@ -57,16 +57,6 @@ gboolean hinawa_fw_req_request(HinawaFwReq *self, HinawaFwNode *node, HinawaFwTc
guint64 addr, gsize length, guint8 *const *frame, gsize *frame_size,
GError **error);
-void hinawa_fw_req_transaction_async(HinawaFwReq *self, HinawaFwNode *node,
- HinawaFwTcode tcode, guint64 addr, gsize length,
- guint8 *const *frame, gsize *frame_size,
- GError **error);
-
-void hinawa_fw_req_transaction_sync(HinawaFwReq *self, HinawaFwNode *node,
- HinawaFwTcode tcode, guint64 addr, gsize length,
- guint8 *const *frame, gsize *frame_size, guint timeout_ms,
- GError **error);
-
gboolean hinawa_fw_req_transaction_with_tstamp(HinawaFwReq *self, HinawaFwNode *node,
HinawaFwTcode tcode, guint64 addr, gsize length,
guint8 **frame, gsize *frame_size, guint tstamp[2],
diff --git a/src/hinawa.map b/src/hinawa.map
index 108a9f2..a59966a 100644
--- a/src/hinawa.map
+++ b/src/hinawa.map
@@ -56,9 +56,6 @@ HINAWA_2_1_0 {
"hinawa_fw_fcp_error_get_type";
"hinawa_fw_fcp_error_quark";
-
- "hinawa_fw_req_transaction_async";
- "hinawa_fw_req_transaction_sync";
} HINAWA_2_0_0;
HINAWA_2_2_0 {
diff --git a/tests/fw-req b/tests/fw-req
index baaa380..e061a8f 100755
--- a/tests/fw-req
+++ b/tests/fw-req
@@ -16,8 +16,6 @@ props = (
methods = (
'new',
'transaction',
- 'transaction_async',
- 'transaction_sync',
'request',
'transaction_with_tstamp',
)