Changeset 5a6cc679 in mainline for uspace/drv/bus/adb/cuda_adb

Timestamp:

2018-01-31T02:21:24Z (8 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

Location:

uspace/drv/bus/adb/cuda_adb

Files:

• cuda_adb.c (modified) (5 diffs)
• cuda_adb.h (modified) (1 diff)
• main.c (modified) (7 diffs)

uspace/drv/bus/adb/cuda_adb/cuda_adb.c

@@ -56 +56 @@
 
 static void cuda_dev_connection(ipc_callid_t, ipc_call_t *, void *);
-static int cuda_init(cuda_t *);
+static errno_t cuda_init(cuda_t *);
 static void cuda_irq_handler(ipc_call_t *, void *);
 
@@ -108 +108 @@
 };
 
-static int cuda_dev_create(cuda_t *cuda, const char *name, const char *id,
+static errno_t cuda_dev_create(cuda_t *cuda, const char *name, const char *id,
     adb_dev_t **rdev)
 {
         adb_dev_t *dev = NULL;
         ddf_fun_t *fun;
-        int rc;
+        errno_t rc;
 
         fun = ddf_fun_create(cuda->dev, fun_inner, name);
@@ -155 +155 @@
 }
 
-int cuda_add(cuda_t *cuda, cuda_res_t *res)
+errno_t cuda_add(cuda_t *cuda, cuda_res_t *res)
 {
         adb_dev_t *kbd = NULL;
         adb_dev_t *mouse = NULL;
-        int rc;
+        errno_t rc;
 
         cuda->phys_base = res->base;
@@ -187 +187 @@
 }
 
-int cuda_remove(cuda_t *cuda)
+errno_t cuda_remove(cuda_t *cuda)
 {
         return ENOTSUP;
 }
 
-int cuda_gone(cuda_t *cuda)
+errno_t cuda_gone(cuda_t *cuda)
 {
         return ENOTSUP;
@@ -229 +229 @@
 }
 
-static int cuda_init(cuda_t *cuda)
-{
-        int rc;
+static errno_t cuda_init(cuda_t *cuda)
+{
+        errno_t rc;
 
         void *vaddr;

uspace/drv/bus/adb/cuda_adb/cuda_adb.h

@@ -87 +87 @@
 } cuda_t;
 
-extern int cuda_add(cuda_t *, cuda_res_t *);
-extern int cuda_remove(cuda_t *);
-extern int cuda_gone(cuda_t *);
+extern errno_t cuda_add(cuda_t *, cuda_res_t *);
+extern errno_t cuda_remove(cuda_t *);
+extern errno_t cuda_gone(cuda_t *);
 
 #endif

uspace/drv/bus/adb/cuda_adb/main.c

@@ -43 +43 @@
 #define NAME  "cuda_adb"
 
-static int cuda_dev_add(ddf_dev_t *dev);
-static int cuda_dev_remove(ddf_dev_t *dev);
-static int cuda_dev_gone(ddf_dev_t *dev);
-static int cuda_fun_online(ddf_fun_t *fun);
-static int cuda_fun_offline(ddf_fun_t *fun);
+static errno_t cuda_dev_add(ddf_dev_t *dev);
+static errno_t cuda_dev_remove(ddf_dev_t *dev);
+static errno_t cuda_dev_gone(ddf_dev_t *dev);
+static errno_t cuda_fun_online(ddf_fun_t *fun);
+static errno_t cuda_fun_offline(ddf_fun_t *fun);
 
 static driver_ops_t driver_ops = {
@@ -62 +62 @@
 };
 
-static int cuda_get_res(ddf_dev_t *dev, cuda_res_t *res)
+static errno_t cuda_get_res(ddf_dev_t *dev, cuda_res_t *res)
 {
         async_sess_t *parent_sess;
         hw_res_list_parsed_t hw_res;
-        int rc;
+        errno_t rc;
 
         parent_sess = ddf_dev_parent_sess_get(dev);
@@ -97 +97 @@
 }
 
-static int cuda_dev_add(ddf_dev_t *dev)
+static errno_t cuda_dev_add(ddf_dev_t *dev)
 {
         cuda_t *cuda;
         cuda_res_t cuda_res;
-        int rc;
+        errno_t rc;
 
         ddf_msg(LVL_DEBUG, "cuda_dev_add(%p)", dev);
@@ -122 +122 @@
 }
 
-static int cuda_dev_remove(ddf_dev_t *dev)
+static errno_t cuda_dev_remove(ddf_dev_t *dev)
 {
         cuda_t *cuda = (cuda_t *)ddf_dev_data_get(dev);
@@ -131 +131 @@
 }
 
-static int cuda_dev_gone(ddf_dev_t *dev)
+static errno_t cuda_dev_gone(ddf_dev_t *dev)
 {
         cuda_t *cuda = (cuda_t *)ddf_dev_data_get(dev);
@@ -140 +140 @@
 }
 
-static int cuda_fun_online(ddf_fun_t *fun)
+static errno_t cuda_fun_online(ddf_fun_t *fun)
 {
         ddf_msg(LVL_DEBUG, "cuda_fun_online()");
@@ -146 +146 @@
 }
 
-static int cuda_fun_offline(ddf_fun_t *fun)
+static errno_t cuda_fun_offline(ddf_fun_t *fun)
 {
         ddf_msg(LVL_DEBUG, "cuda_fun_offline()");