Hi Sakari,

Thanks for the patch.

On Wednesday 28 December 2011 10:47:01 Sakari Ailus wrote:
> Signed-off-by: Sakari Ailus <sakari.ai...@iki.fi>
> ---
>  yavta.c |   12 +++++++++---
>  1 files changed, 9 insertions(+), 3 deletions(-)
> 
> diff --git a/yavta.c b/yavta.c
> index c0e9acb..9b8a80e 100644
> --- a/yavta.c
> +++ b/yavta.c
> @@ -551,6 +551,7 @@ static int video_enable(struct device *dev, int enable)
>  }
> 
>  static void video_query_menu(struct device *dev, unsigned int id,
> +                          unsigned int type,
>                            unsigned int min, unsigned int max)
>  {
>       struct v4l2_querymenu menu;
> @@ -562,7 +563,10 @@ static void video_query_menu(struct device *dev,
> unsigned int id, if (ret < 0)
>                       continue;
> 
> -             printf("  %u: %.32s\n", menu.index, menu.name);
> +             if (type == V4L2_CTRL_TYPE_MENU)
> +                     printf("  %u: %.32s\n", menu.index, menu.name);
> +             else
> +                     printf("  %u: %lld\n", menu.index, menu.value);
>       };
>  }
> 
> @@ -607,8 +611,10 @@ static void video_list_controls(struct device *dev)
>                       query.id, query.name, query.minimum, query.maximum,
>                       query.step, query.default_value, value);
> 
> -             if (query.type == V4L2_CTRL_TYPE_MENU)
> -                     video_query_menu(dev, query.id, query.minimum, 
> query.maximum);
> +             if (query.type == V4L2_CTRL_TYPE_MENU ||
> +                 query.type == V4L2_CTRL_TYPE_INTEGER_MENU)
> +                     video_query_menu(dev, query.id, query.type,
> +                                      query.minimum, query.maximum);

What about passing &query to the function instead ?

> 
>               nctrls++;
>       }

-- 
Regards,

Laurent Pinchart
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to