Changes in uspace/lib/c/generic/vbd.c [b7fd2a0:372df8f] in mainline

File:

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

uspace/lib/c/generic/vbd.c

@@ -33 +33 @@
  */
 
-#include <abi/ipc/interfaces.h>
 #include <errno.h>
 #include <ipc/services.h>
@@ -44 +43 @@
 #include <vbd.h>
 
-static errno_t vbd_get_ids_internal(vbd_t *, sysarg_t, sysarg_t, sysarg_t **,
+static int vbd_get_ids_internal(vbd_t *, sysarg_t, sysarg_t, sysarg_t **,
     size_t *);
 
-errno_t vbd_create(vbd_t **rvbd)
+int vbd_create(vbd_t **rvbd)
 {
         vbd_t *vbd;
         service_id_t vbd_svcid;
-        errno_t rc;
+        int rc;
 
         vbd = calloc(1, sizeof(vbd_t));
@@ -66 +65 @@
         }
 
-        vbd->sess = loc_service_connect(vbd_svcid, INTERFACE_VBD,
+        vbd->sess = loc_service_connect(EXCHANGE_SERIALIZE, vbd_svcid,
             IPC_FLAG_BLOCKING);
         if (vbd->sess == NULL) {
@@ -95 +94 @@
  * @param count Place to store length of array (number of entries)
  *
- * @return EOK on success or an error code
- */
-errno_t vbd_get_disks(vbd_t *vbd, service_id_t **data, size_t *count)
+ * @return EOK on success or negative error code
+ */
+int vbd_get_disks(vbd_t *vbd, service_id_t **data, size_t *count)
 {
         return vbd_get_ids_internal(vbd, VBD_GET_DISKS, 0, data, count);
@@ -103 +102 @@
 
 /** Get disk information. */
-errno_t vbd_disk_info(vbd_t *vbd, service_id_t sid, vbd_disk_info_t *vinfo)
-{
-        async_exch_t *exch;
-        errno_t retval;
+int vbd_disk_info(vbd_t *vbd, service_id_t sid, vbd_disk_info_t *vinfo)
+{
+        async_exch_t *exch;
+        sysarg_t retval;
         ipc_call_t answer;
 
         exch = async_exchange_begin(vbd->sess);
         aid_t req = async_send_1(exch, VBD_DISK_INFO, sid, &answer);
-        errno_t rc = async_data_read_start(exch, vinfo, sizeof(vbd_disk_info_t));
-        async_exchange_end(exch);
-
-        if (rc != EOK) {
-                async_forget(req);
-                return EIO;
-        }
-
-        async_wait_for(req, &retval);
-        if (retval != EOK)
-                return EIO;
-
-        return EOK;
-}
-
-errno_t vbd_label_create(vbd_t *vbd, service_id_t sid, label_type_t ltype)
-{
-        async_exch_t *exch;
-        errno_t retval;
+        int rc = async_data_read_start(exch, vinfo, sizeof(vbd_disk_info_t));
+        async_exchange_end(exch);
+
+        if (rc != EOK) {
+                async_forget(req);
+                return EIO;
+        }
+
+        async_wait_for(req, &retval);
+        if (retval != EOK)
+                return EIO;
+
+        return EOK;
+}
+
+int vbd_label_create(vbd_t *vbd, service_id_t sid, label_type_t ltype)
+{
+        async_exch_t *exch;
+        int retval;
 
         exch = async_exchange_begin(vbd->sess);
@@ -141 +140 @@
 }
 
-errno_t vbd_label_delete(vbd_t *vbd, service_id_t sid)
-{
-        async_exch_t *exch;
-        errno_t retval;
+int vbd_label_delete(vbd_t *vbd, service_id_t sid)
+{
+        async_exch_t *exch;
+        int retval;
 
         exch = async_exchange_begin(vbd->sess);
@@ -165 +164 @@
  * @param act_size Place to store actual size of complete data.
  *
- * @return EOK on success or an error code.
- */
-static errno_t vbd_get_ids_once(vbd_t *vbd, sysarg_t method, sysarg_t arg1,
+ * @return EOK on success or negative error code.
+ */
+static int vbd_get_ids_once(vbd_t *vbd, sysarg_t method, sysarg_t arg1,
     sysarg_t *id_buf, size_t buf_size, size_t *act_size)
 {
@@ -174 +173 @@
         ipc_call_t answer;
         aid_t req = async_send_1(exch, method, arg1, &answer);
-        errno_t rc = async_data_read_start(exch, id_buf, buf_size);
+        int rc = async_data_read_start(exch, id_buf, buf_size);
 
         async_exchange_end(exch);
@@ -183 +182 @@
         }
 
-        errno_t retval;
+        sysarg_t retval;
         async_wait_for(req, &retval);
 
@@ -203 +202 @@
  * @param data   Place to store pointer to array of IDs
  * @param count  Place to store number of IDs
- * @return       EOK on success or an error code
- */
-static errno_t vbd_get_ids_internal(vbd_t *vbd, sysarg_t method, sysarg_t arg1,
+ * @return       EOK on success or negative error code
+ */
+static int vbd_get_ids_internal(vbd_t *vbd, sysarg_t method, sysarg_t arg1,
     sysarg_t **data, size_t *count)
 {
@@ -212 +211 @@
 
         size_t act_size = 0;
-        errno_t rc = vbd_get_ids_once(vbd, method, arg1, NULL, 0, &act_size);
+        int rc = vbd_get_ids_once(vbd, method, arg1, NULL, 0, &act_size);
         if (rc != EOK)
                 return rc;
@@ -247 +246 @@
  * @param count Place to store length of array (number of entries)
  *
- * @return EOK on success or an error code
- */
-errno_t vbd_label_get_parts(vbd_t *vbd, service_id_t disk,
+ * @return EOK on success or negative error code
+ */
+int vbd_label_get_parts(vbd_t *vbd, service_id_t disk,
     service_id_t **data, size_t *count)
 {
@@ -256 +255 @@
 }
 
-errno_t vbd_part_get_info(vbd_t *vbd, vbd_part_id_t part, vbd_part_info_t *pinfo)
-{
-        async_exch_t *exch;
-        errno_t retval;
+int vbd_part_get_info(vbd_t *vbd, vbd_part_id_t part, vbd_part_info_t *pinfo)
+{
+        async_exch_t *exch;
+        sysarg_t retval;
         ipc_call_t answer;
 
         exch = async_exchange_begin(vbd->sess);
         aid_t req = async_send_1(exch, VBD_PART_GET_INFO, part, &answer);
-        errno_t rc = async_data_read_start(exch, pinfo, sizeof(vbd_part_info_t));
-        async_exchange_end(exch);
-
-        if (rc != EOK) {
-                async_forget(req);
-                return EIO;
-        }
-
-        async_wait_for(req, &retval);
-        if (retval != EOK)
-                return EIO;
-
-        return EOK;
-}
-
-errno_t vbd_part_create(vbd_t *vbd, service_id_t disk, vbd_part_spec_t *pspec,
+        int rc = async_data_read_start(exch, pinfo, sizeof(vbd_part_info_t));
+        async_exchange_end(exch);
+
+        if (rc != EOK) {
+                async_forget(req);
+                return EIO;
+        }
+
+        async_wait_for(req, &retval);
+        if (retval != EOK)
+                return EIO;
+
+        return EOK;
+}
+
+int vbd_part_create(vbd_t *vbd, service_id_t disk, vbd_part_spec_t *pspec,
     vbd_part_id_t *rpart)
 {
         async_exch_t *exch;
-        errno_t retval;
+        sysarg_t retval;
         ipc_call_t answer;
 
         exch = async_exchange_begin(vbd->sess);
         aid_t req = async_send_1(exch, VBD_PART_CREATE, disk, &answer);
-        errno_t rc = async_data_write_start(exch, pspec, sizeof(vbd_part_spec_t));
+        int rc = async_data_write_start(exch, pspec, sizeof(vbd_part_spec_t));
         async_exchange_end(exch);
 
@@ -305 +304 @@
 }
 
-errno_t vbd_part_delete(vbd_t *vbd, vbd_part_id_t part)
-{
-        async_exch_t *exch;
-        errno_t retval;
+int vbd_part_delete(vbd_t *vbd, vbd_part_id_t part)
+{
+        async_exch_t *exch;
+        int retval;
 
         exch = async_exchange_begin(vbd->sess);
@@ -332 +331 @@
  * @param ptype Place to store suggested partition type
  *
- * @return EOK on success or an error code
- */
-errno_t vbd_suggest_ptype(vbd_t *vbd, service_id_t disk, label_pcnt_t pcnt,
+ * @return EOK on success or negative error code
+ */
+int vbd_suggest_ptype(vbd_t *vbd, service_id_t disk, label_pcnt_t pcnt,
     label_ptype_t *ptype)
 {
         async_exch_t *exch;
-        errno_t retval;
+        sysarg_t retval;
         ipc_call_t answer;
 
         exch = async_exchange_begin(vbd->sess);
         aid_t req = async_send_2(exch, VBD_SUGGEST_PTYPE, disk, pcnt, &answer);
-        errno_t rc = async_data_read_start(exch, ptype, sizeof(label_ptype_t));
+        int rc = async_data_read_start(exch, ptype, sizeof(label_ptype_t));
         async_exchange_end(exch);