Changeset b7fd2a0 in mainline for uspace/drv/intctl/icp-ic

Timestamp:

2018-01-13T03:10:29Z (8 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

a53ed3a

Parents:

36f0738

Message:

Use errno_t in all uspace and kernel code.

Change type of every variable, parameter and return value that holds an
<errno.h> constant to either errno_t (the usual case), or sys_errno_t
(some places in kernel). This is for the purpose of self-documentation,
as well as for type-checking with a bit of type definition hackery.

Although this is a massive commit, it is a simple text replacement, and thus
is very easy to verify. Simply do the following:

`
git checkout <this commit's hash>
git reset HEAD
<sup>git add .
tools/srepl '\berrno_t\b' int
git add .
tools/srepl '\bsys_errno_t\b' sysarg_t
git reset
git diff
`</sup>

While this doesn't ensure that the replacements are correct, it does ensure
that the commit doesn't do anything except those replacements. Since errno_t
is typedef'd to int in the usual case (and sys_errno_t to sysarg_t), even if
incorrect, this commit cannot change behavior.

Location:

uspace/drv/intctl/icp-ic

Files:

• icp-ic.c (modified) (4 diffs)
• icp-ic.h (modified) (1 diff)
• main.c (modified) (7 diffs)

uspace/drv/intctl/icp-ic/icp-ic.c

@@ -52 +52 @@
 };
 
-static int icpic_enable_irq(icpic_t *icpic, sysarg_t irq)
+static errno_t icpic_enable_irq(icpic_t *icpic, sysarg_t irq)
 {
         if (irq > icpic_max_irq)
@@ -112 +112 @@
 
 /** Add icp-ic device. */
-int icpic_add(icpic_t *icpic, icpic_res_t *res)
+errno_t icpic_add(icpic_t *icpic, icpic_res_t *res)
 {
         ddf_fun_t *fun_a = NULL;
         void *regs;
-        int rc;
+        errno_t rc;
 
         rc = pio_enable((void *)res->base, sizeof(icpic_regs_t), &regs);
@@ -153 +153 @@
 
 /** Remove icp-ic device */
-int icpic_remove(icpic_t *icpic)
+errno_t icpic_remove(icpic_t *icpic)
 {
         return ENOTSUP;
@@ -159 +159 @@
 
 /** icp-ic device gone */
-int icpic_gone(icpic_t *icpic)
+errno_t icpic_gone(icpic_t *icpic)
 {
         return ENOTSUP;

uspace/drv/intctl/icp-ic/icp-ic.h

@@ -53 +53 @@
 } icpic_t;
 
-extern int icpic_add(icpic_t *, icpic_res_t *);
-extern int icpic_remove(icpic_t *);
-extern int icpic_gone(icpic_t *);
+extern errno_t icpic_add(icpic_t *, icpic_res_t *);
+extern errno_t icpic_remove(icpic_t *);
+extern errno_t icpic_gone(icpic_t *);
 
 #endif

uspace/drv/intctl/icp-ic/main.c

@@ -43 +43 @@
 #define NAME  "icp-ic"
 
-static int icpic_dev_add(ddf_dev_t *dev);
-static int icpic_dev_remove(ddf_dev_t *dev);
-static int icpic_dev_gone(ddf_dev_t *dev);
-static int icpic_fun_online(ddf_fun_t *fun);
-static int icpic_fun_offline(ddf_fun_t *fun);
+static errno_t icpic_dev_add(ddf_dev_t *dev);
+static errno_t icpic_dev_remove(ddf_dev_t *dev);
+static errno_t icpic_dev_gone(ddf_dev_t *dev);
+static errno_t icpic_fun_online(ddf_fun_t *fun);
+static errno_t icpic_fun_offline(ddf_fun_t *fun);
 
 static driver_ops_t driver_ops = {
@@ -62 +62 @@
 };
 
-static int icpic_get_res(ddf_dev_t *dev, icpic_res_t *res)
+static errno_t icpic_get_res(ddf_dev_t *dev, icpic_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);
@@ -90 +90 @@
 }
 
-static int icpic_dev_add(ddf_dev_t *dev)
+static errno_t icpic_dev_add(ddf_dev_t *dev)
 {
         icpic_t *icpic;
         icpic_res_t icpic_res;
-        int rc;
+        errno_t rc;
 
         ddf_msg(LVL_DEBUG, "icpic_dev_add(%p)", dev);
@@ -114 +114 @@
 }
 
-static int icpic_dev_remove(ddf_dev_t *dev)
+static errno_t icpic_dev_remove(ddf_dev_t *dev)
 {
         icpic_t *icpic = (icpic_t *)ddf_dev_data_get(dev);
@@ -123 +123 @@
 }
 
-static int icpic_dev_gone(ddf_dev_t *dev)
+static errno_t icpic_dev_gone(ddf_dev_t *dev)
 {
         icpic_t *icpic = (icpic_t *)ddf_dev_data_get(dev);
@@ -132 +132 @@
 }
 
-static int icpic_fun_online(ddf_fun_t *fun)
+static errno_t icpic_fun_online(ddf_fun_t *fun)
 {
         ddf_msg(LVL_DEBUG, "icpic_fun_online()");
@@ -138 +138 @@
 }
 
-static int icpic_fun_offline(ddf_fun_t *fun)
+static errno_t icpic_fun_offline(ddf_fun_t *fun)
 {
         ddf_msg(LVL_DEBUG, "icpic_fun_offline()");