media: coda: add menu strings to s_ctrl debug output
authorPhilipp Zabel <p.zabel@pengutronix.de>
Fri, 12 Apr 2019 15:51:28 +0000 (11:51 -0400)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Tue, 21 May 2019 11:23:51 +0000 (07:23 -0400)
When a menu control is updated via s_ctrl, print the corresponding menu
entry string in addition to the numerical value it is set to.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
drivers/media/platform/coda/coda-common.c

index 15d49de6becb231b0650cf9473108491a414947a..171a3db72b30c04fdeaf908a6e72e7f99b0c181b 100644 (file)
@@ -1857,11 +1857,16 @@ static const struct vb2_ops coda_qops = {
 
 static int coda_s_ctrl(struct v4l2_ctrl *ctrl)
 {
+       const char * const *val_names = v4l2_ctrl_get_menu(ctrl->id);
        struct coda_ctx *ctx =
                        container_of(ctrl->handler, struct coda_ctx, ctrls);
 
-       coda_dbg(2, ctx, "s_ctrl: id = 0x%x, name = \"%s\", val = %d\n",
-                ctrl->id, ctrl->name, ctrl->val);
+       if (val_names)
+               coda_dbg(2, ctx, "s_ctrl: id = 0x%x, name = \"%s\", val = %d (\"%s\")\n",
+                        ctrl->id, ctrl->name, ctrl->val, val_names[ctrl->val]);
+       else
+               coda_dbg(2, ctx, "s_ctrl: id = 0x%x, name = \"%s\", val = %d\n",
+                        ctrl->id, ctrl->name, ctrl->val);
 
        switch (ctrl->id) {
        case V4L2_CID_HFLIP: