Changeset a2afd8f in mainline for uspace/drv/bus/adb/cuda_adb/cuda_adb.c

Timestamp:

2017-11-13T18:07:46Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

0dd4779

Parents:

56763a4

Message:

Move ADB keyboard and mouse support to separate drivers.

File:

• uspace/drv/bus/adb/cuda_adb/cuda_adb.c (modified) (3 diffs)

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

@@ -109 +109 @@
 };
 
-static int cuda_dev_create(cuda_t *cuda, const char *name, adb_dev_t **rdev)
+static int cuda_dev_create(cuda_t *cuda, const char *name, const char *id,
+    adb_dev_t **rdev)
 {
         adb_dev_t *dev = NULL;
@@ -115 +116 @@
         int rc;
 
-        fun = ddf_fun_create(cuda->dev, fun_exposed, name);
+        fun = ddf_fun_create(cuda->dev, fun_inner, name);
         if (fun == NULL) {
                 ddf_msg(LVL_ERROR, "Failed creating function '%s'.", name);
+                rc = ENOMEM;
+                goto error;
+        }
+
+        rc = ddf_fun_add_match_id(fun, id, 10);
+        if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "Failed adding match ID.");
                 rc = ENOMEM;
                 goto error;
@@ -156 +164 @@
         cuda->phys_base = res->base;
 
-        rc = cuda_dev_create(cuda, "kbd", &kbd);
+        rc = cuda_dev_create(cuda, "kbd", "adb/keyboard", &kbd);
         if (rc != EOK)
                 goto error;
 
-        rc = cuda_dev_create(cuda, "mouse", &mouse);
+        rc = cuda_dev_create(cuda, "mouse", "adb/mouse", &mouse);
         if (rc != EOK)
                 goto error;