Changeset b7fd2a0 in mainline for uspace/drv/fb

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

Files:

• amdm37x_dispc/amdm37x_dispc.c (modified) (7 diffs)
• amdm37x_dispc/amdm37x_dispc.h (modified) (1 diff)
• amdm37x_dispc/main.c (modified) (2 diffs)
• kfb/kfb.c (modified) (1 diff)
• kfb/port.c (modified) (7 diffs)
• kfb/port.h (modified) (1 diff)

uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.c

@@ -56 +56 @@
 
 
-static int change_mode(visualizer_t *vis, vslmode_t mode);
-static int handle_damage(visualizer_t *vs,
+static errno_t change_mode(visualizer_t *vis, vslmode_t mode);
+static errno_t handle_damage(visualizer_t *vs,
     sysarg_t x0, sysarg_t y0, sysarg_t width, sysarg_t height,
     sysarg_t x_offset, sysarg_t y_offset);
-static int dummy(visualizer_t *vs)
+static errno_t dummy(visualizer_t *vs)
 {
         return EOK;
@@ -115 +115 @@
 }
 
-int amdm37x_dispc_init(amdm37x_dispc_t *instance, visualizer_t *vis)
+errno_t amdm37x_dispc_init(amdm37x_dispc_t *instance, visualizer_t *vis)
 {
         assert(instance);
@@ -134 +134 @@
         }
 
-        int ret = pio_enable((void*)AMDM37x_DISPC_BASE_ADDRESS,
+        errno_t ret = pio_enable((void*)AMDM37x_DISPC_BASE_ADDRESS,
             AMDM37x_DISPC_SIZE, (void**)&instance->regs);
         if (ret != EOK) {
@@ -152 +152 @@
 };
 
-int amdm37x_dispc_fini(amdm37x_dispc_t *instance)
+errno_t amdm37x_dispc_fini(amdm37x_dispc_t *instance)
 {
         return EOK;
 };
 
-static int amdm37x_dispc_setup_fb(amdm37x_dispc_regs_t *regs,
+static errno_t amdm37x_dispc_setup_fb(amdm37x_dispc_regs_t *regs,
     unsigned x, unsigned y, unsigned bpp, uint32_t pa)
 {
@@ -260 +260 @@
 }
 
-static int change_mode(visualizer_t *vis, vslmode_t mode)
+static errno_t change_mode(visualizer_t *vis, vslmode_t mode)
 {
         assert(vis);
@@ -276 +276 @@
         uintptr_t pa;
         void *buffer = AS_AREA_ANY;
-        int ret = dmamem_map_anonymous(size, DMAMEM_4GiB,
+        errno_t ret = dmamem_map_anonymous(size, DMAMEM_4GiB,
             AS_AREA_READ | AS_AREA_WRITE, 0, &pa, &buffer);
         if (ret != EOK) {
@@ -299 +299 @@
 }
 
-static int handle_damage(visualizer_t *vs,
+static errno_t handle_damage(visualizer_t *vs,
     sysarg_t x0, sysarg_t y0, sysarg_t width, sysarg_t height,
     sysarg_t x_offset, sysarg_t y_offset)

uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.h

@@ -62 +62 @@
 } amdm37x_dispc_t;
 
-int amdm37x_dispc_init(amdm37x_dispc_t *instance, visualizer_t *vis);
-int amdm37x_dispc_fini(amdm37x_dispc_t *instance);
+errno_t amdm37x_dispc_init(amdm37x_dispc_t *instance, visualizer_t *vis);
+errno_t amdm37x_dispc_fini(amdm37x_dispc_t *instance);
 
 #endif

uspace/drv/fb/amdm37x_dispc/main.c

@@ -54 +54 @@
 }
 
-static int amdm37x_dispc_dev_add(ddf_dev_t *dev)
+static errno_t amdm37x_dispc_dev_add(ddf_dev_t *dev)
 {
         assert(dev);
@@ -84 +84 @@
         }
 
-        int ret = amdm37x_dispc_init(dispc, vis);
+        errno_t ret = amdm37x_dispc_init(dispc, vis);
         if (ret != EOK) {
                 ddf_log_error("Failed to init dispc: %s\n", str_error(ret));

uspace/drv/fb/kfb/kfb.c

@@ -40 +40 @@
 #include "kfb.h"
 
-static int kgraph_dev_add(ddf_dev_t *dev)
+static errno_t kgraph_dev_add(ddf_dev_t *dev)
 {
         port_init(dev);

uspace/drv/fb/kfb/port.c

@@ -86 +86 @@
 static vslmode_list_element_t pixel_mode;
 
-static int kfb_claim(visualizer_t *vs)
+static errno_t kfb_claim(visualizer_t *vs)
 {
         return physmem_map(kfb.paddr + kfb.offset,
@@ -93 +93 @@
 }
 
-static int kfb_yield(visualizer_t *vs)
-{
-        int rc;
+static errno_t kfb_yield(visualizer_t *vs)
+{
+        errno_t rc;
 
         if (vs->mode_set) {
@@ -109 +109 @@
 }
 
-static int kfb_handle_damage_pixels(visualizer_t *vs,
+static errno_t kfb_handle_damage_pixels(visualizer_t *vs,
     sysarg_t x0, sysarg_t y0, sysarg_t width, sysarg_t height,
     sysarg_t x_offset, sysarg_t y_offset)
@@ -137 +137 @@
 }
 
-static int kfb_change_mode(visualizer_t *vs, vslmode_t new_mode)
+static errno_t kfb_change_mode(visualizer_t *vs, vslmode_t new_mode)
 {
         vs->ops.handle_damage = kfb_handle_damage_pixels;
@@ -143 +143 @@
 }
 
-static int kfb_suspend(visualizer_t *vs)
-{
-        return EOK;
-}
-
-static int kfb_wakeup(visualizer_t *vs)
+static errno_t kfb_suspend(visualizer_t *vs)
+{
+        return EOK;
+}
+
+static errno_t kfb_wakeup(visualizer_t *vs)
 {
         return EOK;
@@ -165 +165 @@
 {
         visualizer_t *vsl;
-        int rc;
+        errno_t rc;
 
         vsl = (visualizer_t *) ddf_fun_data_get((ddf_fun_t *)arg);
@@ -177 +177 @@
 }
 
-int port_init(ddf_dev_t *dev)
+errno_t port_init(ddf_dev_t *dev)
 {
         sysarg_t present;
-        int rc = sysinfo_get_value("fb", &present);
+        errno_t rc = sysinfo_get_value("fb", &present);
         if (rc != EOK)
                 present = false;

uspace/drv/fb/kfb/port.h

@@ -39 +39 @@
 #include <ddf/driver.h>
 
-extern int port_init(ddf_dev_t *);
+extern errno_t port_init(ddf_dev_t *);
 
 #endif