Changes in uspace/lib/drv/generic/remote_usbhid.c [b7fd2a0:a44424f] in mainline

File:

• uspace/lib/drv/generic/remote_usbhid.c (modified) (12 diffs)

uspace/lib/drv/generic/remote_usbhid.c

@@ -94 +94 @@
  * @param dev_sess Session to DDF device providing USB HID interface.
  *
- * @return Number of usages returned or an error code.
- *
- */
-errno_t usbhid_dev_get_event_length(async_sess_t *dev_sess, size_t *size)
+ * @return Number of usages returned or negative error code.
+ *
+ */
+int usbhid_dev_get_event_length(async_sess_t *dev_sess, size_t *size)
 {
         if (!dev_sess)
@@ -105 +105 @@
         
         sysarg_t len;
-        errno_t rc = async_req_1_1(exch, DEV_IFACE_ID(USBHID_DEV_IFACE),
+        int rc = async_req_1_1(exch, DEV_IFACE_ID(USBHID_DEV_IFACE),
             IPC_M_USBHID_GET_EVENT_LENGTH, &len);
         
@@ -132 +132 @@
  *
  */
-errno_t usbhid_dev_get_event(async_sess_t *dev_sess, uint8_t *buf,
+int usbhid_dev_get_event(async_sess_t *dev_sess, uint8_t *buf,
     size_t size, size_t *actual_size, int *event_nr, unsigned int flags)
 {
@@ -174 +174 @@
         }
         
-        errno_t data_request_rc;
-        errno_t opening_request_rc;
+        sysarg_t data_request_rc;
+        sysarg_t opening_request_rc;
         async_wait_for(data_request, &data_request_rc);
         async_wait_for(opening_request, &opening_request_rc);
@@ -182 +182 @@
                 /* Prefer return code of the opening request. */
                 if (opening_request_rc != EOK)
-                        return (errno_t) opening_request_rc;
+                        return (int) opening_request_rc;
                 else
-                        return (errno_t) data_request_rc;
+                        return (int) data_request_rc;
         }
         
         if (opening_request_rc != EOK)
-                return (errno_t) opening_request_rc;
+                return (int) opening_request_rc;
         
         size_t act_size = IPC_GET_ARG2(data_request_call);
@@ -204 +204 @@
 }
 
-errno_t usbhid_dev_get_report_descriptor_length(async_sess_t *dev_sess,
+int usbhid_dev_get_report_descriptor_length(async_sess_t *dev_sess,
     size_t *size)
 {
@@ -213 +213 @@
         
         sysarg_t arg_size;
-        errno_t rc = async_req_1_1(exch, DEV_IFACE_ID(USBHID_DEV_IFACE),
+        int rc = async_req_1_1(exch, DEV_IFACE_ID(USBHID_DEV_IFACE),
             IPC_M_USBHID_GET_REPORT_DESCRIPTOR_LENGTH, &arg_size);
         
@@ -226 +226 @@
 }
 
-errno_t usbhid_dev_get_report_descriptor(async_sess_t *dev_sess, uint8_t *buf,
+int usbhid_dev_get_report_descriptor(async_sess_t *dev_sess, uint8_t *buf,
     size_t size, size_t *actual_size)
 {
@@ -259 +259 @@
         }
         
-        errno_t data_request_rc;
-        errno_t opening_request_rc;
+        sysarg_t data_request_rc;
+        sysarg_t opening_request_rc;
         async_wait_for(data_request, &data_request_rc);
         async_wait_for(opening_request, &opening_request_rc);
@@ -267 +267 @@
                 /* Prefer return code of the opening request. */
                 if (opening_request_rc != EOK)
-                        return (errno_t) opening_request_rc;
+                        return (int) opening_request_rc;
                 else
-                        return (errno_t) data_request_rc;
+                        return (int) data_request_rc;
         }
         
         if (opening_request_rc != EOK)
-                return (errno_t) opening_request_rc;
+                return (int) opening_request_rc;
         
         size_t act_size = IPC_GET_ARG2(data_request_call);
@@ -362 +362 @@
         }
 
-        errno_t rc;
+        int rc;
 
         uint8_t *data = malloc(len);
@@ -438 +438 @@
 
         size_t act_len = 0;
-        errno_t rc = hid_iface->get_report_descriptor(fun, descriptor, len,
+        int rc = hid_iface->get_report_descriptor(fun, descriptor, len,
             &act_len);
         if (act_len > len) {