Changeset b7fd2a0 in mainline for uspace/drv/char/msim-con

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/char/msim-con

Files:

• main.c (modified) (7 diffs)
• msim-con.c (modified) (8 diffs)
• msim-con.h (modified) (1 diff)

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

@@ -43 +43 @@
 #define NAME  "msim-con"
 
-static int msim_con_dev_add(ddf_dev_t *dev);
-static int msim_con_dev_remove(ddf_dev_t *dev);
-static int msim_con_dev_gone(ddf_dev_t *dev);
-static int msim_con_fun_online(ddf_fun_t *fun);
-static int msim_con_fun_offline(ddf_fun_t *fun);
+static errno_t msim_con_dev_add(ddf_dev_t *dev);
+static errno_t msim_con_dev_remove(ddf_dev_t *dev);
+static errno_t msim_con_dev_gone(ddf_dev_t *dev);
+static errno_t msim_con_fun_online(ddf_fun_t *fun);
+static errno_t msim_con_fun_offline(ddf_fun_t *fun);
 
 static driver_ops_t driver_ops = {
@@ -62 +62 @@
 };
 
-static int msim_con_get_res(ddf_dev_t *dev, msim_con_res_t *res)
+static errno_t msim_con_get_res(ddf_dev_t *dev, msim_con_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);
@@ -97 +97 @@
 }
 
-static int msim_con_dev_add(ddf_dev_t *dev)
+static errno_t msim_con_dev_add(ddf_dev_t *dev)
 {
         msim_con_t *msim_con;
         msim_con_res_t res;
-        int rc;
+        errno_t rc;
 
         ddf_msg(LVL_DEBUG, "msim_con_dev_add(%p)", dev);
@@ -122 +122 @@
 }
 
-static int msim_con_dev_remove(ddf_dev_t *dev)
+static errno_t msim_con_dev_remove(ddf_dev_t *dev)
 {
         msim_con_t *msim_con = (msim_con_t *)ddf_dev_data_get(dev);
@@ -131 +131 @@
 }
 
-static int msim_con_dev_gone(ddf_dev_t *dev)
+static errno_t msim_con_dev_gone(ddf_dev_t *dev)
 {
         msim_con_t *msim_con = (msim_con_t *)ddf_dev_data_get(dev);
@@ -140 +140 @@
 }
 
-static int msim_con_fun_online(ddf_fun_t *fun)
+static errno_t msim_con_fun_online(ddf_fun_t *fun)
 {
         ddf_msg(LVL_DEBUG, "msim_con_fun_online()");
@@ -146 +146 @@
 }
 
-static int msim_con_fun_offline(ddf_fun_t *fun)
+static errno_t msim_con_fun_offline(ddf_fun_t *fun)
 {
         ddf_msg(LVL_DEBUG, "msim_con_fun_offline()");

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

@@ -43 +43 @@
 static void msim_con_connection(ipc_callid_t, ipc_call_t *, void *);
 
-static int msim_con_read(chardev_srv_t *, void *, size_t, size_t *);
-static int msim_con_write(chardev_srv_t *, const void *, size_t, size_t *);
+static errno_t msim_con_read(chardev_srv_t *, void *, size_t, size_t *);
+static errno_t msim_con_write(chardev_srv_t *, const void *, size_t, size_t *);
 
 static chardev_ops_t msim_con_chardev_ops = {
@@ -66 +66 @@
         msim_con_t *con = (msim_con_t *) arg;
         uint8_t c;
-        int rc;
+        errno_t rc;
 
         fibril_mutex_lock(&con->buf_lock);
@@ -80 +80 @@
 
 /** Add msim console device. */
-int msim_con_add(msim_con_t *con, msim_con_res_t *res)
+errno_t msim_con_add(msim_con_t *con, msim_con_res_t *res)
 {
         ddf_fun_t *fun = NULL;
         bool subscribed = false;
         irq_cmd_t *msim_cmds = NULL;
-        int rc;
+        errno_t rc;
 
         circ_buf_init(&con->cbuf, con->buf, msim_con_buf_size, 1);
@@ -152 +152 @@
 
 /** Remove msim console device */
-int msim_con_remove(msim_con_t *con)
+errno_t msim_con_remove(msim_con_t *con)
 {
         return ENOTSUP;
@@ -158 +158 @@
 
 /** Msim console device gone */
-int msim_con_gone(msim_con_t *con)
+errno_t msim_con_gone(msim_con_t *con)
 {
         return ENOTSUP;
@@ -169 +169 @@
 
 /** Read from msim console device */
-static int msim_con_read(chardev_srv_t *srv, void *buf, size_t size,
+static errno_t msim_con_read(chardev_srv_t *srv, void *buf, size_t size,
     size_t *nread)
 {
@@ -175 +175 @@
         size_t p;
         uint8_t *bp = (uint8_t *) buf;
-        int rc;
+        errno_t rc;
 
         fibril_mutex_lock(&con->buf_lock);
@@ -197 +197 @@
 
 /** Write to msim console device */
-static int msim_con_write(chardev_srv_t *srv, const void *data, size_t size,
+static errno_t msim_con_write(chardev_srv_t *srv, const void *data, size_t size,
     size_t *nwr)
 {

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

@@ -70 +70 @@
 } msim_con_t;
 
-extern int msim_con_add(msim_con_t *, msim_con_res_t *);
-extern int msim_con_remove(msim_con_t *);
-extern int msim_con_gone(msim_con_t *);
+extern errno_t msim_con_add(msim_con_t *, msim_con_res_t *);
+extern errno_t msim_con_remove(msim_con_t *);
+extern errno_t msim_con_gone(msim_con_t *);
 
 #endif