Changes in uspace/lib/drv/generic/remote_ahci.c [0f5c4e4:984a9ba] in mainline

File:

• uspace/lib/drv/generic/remote_ahci.c (modified) (5 diffs)

uspace/lib/drv/generic/remote_ahci.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2012 Petr Jerman
  * All rights reserved.
@@ -153 +152 @@
             IPC_M_AHCI_READ_BLOCKS, HI(blocknum),  LO(blocknum), count, NULL);
 
-        errno_t rc = async_data_read_start(exch, buf, count * 512);
+        async_share_out_start(exch, buf, AS_AREA_READ | AS_AREA_WRITE);
+
         async_exchange_end(exch);
-        if (rc != EOK) {
-                async_forget(req);
-                return rc;
-        }
-
-        errno_t retval;
-        async_wait_for(req, &retval);
-        return retval;
+
+        errno_t rc;
+        async_wait_for(req, &rc);
+
+        return rc;
 }
 
@@ -175 +172 @@
             IPC_M_AHCI_WRITE_BLOCKS, HI(blocknum),  LO(blocknum), count, NULL);
 
-        errno_t rc = async_data_write_start(exch, buf, count * 512);
+        async_share_out_start(exch, buf, AS_AREA_READ | AS_AREA_WRITE);
+
         async_exchange_end(exch);
 
-        if (rc != EOK) {
-                async_forget(req);
-                return rc;
-        }
-
-        errno_t retval;
-        async_wait_for(req, &retval);
-        return retval;
+        errno_t rc;
+        async_wait_for(req, &rc);
+
+        return rc;
 }
 
@@ -290 +284 @@
         }
 
-        ipc_call_t rcall;
-        size_t size;
-        if (!async_data_read_receive(&rcall, &size)) {
-                async_answer_0(&rcall, EINVAL);
-                async_answer_0(call, EINVAL);
-                return;
-        }
-
-        void *buf = malloc(size);
-        if (buf == NULL) {
-                async_answer_0(&rcall, ENOMEM);
-                async_answer_0(call, ENOMEM);
-                return;
-        }
-
-        uint64_t blocknum =
+        ipc_call_t data;
+        size_t maxblock_size;
+        unsigned int flags;
+        async_share_out_receive(&data, &maxblock_size, &flags);
+
+        void *buf;
+        async_share_out_finalize(&data, &buf);
+
+        const uint64_t blocknum =
             (((uint64_t) (DEV_IPC_GET_ARG1(*call))) << 32) |
             (((uint64_t) (DEV_IPC_GET_ARG2(*call))) & 0xffffffff);
-        size_t cnt = (size_t) DEV_IPC_GET_ARG3(*call);
-
-        errno_t rc = ahci_iface->read_blocks(fun, blocknum, cnt, buf);
-        if (rc != EOK) {
-                async_answer_0(&rcall, ENOMEM);
-                async_answer_0(call, ENOMEM);
-                free(buf);
-                return;
-        }
-
-        async_data_read_finalize(&rcall, buf, size);
-
-        free(buf);
-        async_answer_0(call, EOK);
+        const size_t cnt = (size_t) DEV_IPC_GET_ARG3(*call);
+
+        const errno_t ret = ahci_iface->read_blocks(fun, blocknum, cnt, buf);
+
+        async_answer_0(call, ret);
 }
 
@@ -328 +306 @@
         const ahci_iface_t *ahci_iface = (ahci_iface_t *) iface;
 
-        if (ahci_iface->write_blocks == NULL) {
-                async_answer_0(call, ENOTSUP);
-                return;
-        }
-
-        void *data;
-        size_t dsize;
-        errno_t rc = async_data_write_accept(&data, false, 0, 0, 0, &dsize);
-        if (rc != EOK) {
-                async_answer_0(call, rc);
-                return;
-        }
-
-        uint64_t blocknum =
+        if (ahci_iface->read_blocks == NULL) {
+                async_answer_0(call, ENOTSUP);
+                return;
+        }
+
+        ipc_call_t data;
+        size_t maxblock_size;
+        unsigned int flags;
+        async_share_out_receive(&data, &maxblock_size, &flags);
+
+        void *buf;
+        async_share_out_finalize(&data, &buf);
+
+        const uint64_t blocknum =
             (((uint64_t)(DEV_IPC_GET_ARG1(*call))) << 32) |
             (((uint64_t)(DEV_IPC_GET_ARG2(*call))) & 0xffffffff);
-        size_t cnt = (size_t) DEV_IPC_GET_ARG3(*call);
-
-        if (dsize != cnt * 512) {
-                async_answer_0(call, EINVAL);
-                return;
-        }
-
-        rc = ahci_iface->write_blocks(fun, blocknum, cnt, data);
-        free(data);
-        async_answer_0(call, rc);
+        const size_t cnt = (size_t) DEV_IPC_GET_ARG3(*call);
+
+        const errno_t ret = ahci_iface->write_blocks(fun, blocknum, cnt, buf);
+
+        async_answer_0(call, ret);
 }