Changes in uspace/lib/drv/generic/remote_ahci.c [1d6dd2a:58563585] in mainline

File:

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

uspace/lib/drv/generic/remote_ahci.c

@@ -39 +39 @@
 #include <stdio.h>
 #include <macros.h>
-#include <str.h>
 #include "ahci_iface.h"
 #include "ddf/driver.h"
@@ -66 +65 @@
         
         char devn[MAX_NAME_LENGTH];
-        errno_t rc = devman_fun_get_name(funh, devn, MAX_NAME_LENGTH);
+        int rc = devman_fun_get_name(funh, devn, MAX_NAME_LENGTH);
         if (rc != EOK)
                 return NULL;
@@ -84 +83 @@
 }
 
-errno_t ahci_get_sata_device_name(async_sess_t *sess, size_t sata_dev_name_length,
+int ahci_get_sata_device_name(async_sess_t *sess, size_t sata_dev_name_length,
     char *sata_dev_name)
 {
@@ -96 +95 @@
         async_data_read_start(exch, sata_dev_name, sata_dev_name_length);
         
-        errno_t rc;
+        sysarg_t rc;
         async_wait_for(req, &rc);
         
@@ -102 +101 @@
 }
 
-errno_t ahci_get_num_blocks(async_sess_t *sess, uint64_t *blocks)
+int ahci_get_num_blocks(async_sess_t *sess, uint64_t *blocks)
 {
         async_exch_t *exch = async_exchange_begin(sess);
@@ -110 +109 @@
         sysarg_t blocks_hi;
         sysarg_t blocks_lo;
-        errno_t rc = async_req_1_2(exch, DEV_IFACE_ID(AHCI_DEV_IFACE),
+        int rc = async_req_1_2(exch, DEV_IFACE_ID(AHCI_DEV_IFACE),
             IPC_M_AHCI_GET_NUM_BLOCKS, &blocks_hi, &blocks_lo);
         
@@ -123 +122 @@
 }
 
-errno_t ahci_get_block_size(async_sess_t *sess, size_t *blocks_size)
+int ahci_get_block_size(async_sess_t *sess, size_t *blocks_size)
 {
         async_exch_t *exch = async_exchange_begin(sess);
@@ -130 +129 @@
         
         sysarg_t bs;
-        errno_t rc = async_req_1_1(exch, DEV_IFACE_ID(AHCI_DEV_IFACE),
+        int rc = async_req_1_1(exch, DEV_IFACE_ID(AHCI_DEV_IFACE),
             IPC_M_AHCI_GET_BLOCK_SIZE, &bs);
         
@@ -141 +140 @@
 }
 
-errno_t ahci_read_blocks(async_sess_t *sess, uint64_t blocknum, size_t count,
+int ahci_read_blocks(async_sess_t *sess, uint64_t blocknum, size_t count,
     void *buf)
 {
@@ -156 +155 @@
         async_exchange_end(exch);
         
-        errno_t rc;
+        sysarg_t rc;
         async_wait_for(req, &rc);
         
@@ -162 +161 @@
 }
 
-errno_t ahci_write_blocks(async_sess_t *sess, uint64_t blocknum, size_t count,
+int ahci_write_blocks(async_sess_t *sess, uint64_t blocknum, size_t count,
     void* buf)
 {
@@ -176 +175 @@
         async_exchange_end(exch);
         
-        errno_t rc;
+        sysarg_t rc;
         async_wait_for(req, &rc);
         
@@ -228 +227 @@
         }       
         
-        const errno_t ret = ahci_iface->get_sata_device_name(fun,
+        const int ret = ahci_iface->get_sata_device_name(fun,
             sata_dev_name_length, sata_dev_name);
         
@@ -252 +251 @@
         
         uint64_t blocks;
-        const errno_t ret = ahci_iface->get_num_blocks(fun, &blocks);
+        const int ret = ahci_iface->get_num_blocks(fun, &blocks);
         
         if (ret != EOK)
@@ -271 +270 @@
         
         size_t blocks;
-        const errno_t ret = ahci_iface->get_block_size(fun, &blocks);
+        const int ret = ahci_iface->get_block_size(fun, &blocks);
         
         if (ret != EOK)
@@ -303 +302 @@
         const size_t cnt = (size_t) DEV_IPC_GET_ARG3(*call);
         
-        const errno_t ret = ahci_iface->read_blocks(fun, blocknum, cnt, buf);
+        const int ret = ahci_iface->read_blocks(fun, blocknum, cnt, buf);
         
         async_answer_0(callid, ret);
@@ -332 +331 @@
         const size_t cnt = (size_t) DEV_IPC_GET_ARG3(*call);
         
-        const errno_t ret = ahci_iface->write_blocks(fun, blocknum, cnt, buf);
+        const int ret = ahci_iface->write_blocks(fun, blocknum, cnt, buf);
         
         async_answer_0(callid, ret);