Changeset eadaeae8 in mainline for uspace/drv/char

Timestamp:

2018-03-21T20:58:49Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

3be9d10

Parents:

874381a

Message:

Make capability handles type-safe

Define distinct pointer types for the handles of the supported
capability types and use them instead of integer handles. This makes it
virtually impossible to pass a non-handle or a handle of different type
instead of the proper handle. Also turn cap_handle_t into an "untyped"
capability handle that can be assigned to and from the "typed" handles.

This commit also fixes a bug in msim-con driver, which wrongly used the
IRQ number instead of the IRQ capability handle to unregister the IRQ.

This commit also fixes the wrong use of the capability handle instead
of error code in libusbhost.

Location:

uspace/drv/char

Files:

• i8042/i8042.c (modified) (2 diffs)
• msim-con/msim-con.c (modified) (4 diffs)
• msim-con/msim-con.h (modified) (1 diff)
• ns8250/ns8250.c (modified) (4 diffs)
• pl050/pl050.c (modified) (1 diff)

uspace/drv/char/i8042/i8042.c

@@ -281 +281 @@
         };
 
-        int irq_kbd_cap;
+        cap_irq_handle_t kbd_ihandle;
         rc = register_interrupt_handler(ddf_dev, irq_kbd,
-            i8042_irq_handler, &irq_code, &irq_kbd_cap);
+            i8042_irq_handler, &irq_code, &kbd_ihandle);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed set handler for kbd: %s.",
@@ -290 +290 @@
         }
 
-        int irq_mouse_cap;
+        cap_irq_handle_t mouse_ihandle;
         rc = register_interrupt_handler(ddf_dev, irq_mouse,
-            i8042_irq_handler, &irq_code, &irq_mouse_cap);
+            i8042_irq_handler, &irq_code, &mouse_ihandle);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed set handler for mouse: %s.",

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

@@ -83 +83 @@
 {
         ddf_fun_t *fun = NULL;
-        bool subscribed = false;
         irq_cmd_t *msim_cmds = NULL;
         errno_t rc;
@@ -90 +89 @@
         fibril_mutex_initialize(&con->buf_lock);
         fibril_condvar_initialize(&con->buf_cv);
+
+        con->irq_handle = CAP_NIL;
 
         msim_cmds = malloc(sizeof(msim_cmds_proto));
@@ -125 +126 @@
         con->irq_code.cmds = msim_cmds;
 
-        async_irq_subscribe(res->irq, msim_irq_handler, con, &con->irq_code, NULL);
-        subscribed = true;
+        rc = async_irq_subscribe(res->irq, msim_irq_handler, con,
+            &con->irq_code, &con->irq_handle);
+        if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "Error registering IRQ code.");
+                goto error;
+        }
 
         chardev_srvs_init(&con->cds);
@@ -142 +147 @@
         return EOK;
 error:
-        if (subscribed)
-                async_irq_unsubscribe(res->irq);
+        if (CAP_HANDLE_VALID(con->irq_handle))
+                async_irq_unsubscribe(con->irq_handle);
         if (fun != NULL)
                 ddf_fun_destroy(fun);

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

@@ -68 +68 @@
         fibril_condvar_t buf_cv;
         ioport8_t *out_reg;
+        cap_irq_handle_t irq_handle;
 } msim_con_t;
 

uspace/drv/char/ns8250/ns8250.c

@@ -165 +165 @@
         int irq;
         /** IRQ capability handle */
-        int irq_cap;
+        cap_irq_handle_t irq_handle;
         /** The base i/o address of the devices registers. */
         uintptr_t io_addr;
@@ -804 +804 @@
  */
 static inline errno_t ns8250_register_interrupt_handler(ns8250_t *ns,
-    cap_handle_t *handle)
+    cap_irq_handle_t *ihandle)
 {
         return register_interrupt_handler(ns->dev, ns->irq,
-            ns8250_interrupt_handler, NULL, handle);
+            ns8250_interrupt_handler, NULL, ihandle);
 }
 
@@ -816 +816 @@
 static inline errno_t ns8250_unregister_interrupt_handler(ns8250_t *ns)
 {
-        return unregister_interrupt_handler(ns->dev, ns->irq_cap);
+        return unregister_interrupt_handler(ns->dev, ns->irq_handle);
 }
 
@@ -876 +876 @@
 
         /* Register interrupt handler. */
-        rc = ns8250_register_interrupt_handler(ns, &ns->irq_cap);
+        ns->irq_handle = CAP_NIL;
+        rc = ns8250_register_interrupt_handler(ns, &ns->irq_handle);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed to register interrupt handler.");

uspace/drv/char/pl050/pl050.c

@@ -213 +213 @@
         pl050->regs = regs;
 
-        int irq_cap;
+        cap_irq_handle_t ihandle;
         rc = register_interrupt_handler(pl050->dev,
-            res.irqs.irqs[0], pl050_interrupt, &pl050_irq_code, &irq_cap);
+            res.irqs.irqs[0], pl050_interrupt, &pl050_irq_code, &ihandle);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed registering interrupt handler. (%s)",