Changeset 5a6cc679 in mainline for uspace/lib/usbdev/src/devdrv.c

Timestamp:

2018-01-31T02:21:24Z (6 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a0a9cc2

Parents:

132ab5d1

Message:

Merge commit '50f19b7ee8e94570b5c63896736c4eb49cfa18db' into forwardport

Not all ints are converted to errno_t in xhci tree yet, however it compiles and works

File:

• uspace/lib/usbdev/src/devdrv.c (modified) (13 diffs)

uspace/lib/usbdev/src/devdrv.c

@@ -141 +141 @@
  * @return Error code.
  */
-int usb_device_select_interface(usb_device_t *usb_dev,
+errno_t usb_device_select_interface(usb_device_t *usb_dev,
     uint8_t alternate_setting, const usb_endpoint_description_t **endpoints)
 {
@@ -151 +151 @@
 
         /* Change the interface itself. */
-        int rc = usb_request_set_interface(&usb_dev->ctrl_pipe,
+        errno_t rc = usb_request_set_interface(&usb_dev->ctrl_pipe,
             usb_dev->interface_no, alternate_setting);
         if (rc != EOK) {
@@ -175 +175 @@
  * @return Error code.
  */
-static int usb_device_retrieve_descriptors(usb_device_t *usb_dev)
+static errno_t usb_device_retrieve_descriptors(usb_device_t *usb_dev)
 {
         assert(usb_dev);
@@ -181 +181 @@
 
         /* Get the device descriptor. */
-        int rc = usb_request_get_device_descriptor(&usb_dev->ctrl_pipe,
+        errno_t rc = usb_request_get_device_descriptor(&usb_dev->ctrl_pipe,
             &usb_dev->descriptors.device);
         if (rc != EOK) {
@@ -227 +227 @@
  * @return Error code.
  */
-int usb_device_create_pipes(usb_device_t *usb_dev,
+errno_t usb_device_create_pipes(usb_device_t *usb_dev,
     const usb_endpoint_description_t **endpoints)
 {
@@ -255 +255 @@
 
         /* Find the mapping from configuration descriptor. */
-        int rc = usb_pipe_initialize_from_configuration(pipes, pipe_count,
+        errno_t rc = usb_pipe_initialize_from_configuration(pipes, pipe_count,
             usb_dev->descriptors.full_config,
             usb_dev->descriptors.full_config_size,
@@ -429 +429 @@
  * @return Error code.
  */
-static int usb_device_init(usb_device_t *usb_dev, ddf_dev_t *ddf_dev,
+static errno_t usb_device_init(usb_device_t *usb_dev, ddf_dev_t *ddf_dev,
     const usb_endpoint_description_t **endpoints, const char **errstr_ptr)
 {
@@ -453 +453 @@
         /* This pipe was registered by the hub driver,
          * during device initialization. */
-        int rc = usb_pipe_initialize_default_control(&usb_dev->ctrl_pipe, usb_dev->bus_session);
+        errno_t rc = usb_pipe_initialize_default_control(&usb_dev->ctrl_pipe, usb_dev->bus_session);
         if (rc != EOK) {
                 usb_dev_disconnect(usb_dev->bus_session);
@@ -489 +489 @@
 }
 
-static int usb_device_get_info(async_sess_t *sess, usb_device_t *dev)
+static errno_t usb_device_get_info(async_sess_t *sess, usb_device_t *dev)
 {
         assert(dev);
@@ -498 +498 @@
 
         usb_device_desc_t dev_desc;
-        const int ret = usb_get_my_description(exch, &dev_desc);
+        const errno_t ret = usb_get_my_description(exch, &dev_desc);
 
         if (ret == EOK) {
@@ -512 +512 @@
 }
 
-int usb_device_create_ddf(ddf_dev_t *ddf_dev,
+errno_t usb_device_create_ddf(ddf_dev_t *ddf_dev,
     const usb_endpoint_description_t **desc, const char **err)
 {
@@ -529 +529 @@
         }
 
-        const int ret = usb_device_get_info(sess, usb_dev);
+        const errno_t ret = usb_device_get_info(sess, usb_dev);
         if (ret != EOK)
                 return ret;
@@ -552 +552 @@
 
         async_sess_t *sess = devman_device_connect(handle, IPC_FLAG_BLOCKING);
-        int ret = usb_device_get_info(sess, usb_dev);
+        errno_t ret = usb_device_get_info(sess, usb_dev);
         if (sess)
                 async_hangup(sess);