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

Timestamp:

2018-01-31T02:21:24Z (7 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/driver.c (modified) (6 diffs)

uspace/lib/usbdev/src/driver.c

@@ -52 +52 @@
  * @return Error code.
  */
-static int generic_device_add(ddf_dev_t *gen_dev)
+static errno_t generic_device_add(ddf_dev_t *gen_dev)
 {
         assert(driver);
@@ -60 +60 @@
         /* Initialize generic USB driver data. */
         const char *err_msg = NULL;
-        int rc = usb_device_create_ddf(gen_dev, driver->endpoints, &err_msg);
+        errno_t rc = usb_device_create_ddf(gen_dev, driver->endpoints, &err_msg);
         if (rc != EOK) {
                 usb_log_error("USB device `%s' init failed (%s): %s.",
@@ -81 +81 @@
  * @return Error code.
  */
-static int generic_device_remove(ddf_dev_t *gen_dev)
+static errno_t generic_device_remove(ddf_dev_t *gen_dev)
 {
         assert(driver);
@@ -90 +90 @@
         /* Just tell the driver to stop whatever it is doing */
         usb_device_t *usb_dev = ddf_dev_data_get(gen_dev);
-        int ret = driver->ops->device_remove(usb_dev);
+        const errno_t ret = driver->ops->device_remove(usb_dev);
         if (ret != EOK)
                 return ret;
@@ -105 +105 @@
  * @return Error code.
  */
-static int generic_device_gone(ddf_dev_t *gen_dev)
+static errno_t generic_device_gone(ddf_dev_t *gen_dev)
 {
         assert(driver);
@@ -112 +112 @@
                 return ENOTSUP;
         usb_device_t *usb_dev = ddf_dev_data_get(gen_dev);
-        const int ret = driver->ops->device_gone(usb_dev);
+        const errno_t ret = driver->ops->device_gone(usb_dev);
         if (ret == EOK)
                 usb_device_destroy_ddf(gen_dev);