Changeset 5a6cc679 in mainline for uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.c

Timestamp:

2018-01-31T02:21:24Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

a0a9cc2

Parents:

132ab5d1

Message:

Merge commit '50f19b7ee8e94570b5c63896736c4eb49cfa18db' into forwardport

Not all ints are converted to errno_t in xhci tree yet, however it compiles and works

File:

• uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.c (modified) (7 diffs)

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)