Add a prefix to the messages printed to the console via
printf() and fprintf() so that one can easily see where
the message comes from.
Signed-off-by: Tobias Jakobi <tjak...@math.uni-bielefeld.de>
---
exynos/exynos_fimg2d.c | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/exynos/exynos_fimg2d.c b/exynos/exynos_fimg2d.c
index ad44998..91df441 100644
--- a/exynos/exynos_fimg2d.c
+++ b/exynos/exynos_fimg2d.c
@@ -42,6 +42,8 @@
#define MIN(a, b) ((a) < (b) ? (a) : (b))
+#define MSG_PREFIX "exynos/fimg2d: "
+
enum g2d_base_addr_reg {
g2d_dst = 0,
g2d_src
@@ -246,7 +248,7 @@ static int g2d_flush(struct g2d_context *ctx)
return 0;
if (ctx->cmdlist_nr >= G2D_MAX_CMD_LIST_NR) {
- fprintf(stderr, "Overflow cmdlist.\n");
+ fprintf(stderr, MSG_PREFIX "command list overflow.\n");
return -EINVAL;
}
@@ -262,7 +264,7 @@ static int g2d_flush(struct g2d_context *ctx)
ret = drmIoctl(ctx->fd, DRM_IOCTL_EXYNOS_G2D_SET_CMDLIST, &cmdlist);
if (ret < 0) {
- fprintf(stderr, "failed to set cmdlist.\n");
+ fprintf(stderr, MSG_PREFIX "failed to set cmdlist.\n");
return ret;
}
@@ -284,7 +286,7 @@ struct g2d_context *g2d_init(int fd)
ctx = calloc(1, sizeof(*ctx));
if (!ctx) {
- fprintf(stderr, "failed to allocate context.\n");
+ fprintf(stderr, MSG_PREFIX "failed to allocate context.\n");
return NULL;
}
@@ -292,7 +294,7 @@ struct g2d_context *g2d_init(int fd)
ret = drmIoctl(fd, DRM_IOCTL_EXYNOS_G2D_GET_VER, &ver);
if (ret < 0) {
- fprintf(stderr, "failed to get version.\n");
+ fprintf(stderr, MSG_PREFIX "failed to get version.\n");
free(ctx);
return NULL;
}
@@ -300,7 +302,7 @@ struct g2d_context *g2d_init(int fd)
ctx->major = ver.major;
ctx->minor = ver.minor;
- printf("g2d version(%d.%d).\n", ctx->major, ctx->minor);
+ printf(MSG_PREFIX "G2D version (%d.%d).\n", ctx->major, ctx->minor);
return ctx;
}
@@ -326,7 +328,7 @@ int g2d_exec(struct g2d_context *ctx)
ret = drmIoctl(ctx->fd, DRM_IOCTL_EXYNOS_G2D_EXEC, &exec);
if (ret < 0) {
- fprintf(stderr, "failed to execute.\n");
+ fprintf(stderr, MSG_PREFIX "failed to execute.\n");
return ret;
}
@@ -427,7 +429,7 @@ g2d_copy(struct g2d_context *ctx, struct g2d_image *src,
h = MIN(src_h, dst_h);
if (w <= 0 || h <= 0) {
- fprintf(stderr, "invalid width or height.\n");
+ fprintf(stderr, MSG_PREFIX "invalid width or height.\n");
return -EINVAL;
}
@@ -523,7 +525,7 @@ g2d_copy_with_scale(struct g2d_context *ctx, struct
g2d_image *src,
dst_h = dst->height - dst_y;
if (src_w <= 0 || src_h <= 0 || dst_w <= 0 || dst_h <= 0) {
- fprintf(stderr, "invalid width or height.\n");
+ fprintf(stderr, MSG_PREFIX "invalid width or height.\n");
return -EINVAL;
}
@@ -624,17 +626,17 @@ g2d_blend(struct g2d_context *ctx, struct g2d_image *src,
h = MIN(src_h, dst_h);
if (w <= 0 || h <= 0) {
- fprintf(stderr, "invalid width or height.\n");
+ fprintf(stderr, MSG_PREFIX "invalid width or height.\n");
return -EINVAL;
}
if (g2d_validate_select_mode(src->select_mode)) {
- fprintf(stderr , "invalid select mode for source.\n");
+ fprintf(stderr , MSG_PREFIX "invalid select mode for
source.\n");
return -EINVAL;
}
if (g2d_validate_blending_op(op)) {
- fprintf(stderr , "unsupported blending operation.\n");
+ fprintf(stderr , MSG_PREFIX "unsupported blending
operation.\n");
return -EINVAL;
}
@@ -743,17 +745,17 @@ g2d_scale_and_blend(struct g2d_context *ctx, struct
g2d_image *src,
dst_h = dst->height - dst_y;
if (src_w <= 0 || src_h <= 0 || dst_w <= 0 || dst_h <= 0) {
- fprintf(stderr, "invalid width or height.\n");
+ fprintf(stderr, MSG_PREFIX "invalid width or height.\n");
return -EINVAL;
}
if (g2d_validate_select_mode(src->select_mode)) {
- fprintf(stderr , "invalid select mode for source.\n");
+ fprintf(stderr , MSG_PREFIX "invalid select mode for
source.\n");
return -EINVAL;
}
if (g2d_validate_blending_op(op)) {
- fprintf(stderr , "unsupported blending operation.\n");
+ fprintf(stderr , MSG_PREFIX "unsupported blending
operation.\n");
return -EINVAL;
}
--
2.0.5
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
