Changeset b7fd2a0 in mainline for uspace/srv/hid/output

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/srv/hid/output

Files:

• ctl/serial.c (modified) (3 diffs)
• ctl/serial.h (modified) (1 diff)
• output.c (modified) (4 diffs)
• output.h (modified) (1 diff)
• port/chardev.c (modified) (4 diffs)
• port/chardev.h (modified) (1 diff)
• port/ega.c (modified) (2 diffs)
• port/ega.h (modified) (1 diff)
• port/kfb.c (modified) (5 diffs)
• port/kfb.h (modified) (1 diff)
• proto/vt100.c (modified) (1 diff)
• proto/vt100.h (modified) (1 diff)

uspace/srv/hid/output/ctl/serial.c

@@ -60 +60 @@
 }
 
-static int serial_yield(outdev_t *dev)
+static errno_t serial_yield(outdev_t *dev)
 {
         vt100_state_t *state = (vt100_state_t *) dev->data;
@@ -67 +67 @@
 }
 
-static int serial_claim(outdev_t *dev)
+static errno_t serial_claim(outdev_t *dev)
 {
         vt100_state_t *state = (vt100_state_t *) dev->data;
@@ -122 +122 @@
 };
 
-int serial_init(vt100_putchar_t putchar_fn,
+errno_t serial_init(vt100_putchar_t putchar_fn,
     vt100_control_puts_t control_puts_fn, vt100_flush_t flush_fn)
 {

uspace/srv/hid/output/ctl/serial.h

@@ -36 +36 @@
 #include "../proto/vt100.h"
 
-extern int serial_init(vt100_putchar_t, vt100_control_puts_t, vt100_flush_t);
+extern errno_t serial_init(vt100_putchar_t, vt100_control_puts_t, vt100_flush_t);
 
 #endif

uspace/srv/hid/output/output.c

@@ -80 +80 @@
 static void srv_yield(ipc_callid_t iid, ipc_call_t *icall)
 {
-        int ret = EOK;
+        errno_t ret = EOK;
         
         list_foreach(outdevs, link, outdev_t, dev) {
                 assert(dev->ops.yield);
                 
-                int rc = dev->ops.yield(dev);
+                errno_t rc = dev->ops.yield(dev);
                 if (rc != EOK)
                         ret = rc;
@@ -95 +95 @@
 static void srv_claim(ipc_callid_t iid, ipc_call_t *icall)
 {
-        int ret = EOK;
+        errno_t ret = EOK;
         
         list_foreach(outdevs, link, outdev_t, dev) {
                 assert(dev->ops.claim);
                 
-                int rc = dev->ops.claim(dev);
+                errno_t rc = dev->ops.claim(dev);
                 if (rc != EOK)
                         ret = rc;
@@ -170 +170 @@
         }
         
-        int rc = async_share_out_finalize(callid, &frontbuf->data);
+        errno_t rc = async_share_out_finalize(callid, &frontbuf->data);
         if ((rc != EOK) || (frontbuf->data == AS_MAP_FAILED)) {
                 free(frontbuf);
@@ -467 +467 @@
         /* Register server */
         async_set_fallback_port_handler(client_connection, NULL);
-        int rc = loc_server_register(NAME);
+        errno_t rc = loc_server_register(NAME);
         if (rc != EOK) {
                 printf("%s: Unable to register driver\n", NAME);

uspace/srv/hid/output/output.h

@@ -42 +42 @@
 
 typedef struct {
-        int (* yield)(struct outdev *dev);
-        int (* claim)(struct outdev *dev);
+        errno_t (* yield)(struct outdev *dev);
+        errno_t (* claim)(struct outdev *dev);
         
         void (* get_dimensions)(struct outdev *dev, sysarg_t *cols,

uspace/srv/hid/output/port/chardev.c

@@ -99 +99 @@
         service_id_t *svc;
         size_t svcs;
-        int rc;
+        errno_t rc;
 
         rc = loc_category_get_svcs(serial_cat_id, &svc, &svcs);
@@ -157 +157 @@
 static void check_for_dev(void)
 {
-        int rc;
+        errno_t rc;
         bool found;
         service_id_t sid;
@@ -205 +205 @@
 }
 
-int chardev_init(void)
+errno_t chardev_init(void)
 {
         if (!config_key_exists("console")) {
@@ -224 +224 @@
         }
 
-        int rc = loc_category_get_id("serial", &serial_cat_id, IPC_FLAG_BLOCKING);
+        errno_t rc = loc_category_get_id("serial", &serial_cat_id, IPC_FLAG_BLOCKING);
         if (rc != EOK) {
                 printf("%s: Failed to get \"serial\" category ID.\n", NAME);

uspace/srv/hid/output/port/chardev.h

@@ -33 +33 @@
 #define OUTPUT_PORT_CHARDEV_H_
 
-extern int chardev_init(void);
+extern errno_t chardev_init(void);
 
 #endif

uspace/srv/hid/output/port/ega.c

@@ -117 +117 @@
 }
 
-static int ega_yield(outdev_t *dev)
+static errno_t ega_yield(outdev_t *dev)
 {
         return EOK;
 }
 
-static int ega_claim(outdev_t *dev)
+static errno_t ega_claim(outdev_t *dev)
 {
         return EOK;
@@ -183 +183 @@
 };
 
-int ega_init(void)
+errno_t ega_init(void)
 {
         sysarg_t present;
-        int rc = sysinfo_get_value("fb", &present);
+        errno_t rc = sysinfo_get_value("fb", &present);
         if (rc != EOK)
                 present = false;

uspace/srv/hid/output/port/ega.h

@@ -33 +33 @@
 #define OUTPUT_PORT_EGA_H_
 
-extern int ega_init(void);
+extern errno_t ega_init(void);
 
 #endif

uspace/srv/hid/output/port/kfb.c

@@ -419 +419 @@
 }
 
-static int kfb_yield(fbdev_t *dev)
+static errno_t kfb_yield(fbdev_t *dev)
 {
         if (kfb.backbuf == NULL) {
@@ -435 +435 @@
 }
 
-static int kfb_claim(fbdev_t *dev)
+static errno_t kfb_claim(fbdev_t *dev)
 {
         if (kfb.backbuf == NULL)
@@ -460 +460 @@
 }
 
-static int kfb_get_resolution(fbdev_t *dev, sysarg_t *width, sysarg_t *height)
+static errno_t kfb_get_resolution(fbdev_t *dev, sysarg_t *width, sysarg_t *height)
 {
         *width = kfb.width;
@@ -474 +474 @@
 }
 
-static int kfb_vp_create(fbdev_t *dev, fbvp_t *vp)
+static errno_t kfb_vp_create(fbdev_t *dev, fbvp_t *vp)
 {
         kfb_vp_t *kfb_vp = malloc(sizeof(kfb_vp_t));
@@ -620 +620 @@
 }
 
-int kfb_init(void)
+errno_t kfb_init(void)
 {
         sysarg_t present;
-        int rc = sysinfo_get_value("fb", &present);
+        errno_t rc = sysinfo_get_value("fb", &present);
         if (rc != EOK)
                 present = false;

uspace/srv/hid/output/port/kfb.h

@@ -37 +37 @@
 #define FB_PORT_KFB_H_
 
-extern int kfb_init(void);
+extern errno_t kfb_init(void);
 
 #endif

uspace/srv/hid/output/proto/vt100.c

@@ -181 +181 @@
 }
 
-int vt100_yield(vt100_state_t *state)
+errno_t vt100_yield(vt100_state_t *state)
 {
         return EOK;
 }
 
-int vt100_claim(vt100_state_t *state)
+errno_t vt100_claim(vt100_state_t *state)
 {
         return EOK;

uspace/srv/hid/output/proto/vt100.h

@@ -56 +56 @@
 extern void vt100_state_destroy(vt100_state_t *);
 
-extern int vt100_yield(vt100_state_t *);
-extern int vt100_claim(vt100_state_t *);
+extern errno_t vt100_yield(vt100_state_t *);
+extern errno_t vt100_claim(vt100_state_t *);
 extern void vt100_get_dimensions(vt100_state_t *, sysarg_t *, sysarg_t *);