Changeset 5a6cc679 in mainline for uspace/lib/drv/generic/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/drv/generic/driver.c (modified) (16 diffs)

uspace/lib/drv/generic/driver.c

@@ -124 +124 @@
         
         char *dev_name = NULL;
-        int rc = async_data_write_accept((void **) &dev_name, true, 0, 0, 0, 0);
+        errno_t rc = async_data_write_accept((void **) &dev_name, true, 0, 0, 0, 0);
         if (rc != EOK) {
                 async_answer_0(iid, rc);
@@ -157 +157 @@
         (void) parent_fun_handle;
         
-        int res = driver->driver_ops->dev_add(dev);
+        errno_t res = driver->driver_ops->dev_add(dev);
         
         if (res != EOK) {
@@ -189 +189 @@
         }
         
-        int rc;
+        errno_t rc;
         
         if (driver->driver_ops->dev_remove != NULL)
@@ -222 +222 @@
         }
         
-        int rc;
+        errno_t rc;
         
         if (driver->driver_ops->dev_gone != NULL)
@@ -263 +263 @@
         
         /* Call driver entry point */
-        int rc;
+        errno_t rc;
         
         if (driver->driver_ops->fun_online != NULL)
@@ -298 +298 @@
         
         /* Call driver entry point */
-        int rc;
+        errno_t rc;
         
         if (driver->driver_ops->fun_offline != NULL)
@@ -414 +414 @@
          */
         
-        int ret = EOK;
+        errno_t ret = EOK;
         /* Open device function */
         if (fun->ops != NULL && fun->ops->open != NULL)
@@ -676 +676 @@
  * @return      EOK on success, ENOMEM if out of memory
  */
-int ddf_fun_set_name(ddf_fun_t *dev, const char *name)
+errno_t ddf_fun_set_name(ddf_fun_t *dev, const char *name)
 {
         assert(dev->name == NULL);
@@ -825 +825 @@
  *
  */
-int ddf_fun_bind(ddf_fun_t *fun)
+errno_t ddf_fun_bind(ddf_fun_t *fun)
 {
         assert(fun->bound == false);
@@ -832 +832 @@
         
         add_to_functions_list(fun);
-        int res = devman_add_function(fun->name, fun->ftype, &fun->match_ids,
+        errno_t res = devman_add_function(fun->name, fun->ftype, &fun->match_ids,
             fun->dev->handle, &fun->handle);
         if (res != EOK) {
@@ -853 +853 @@
  *
  */
-int ddf_fun_unbind(ddf_fun_t *fun)
+errno_t ddf_fun_unbind(ddf_fun_t *fun)
 {
         assert(fun->bound == true);
         
-        int res = devman_remove_function(fun->handle);
+        errno_t res = devman_remove_function(fun->handle);
         if (res != EOK)
                 return res;
@@ -874 +874 @@
  *
  */
-int ddf_fun_online(ddf_fun_t *fun)
+errno_t ddf_fun_online(ddf_fun_t *fun)
 {
         assert(fun->bound == true);
         
-        int res = devman_drv_fun_online(fun->handle);
+        errno_t res = devman_drv_fun_online(fun->handle);
         if (res != EOK)
                 return res;
@@ -892 +892 @@
  *
  */
-int ddf_fun_offline(ddf_fun_t *fun)
+errno_t ddf_fun_offline(ddf_fun_t *fun)
 {
         assert(fun->bound == true);
         
-        int res = devman_drv_fun_offline(fun->handle);
+        errno_t res = devman_drv_fun_offline(fun->handle);
         if (res != EOK)
                 return res;
@@ -916 +916 @@
  *
  */
-int ddf_fun_add_match_id(ddf_fun_t *fun, const char *match_id_str,
+errno_t ddf_fun_add_match_id(ddf_fun_t *fun, const char *match_id_str,
     int match_score)
 {
@@ -963 +963 @@
  *
  */
-int ddf_fun_add_to_category(ddf_fun_t *fun, const char *cat_name)
+errno_t ddf_fun_add_to_category(ddf_fun_t *fun, const char *cat_name)
 {
         assert(fun->bound == true);
@@ -984 +984 @@
          */
         port_id_t port;
-        int rc = async_create_port(INTERFACE_DDF_DRIVER, driver_connection_driver,
+        errno_t rc = async_create_port(INTERFACE_DDF_DRIVER, driver_connection_driver,
             NULL, &port);
         if (rc != EOK) {