Changeset b7fd2a0 in mainline for uspace/drv/intctl/obio

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/obio

Files:

• main.c (modified) (7 diffs)
• obio.c (modified) (3 diffs)
• obio.h (modified) (1 diff)

uspace/drv/intctl/obio/main.c

@@ -43 +43 @@
 #define NAME  "obio"
 
-static int obio_dev_add(ddf_dev_t *dev);
-static int obio_dev_remove(ddf_dev_t *dev);
-static int obio_dev_gone(ddf_dev_t *dev);
-static int obio_fun_online(ddf_fun_t *fun);
-static int obio_fun_offline(ddf_fun_t *fun);
+static errno_t obio_dev_add(ddf_dev_t *dev);
+static errno_t obio_dev_remove(ddf_dev_t *dev);
+static errno_t obio_dev_gone(ddf_dev_t *dev);
+static errno_t obio_fun_online(ddf_fun_t *fun);
+static errno_t obio_fun_offline(ddf_fun_t *fun);
 
 static driver_ops_t driver_ops = {
@@ -62 +62 @@
 };
 
-static int obio_get_res(ddf_dev_t *dev, obio_res_t *res)
+static errno_t obio_get_res(ddf_dev_t *dev, obio_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 obio_dev_add(ddf_dev_t *dev)
+static errno_t obio_dev_add(ddf_dev_t *dev)
 {
         obio_t *obio;
         obio_res_t obio_res;
-        int rc;
+        errno_t rc;
 
         ddf_msg(LVL_DEBUG, "obio_dev_add(%p)", dev);
@@ -114 +114 @@
 }
 
-static int obio_dev_remove(ddf_dev_t *dev)
+static errno_t obio_dev_remove(ddf_dev_t *dev)
 {
         obio_t *obio = (obio_t *)ddf_dev_data_get(dev);
@@ -123 +123 @@
 }
 
-static int obio_dev_gone(ddf_dev_t *dev)
+static errno_t obio_dev_gone(ddf_dev_t *dev)
 {
         obio_t *obio = (obio_t *)ddf_dev_data_get(dev);
@@ -132 +132 @@
 }
 
-static int obio_fun_online(ddf_fun_t *fun)
+static errno_t obio_fun_online(ddf_fun_t *fun)
 {
         ddf_msg(LVL_DEBUG, "obio_fun_online()");
@@ -138 +138 @@
 }
 
-static int obio_fun_offline(ddf_fun_t *fun)
+static errno_t obio_fun_offline(ddf_fun_t *fun)
 {
         ddf_msg(LVL_DEBUG, "obio_fun_offline()");

uspace/drv/intctl/obio/obio.c

@@ -114 +114 @@
 
 /** Add OBIO device. */
-int obio_add(obio_t *obio, obio_res_t *res)
+errno_t obio_add(obio_t *obio, obio_res_t *res)
 {
         ddf_fun_t *fun_a = NULL;
-        int rc;
+        errno_t rc;
 
         rc = pio_enable((void *)res->base, OBIO_SIZE, (void **) &obio->regs);
@@ -155 +155 @@
 
 /** Remove OBIO device */
-int obio_remove(obio_t *obio)
+errno_t obio_remove(obio_t *obio)
 {
         return ENOTSUP;
@@ -161 +161 @@
 
 /** OBIO device gone */
-int obio_gone(obio_t *obio)
+errno_t obio_gone(obio_t *obio)
 {
         return ENOTSUP;

uspace/drv/intctl/obio/obio.h

@@ -52 +52 @@
 } obio_t;
 
-extern int obio_add(obio_t *, obio_res_t *);
-extern int obio_remove(obio_t *);
-extern int obio_gone(obio_t *);
+extern errno_t obio_add(obio_t *, obio_res_t *);
+extern errno_t obio_remove(obio_t *);
+extern errno_t obio_gone(obio_t *);
 
 #endif