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

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

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

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

@@ -46 +46 @@
 #include <stdbool.h>
 #include <stddef.h>
-#include <sysinfo.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -58 +57 @@
 static void cuda_dev_connection(ipc_callid_t, ipc_call_t *, void *);
 static int cuda_init(cuda_t *);
-static void cuda_irq_handler(ipc_callid_t, ipc_call_t *, void *);
+static void cuda_irq_handler(ipc_call_t *, void *);
 
 static void cuda_irq_listen(cuda_t *);
@@ -109 +108 @@
 };
 
-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 +115 @@
         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 +163 @@
         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;
@@ -245 +252 @@
         cuda_irq_code.cmds[0].addr = (void *) &((cuda_regs_t *)
             cuda->phys_base)->ifr;
-        async_irq_subscribe(10, cuda_irq_handler, cuda, &cuda_irq_code);
+        async_irq_subscribe(10, cuda_irq_handler, cuda, &cuda_irq_code, NULL);
 
         /* Enable SR interrupt. */
@@ -257 +264 @@
 }
 
-static void cuda_irq_handler(ipc_callid_t iid, ipc_call_t *call, void *arg)
+static void cuda_irq_handler(ipc_call_t *call, void *arg)
 {
         uint8_t rbuf[CUDA_RCV_BUF_SIZE];