Changeset d30e067 in mainline for uspace/lib/drv/generic/remote_hw_res.c

Timestamp:

2025-03-02T20:02:33Z (5 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

8cdf360

Parents:

7debda3 (diff), 4285f384 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 'upstream/master' into helenraid-para

File:

• uspace/lib/drv/generic/remote_hw_res.c (modified) (4 diffs)

uspace/lib/drv/generic/remote_hw_res.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2010 Lenka Trochtova
  * Copyright (c) 2011 Jan Vesely
@@ -48 +48 @@
 static void remote_hw_res_dma_channel_setup(ddf_fun_t *, void *, ipc_call_t *);
 static void remote_hw_res_dma_channel_remain(ddf_fun_t *, void *, ipc_call_t *);
-static void remote_hw_res_get_flags(ddf_fun_t *, void *, ipc_call_t *);
+static void remote_hw_res_query_legacy_io(ddf_fun_t *, void *, ipc_call_t *);
+static void remote_hw_res_claim_legacy_io(ddf_fun_t *, void *, ipc_call_t *);
 
 static const remote_iface_func_ptr_t remote_hw_res_iface_ops [] = {
@@ -57 +58 @@
         [HW_RES_DMA_CHANNEL_SETUP] = &remote_hw_res_dma_channel_setup,
         [HW_RES_DMA_CHANNEL_REMAIN] = &remote_hw_res_dma_channel_remain,
-        [HW_RES_GET_FLAGS] = &remote_hw_res_get_flags
+        [HW_RES_QUERY_LEGACY_IO] = &remote_hw_res_query_legacy_io,
+        [HW_RES_CLAIM_LEGACY_IO] = &remote_hw_res_claim_legacy_io
 };
 
@@ -174 +176 @@
 }
 
-static void remote_hw_res_get_flags(ddf_fun_t *fun, void *ops,
-    ipc_call_t *call)
-{
-        hw_res_ops_t *hw_res_ops = ops;
-
-        if (hw_res_ops->get_flags == NULL) {
-                async_answer_0(call, ENOTSUP);
-                return;
-        }
-
-        hw_res_flags_t flags = 0;
-        const errno_t ret = hw_res_ops->get_flags(fun, &flags);
-        async_answer_1(call, ret, flags);
+static void remote_hw_res_query_legacy_io(ddf_fun_t *fun, void *ops,
+    ipc_call_t *call)
+{
+        hw_res_ops_t *hw_res_ops = ops;
+
+        if (hw_res_ops->query_legacy_io == NULL) {
+                async_answer_0(call, ENOTSUP);
+                return;
+        }
+
+        hw_res_claims_t claims = 0;
+        const errno_t ret = hw_res_ops->query_legacy_io(fun, &claims);
+        async_answer_1(call, ret, claims);
+}
+
+static void remote_hw_res_claim_legacy_io(ddf_fun_t *fun, void *ops,
+    ipc_call_t *call)
+{
+        hw_res_ops_t *hw_res_ops = ops;
+        hw_res_claims_t claims;
+
+        if (hw_res_ops->claim_legacy_io == NULL) {
+                async_answer_0(call, ENOTSUP);
+                return;
+        }
+
+        claims = DEV_IPC_GET_ARG1(*call);
+
+        const errno_t ret = hw_res_ops->claim_legacy_io(fun, claims);
+        async_answer_0(call, ret);
 }