Changes in uspace/lib/c/generic/bd.c [b7fd2a0:b2f542a] in mainline

File:

• uspace/lib/c/generic/bd.c (modified) (15 diffs)

uspace/lib/c/generic/bd.c

@@ -48 +48 @@
 static void bd_cb_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg);
 
-errno_t bd_open(async_sess_t *sess, bd_t **rbd)
+int bd_open(async_sess_t *sess, bd_t **rbd)
 {
         bd_t *bd = calloc(1, sizeof(bd_t));
@@ -59 +59 @@
         
         port_id_t port;
-        errno_t rc = async_create_callback_port(exch, INTERFACE_BLOCK_CB, 0, 0,
+        int rc = async_create_callback_port(exch, INTERFACE_BLOCK_CB, 0, 0,
             bd_cb_conn, bd, &port);
         
@@ -83 +83 @@
 }
 
-errno_t bd_read_blocks(bd_t *bd, aoff64_t ba, size_t cnt, void *data, size_t size)
+int bd_read_blocks(bd_t *bd, aoff64_t ba, size_t cnt, void *data, size_t size)
 {
         async_exch_t *exch = async_exchange_begin(bd->sess);
@@ -90 +90 @@
         aid_t req = async_send_3(exch, BD_READ_BLOCKS, LOWER32(ba),
             UPPER32(ba), cnt, &answer);
-        errno_t rc = async_data_read_start(exch, data, size);
+        int rc = async_data_read_start(exch, data, size);
         async_exchange_end(exch);
 
@@ -98 +98 @@
         }
 
-        errno_t retval;
+        sysarg_t retval;
         async_wait_for(req, &retval);
 
@@ -107 +107 @@
 }
 
-errno_t bd_read_toc(bd_t *bd, uint8_t session, void *buf, size_t size)
+int bd_read_toc(bd_t *bd, uint8_t session, void *buf, size_t size)
 {
         async_exch_t *exch = async_exchange_begin(bd->sess);
@@ -113 +113 @@
         ipc_call_t answer;
         aid_t req = async_send_1(exch, BD_READ_TOC, session, &answer);
-        errno_t rc = async_data_read_start(exch, buf, size);
+        int rc = async_data_read_start(exch, buf, size);
         async_exchange_end(exch);
 
@@ -121 +121 @@
         }
 
-        errno_t retval;
+        sysarg_t retval;
         async_wait_for(req, &retval);
 
@@ -130 +130 @@
 }
 
-errno_t bd_write_blocks(bd_t *bd, aoff64_t ba, size_t cnt, const void *data,
+int bd_write_blocks(bd_t *bd, aoff64_t ba, size_t cnt, const void *data,
     size_t size)
 {
@@ -138 +138 @@
         aid_t req = async_send_3(exch, BD_WRITE_BLOCKS, LOWER32(ba),
             UPPER32(ba), cnt, &answer);
-        errno_t rc = async_data_write_start(exch, data, size);
+        int rc = async_data_write_start(exch, data, size);
         async_exchange_end(exch);
 
@@ -146 +146 @@
         }
 
-        errno_t retval;
+        sysarg_t retval;
         async_wait_for(req, &retval);
         if (retval != EOK)
@@ -154 +154 @@
 }
 
-errno_t bd_sync_cache(bd_t *bd, aoff64_t ba, size_t cnt)
-{
-        async_exch_t *exch = async_exchange_begin(bd->sess);
-
-        errno_t rc = async_req_3_0(exch, BD_SYNC_CACHE, LOWER32(ba),
+int bd_sync_cache(bd_t *bd, aoff64_t ba, size_t cnt)
+{
+        async_exch_t *exch = async_exchange_begin(bd->sess);
+
+        int rc = async_req_3_0(exch, BD_SYNC_CACHE, LOWER32(ba),
             UPPER32(ba), cnt);
         async_exchange_end(exch);
@@ -165 +165 @@
 }
 
-errno_t bd_get_block_size(bd_t *bd, size_t *rbsize)
+int bd_get_block_size(bd_t *bd, size_t *rbsize)
 {
         sysarg_t bsize;
         async_exch_t *exch = async_exchange_begin(bd->sess);
 
-        errno_t rc = async_req_0_1(exch, BD_GET_BLOCK_SIZE, &bsize);
+        int rc = async_req_0_1(exch, BD_GET_BLOCK_SIZE, &bsize);
         async_exchange_end(exch);
 
@@ -180 +180 @@
 }
 
-errno_t bd_get_num_blocks(bd_t *bd, aoff64_t *rnb)
+int bd_get_num_blocks(bd_t *bd, aoff64_t *rnb)
 {
         sysarg_t nb_l;
@@ -186 +186 @@
         async_exch_t *exch = async_exchange_begin(bd->sess);
 
-        errno_t rc = async_req_0_2(exch, BD_GET_NUM_BLOCKS, &nb_l, &nb_h);
+        int rc = async_req_0_2(exch, BD_GET_NUM_BLOCKS, &nb_l, &nb_h);
         async_exchange_end(exch);