Changeset 92232331 in mainline

Timestamp:

2017-11-16T10:19:02Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9280dd0

Parents:

19d2ce01

git-author:

Jiri Svoboda <jiri@…> (2017-11-15 22:17:43)

git-committer:

Jiri Svoboda <jiri@…> (2017-11-16 10:19:02)

Message:

MSIM console driver should avoid storing per-instance data in global variables.

Location:

uspace/drv/char/msim-con

Files:

• msim-con.c (modified) (5 diffs)
• msim-con.h (modified) (1 diff)

uspace/drv/char/msim-con/msim-con.c

@@ -43 +43 @@
 static void msim_con_connection(ipc_callid_t, ipc_call_t *, void *);
 
-static irq_pio_range_t msim_ranges[] = {
-        {
-                .base = 0,
-                .size = 1
-        }
-};
-
-static irq_cmd_t msim_cmds[] = {
+static irq_cmd_t msim_cmds_proto[] = {
         {
                 .cmd = CMD_PIO_READ_8,
@@ -59 +52 @@
                 .cmd = CMD_ACCEPT
         }
-};
-
-static irq_code_t msim_kbd = {
-        sizeof(msim_ranges) / sizeof(irq_pio_range_t),
-        msim_ranges,
-        sizeof(msim_cmds) / sizeof(irq_cmd_t),
-        msim_cmds
 };
 
@@ -87 +73 @@
         ddf_fun_t *fun = NULL;
         bool subscribed = false;
+        irq_cmd_t *msim_cmds = NULL;
         int rc;
+
+        msim_cmds = malloc(sizeof(msim_cmds_proto));
+        if (msim_cmds == NULL) {
+                rc = ENOMEM;
+                goto error;
+        }
 
         con->res = *res;
@@ -100 +93 @@
         ddf_fun_set_conn_handler(fun, msim_con_connection);
 
-        msim_ranges[0].base = res->base;
+        con->irq_range[0].base = res->base;
+        con->irq_range[0].size = 1;
+
+        memcpy(msim_cmds, msim_cmds_proto, sizeof(msim_cmds_proto));
         msim_cmds[0].addr = (void *) res->base;
-        async_irq_subscribe(res->irq, msim_irq_handler, con, &msim_kbd);
+
+        con->irq_code.rangecount = 1;
+        con->irq_code.ranges = con->irq_range;
+        con->irq_code.cmdcount = sizeof(msim_cmds_proto) / sizeof(irq_cmd_t);
+        con->irq_code.cmds = msim_cmds;
+
+        async_irq_subscribe(res->irq, msim_irq_handler, con, &con->irq_code);
         subscribed = true;
 
@@ -117 +119 @@
         if (fun != NULL)
                 ddf_fun_destroy(fun);
+        free(msim_cmds);
 
         return rc;

uspace/drv/char/msim-con/msim-con.h

@@ -52 +52 @@
         ddf_dev_t *dev;
         msim_con_res_t res;
+        irq_pio_range_t irq_range[1];
+        irq_code_t irq_code;
 } msim_con_t;