From nobody Fri Dec 19 17:36:17 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 981EBC3DA7D for ; Tue, 3 Jan 2023 14:37:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237972AbjACOhw (ORCPT ); Tue, 3 Jan 2023 09:37:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48628 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237945AbjACOgw (ORCPT ); Tue, 3 Jan 2023 09:36:52 -0500 Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B1BE0DF5D for ; Tue, 3 Jan 2023 06:36:50 -0800 (PST) Received: by mail-ed1-x534.google.com with SMTP id j16so11494825edw.11 for ; Tue, 03 Jan 2023 06:36:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=sPT1vsmDpYTaSok4BQktrcsW23gdSBjX1RKoXWH8/0M=; b=oJ9gTHBtVg7979odsYIZ0VWvQFcLgw8XR2HtRPCW+O5N/t9iQ2u8N4WJMtcGbRhDRz D/VIC6mqntGUrqiVnj+hEDz+Q/T0/QSg7O0atE8iFl50U7TZ0RyR1Obx90P8Z8gaaN2i qOzmDUlzq+eJ+q1cLo4iyeovLPSG7i7jYYn3c= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sPT1vsmDpYTaSok4BQktrcsW23gdSBjX1RKoXWH8/0M=; b=mAShYxBlOCKcomPYDQoueGf7J/A6FOFy8DkB6lWvEifv66FLT+3H6tWDkETRqvWKFg 1fnkwAIpf4WNSqhnsQwh258/IGTGGIv1KkpN/5cgRXe6X7Tw/rcd7jEM6+FIxaNVHUwV Sf9SBSfopEF80ww2AxONcVMi59w+F7pKNawpQeRiONyYnuDfD2fu7zHjwyrzwvPmEsP/ U5F33lAijTuxBRKMgsEqN5BAcIOH1ifkVweu4LdEyOjsFCeDZ5rUk43Hgfi3lL1U38JB k7JebVnPc+KmoAjNm87c9iQkq0HYRWz5nnJrhWSBuS6C3PBJCPNV+/JuvKhIVmd6a/ov EQbg== X-Gm-Message-State: AFqh2kpYbXnm2hejT9hfxnhyRFdq1oOsvulRwrbRqzF/nHIvX1fq2zC4 PAKt3yWvNW41e4XHbiNrclyy6g== X-Google-Smtp-Source: AMrXdXtTdwXyMgkFUJhvTUdoDkY0MJ12WcTC2Y+YFZb/CLUVel3X5u5Mscd307lZz9/tCb4DL5wK+w== X-Received: by 2002:aa7:c948:0:b0:48e:9afd:de66 with SMTP id h8-20020aa7c948000000b0048e9afdde66mr4372196edt.34.1672756610272; Tue, 03 Jan 2023 06:36:50 -0800 (PST) Received: from alco.roam.corp.google.com ([2620:0:1059:10:9789:8e2b:74ac:a9a0]) by smtp.gmail.com with ESMTPSA id p14-20020a05640243ce00b0048ebf8a5736sm877245edc.21.2023.01.03.06.36.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Jan 2023 06:36:49 -0800 (PST) From: Ricardo Ribalda Date: Tue, 03 Jan 2023 15:36:26 +0100 Subject: [PATCH v3 8/8] media: uvcvideo: Use standard names for menus MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20220920-resend-v4l2-compliance-v3-8-598d33a15815@chromium.org> References: <20220920-resend-v4l2-compliance-v3-0-598d33a15815@chromium.org> In-Reply-To: <20220920-resend-v4l2-compliance-v3-0-598d33a15815@chromium.org> To: Mauro Carvalho Chehab , Laurent Pinchart Cc: Hans Verkuil , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Ricardo Ribalda , Hans Verkuil , Hans Verkuil X-Mailer: b4 0.11.0-dev-696ae X-Developer-Signature: v=1; a=openpgp-sha256; l=14698; i=ribalda@chromium.org; h=from:subject:message-id; bh=wh1JJVQQr5H40YobLYSjous0EuZS24y5dLYMjTH4kYE=; b=owEBbQKS/ZANAwAKAdE30T7POsSIAcsmYgBjtD13VmFJBfH2E8Y0XPa0RY4TURQZGrC9Xur4qsHX MXxh+7eJAjMEAAEKAB0WIQREDzjr+/4oCDLSsx7RN9E+zzrEiAUCY7Q9dwAKCRDRN9E+zzrEiIhFD/ 9V8/clBABXViIniLLFOp2sb5J7sIa52e/cjVR60QI4kuF7/5/OrT8CiX75dbIgPN3oWU3q3eE6zoQC Ayn+8cFXIv8S6p5AMbwEdXMC0BZFYVak8Oh2gdrsQwQNXPPGdgOnevuDv2iBvGAHZOQHQhMEWkEWrc X9G0gHyPFx1mUmvD1pHbp3tmKWvSD1YH5hsG8qH3lISSdgVV6gdh2GiHWVmMogeOhw2U0X4J5+5tDB yEngpZnYw6jfEU1P3AMsA6CqiW4/TgWPcwdbxSfP6aR/0iqQJ+XLasuHAVllBnyMieSJMBUt81w0lD 3qBodKJKM/J0+16T5Jyp8+52quv221TD7aNYdRUqMMbf/yKUOfBVN7Vlw3BWxGbguKJ+loazRpYl4+ JIJv4uC08wAOjtq+w9ImbZ0ZUoTQuk61XzBf7IAHD5NAhXcxvV73bZeq55gccXwADNxNhnEWIlbLUV 8/dLJAc1XJNFtEgBiF3rn9Q5LhoQmQ2JOa6YijZ3S/r3aurUbUXVHRorcwltp5xTpbZEaQK2XBredm 5RLsCUdyV9E5h+8/2SqcJK8YjuQ7UoErCuxNC38YDmFLbPSp8QpYRSkQ2z6vvTDVbVKNvU6SLYN5ue 8UV/AicCbK5FECv+pNVRQ9HgH3p4kk+9e9XCDvLjHcX+ROQ7l6zkxI4Nv7pw== X-Developer-Key: i=ribalda@chromium.org; a=openpgp; fpr=9EC3BB66E2FC129A6F90B39556A0D81F9F782DA9 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Instead of duplicating the menu info, use the one from the core. Also, do not use extra memory for 1:1 mappings. Signed-off-by: Ricardo Ribalda Suggested-by: Laurent Pinchart --- drivers/media/usb/uvc/uvc_ctrl.c | 126 +++++++++++++++++++++++++--------= ---- drivers/media/usb/uvc/uvc_driver.c | 9 +-- drivers/media/usb/uvc/uvc_v4l2.c | 104 ++++++++++++++++++++++-------- drivers/media/usb/uvc/uvcvideo.h | 3 +- include/uapi/linux/uvcvideo.h | 4 +- 5 files changed, 170 insertions(+), 76 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_c= trl.c index 4830120e6506..86d74c9740b0 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -364,19 +364,31 @@ static const u32 uvc_control_classes[] =3D { V4L2_CID_USER_CLASS, }; =20 -static const struct uvc_menu_info power_line_frequency_controls[] =3D { - { 0, "Disabled" }, - { 1, "50 Hz" }, - { 2, "60 Hz" }, - { 3, "Auto" }, -}; +static const int exposure_auto_mapping[] =3D { 2, 1, 4, 8 }; =20 -static const struct uvc_menu_info exposure_auto_controls[] =3D { - { 2, "Auto Mode" }, - { 1, "Manual Mode" }, - { 4, "Shutter Priority Mode" }, - { 8, "Aperture Priority Mode" }, -}; +static int uvc_mapping_get_menu_value(const struct uvc_control_mapping *ma= pping, + u32 idx) +{ + if (!test_bit(idx, &mapping->menu_mask)) + return -EINVAL; + + if (mapping->menu_mapping) + return mapping->menu_mapping[idx]; + + return idx; +} + +static const char * +uvc_mapping_get_menu_name(const struct uvc_control_mapping *mapping, u32 i= dx) +{ + if (!test_bit(idx, &mapping->menu_mask)) + return NULL; + + if (mapping->menu_names) + return mapping->menu_names[idx]; + + return v4l2_ctrl_get_menu(mapping->id)[idx]; +} =20 static s32 uvc_ctrl_get_zoom(struct uvc_control_mapping *mapping, u8 query, const u8 *data) @@ -525,8 +537,8 @@ static const struct uvc_control_mapping uvc_ctrl_mappin= gs[] =3D { .offset =3D 0, .v4l2_type =3D V4L2_CTRL_TYPE_MENU, .data_type =3D UVC_CTRL_DATA_TYPE_BITMASK, - .menu_info =3D exposure_auto_controls, - .menu_mask =3D BIT_MASK(ARRAY_SIZE(exposure_auto_controls)), + .menu_mapping =3D exposure_auto_mapping, + .menu_mask =3D GENMASK(ARRAY_SIZE(exposure_auto_mapping) - 1, 0), .slave_ids =3D { V4L2_CID_EXPOSURE_ABSOLUTE, }, }, { @@ -731,8 +743,7 @@ static const struct uvc_control_mapping uvc_ctrl_mappin= gs_uvc11[] =3D { .offset =3D 0, .v4l2_type =3D V4L2_CTRL_TYPE_MENU, .data_type =3D UVC_CTRL_DATA_TYPE_ENUM, - .menu_info =3D power_line_frequency_controls, - .menu_mask =3D BIT_MASK(ARRAY_SIZE(power_line_frequency_controls) - 1), + .menu_mask =3D GENMASK(V4L2_CID_POWER_LINE_FREQUENCY_60HZ, 0), }, }; =20 @@ -745,8 +756,7 @@ static const struct uvc_control_mapping uvc_ctrl_mappin= gs_uvc15[] =3D { .offset =3D 0, .v4l2_type =3D V4L2_CTRL_TYPE_MENU, .data_type =3D UVC_CTRL_DATA_TYPE_ENUM, - .menu_info =3D power_line_frequency_controls, - .menu_mask =3D BIT_MASK(ARRAY_SIZE(power_line_frequency_controls)), + .menu_mask =3D GENMASK(V4L2_CID_POWER_LINE_FREQUENCY_AUTO, 0), }, }; =20 @@ -973,13 +983,17 @@ static s32 __uvc_ctrl_get_value(struct uvc_control_ma= pping *mapping, s32 value =3D mapping->get(mapping, UVC_GET_CUR, data); =20 if (mapping->v4l2_type =3D=3D V4L2_CTRL_TYPE_MENU) { - const struct uvc_menu_info *menu =3D mapping->menu_info; unsigned int i; =20 - for (i =3D 0; BIT(i) <=3D mapping->menu_mask; ++i, ++menu) { + for (i =3D 0; BIT(i) <=3D mapping->menu_mask; ++i) { + u32 menu_value; + if (!test_bit(i, &mapping->menu_mask)) continue; - if (menu->value =3D=3D value) { + + menu_value =3D uvc_mapping_get_menu_value(mapping, i); + + if (menu_value =3D=3D value) { value =3D i; break; } @@ -1190,7 +1204,6 @@ static int __uvc_query_v4l2_ctrl(struct uvc_video_cha= in *chain, { struct uvc_control_mapping *master_map =3D NULL; struct uvc_control *master_ctrl =3D NULL; - const struct uvc_menu_info *menu; unsigned int i; =20 memset(v4l2_ctrl, 0, sizeof(*v4l2_ctrl)); @@ -1235,11 +1248,15 @@ static int __uvc_query_v4l2_ctrl(struct uvc_video_c= hain *chain, v4l2_ctrl->maximum =3D fls(mapping->menu_mask) - 1; v4l2_ctrl->step =3D 1; =20 - menu =3D mapping->menu_info; - for (i =3D 0; BIT(i) <=3D mapping->menu_mask; ++i, ++menu) { + for (i =3D 0; BIT(i) <=3D mapping->menu_mask; ++i) { + u32 menu_value; + if (!test_bit(i, &mapping->menu_mask)) continue; - if (menu->value =3D=3D v4l2_ctrl->default_value) { + + menu_value =3D uvc_mapping_get_menu_value(mapping, i); + + if (menu_value =3D=3D v4l2_ctrl->default_value) { v4l2_ctrl->default_value =3D i; break; } @@ -1338,11 +1355,11 @@ int uvc_query_v4l2_ctrl(struct uvc_video_chain *cha= in, int uvc_query_v4l2_menu(struct uvc_video_chain *chain, struct v4l2_querymenu *query_menu) { - const struct uvc_menu_info *menu_info; struct uvc_control_mapping *mapping; struct uvc_control *ctrl; u32 index =3D query_menu->index; u32 id =3D query_menu->id; + const char *name; int ret; =20 memset(query_menu, 0, sizeof(*query_menu)); @@ -1364,22 +1381,34 @@ int uvc_query_v4l2_menu(struct uvc_video_chain *cha= in, goto done; } =20 - menu_info =3D &mapping->menu_info[query_menu->index]; - if (mapping->data_type =3D=3D UVC_CTRL_DATA_TYPE_BITMASK) { + u32 menu_value; + if (!ctrl->cached) { ret =3D uvc_ctrl_populate_cache(chain, ctrl); if (ret < 0) goto done; } =20 - if (!(uvc_get_ctrl_bitmap(ctrl, mapping) & menu_info->value)) { + menu_value =3D uvc_mapping_get_menu_value(mapping, + query_menu->index); + if (menu_value < 0) { + ret =3D menu_value; + goto done; + } + if (!(uvc_get_ctrl_bitmap(ctrl, mapping) & menu_value)) { ret =3D -EINVAL; goto done; } } =20 - strscpy(query_menu->name, menu_info->name, sizeof(query_menu->name)); + name =3D uvc_mapping_get_menu_name(mapping, query_menu->index); + if (!name) { + ret =3D -EINVAL; + goto done; + } + + strscpy(query_menu->name, name, sizeof(query_menu->name)); =20 done: mutex_unlock(&chain->ctrl_mutex); @@ -1880,7 +1909,7 @@ int uvc_ctrl_set(struct uvc_fh *handle, if (!test_bit(xctrl->value, &mapping->menu_mask)) return -EINVAL; =20 - value =3D mapping->menu_info[xctrl->value].value; + value =3D uvc_mapping_get_menu_value(mapping, xctrl->value); =20 /* * Valid menu indices are reported by the GET_RES request for @@ -2305,21 +2334,36 @@ static int __uvc_ctrl_add_mapping(struct uvc_video_= chain *chain, return -ENOMEM; =20 map->name =3D NULL; - map->menu_info =3D NULL; + map->menu_names =3D NULL; + map->menu_mapping =3D NULL; =20 /* For UVCIOC_CTRL_MAP custom control */ if (mapping->name) { map->name =3D kstrdup(mapping->name, GFP_KERNEL); - if (!map->name) - goto nomem; + if (!map->name) { + kfree(map); + return -ENOMEM; + } } =20 INIT_LIST_HEAD(&map->ev_subs); =20 - size =3D sizeof(*mapping->menu_info) * fls(mapping->menu_mask); - map->menu_info =3D kmemdup(mapping->menu_info, size, GFP_KERNEL); - if (!map->menu_info) - goto nomem; + if (mapping->menu_mapping && mapping->menu_mask) { + size =3D sizeof(mapping->menu_mapping[0]) + * fls(mapping->menu_mask); + map->menu_mapping =3D kmemdup(mapping->menu_mapping, size, + GFP_KERNEL); + if (!map->menu_mapping) + goto nomem; + } + if (mapping->menu_names && mapping->menu_mask) { + size =3D sizeof(mapping->menu_names[0]) + * fls(mapping->menu_mask); + map->menu_names =3D kmemdup(mapping->menu_names, size, + GFP_KERNEL); + if (!map->menu_names) + goto nomem; + } =20 if (map->get =3D=3D NULL) map->get =3D uvc_get_le_value; @@ -2342,7 +2386,8 @@ static int __uvc_ctrl_add_mapping(struct uvc_video_ch= ain *chain, return 0; =20 nomem: - kfree(map->menu_info); + kfree(map->menu_names); + kfree(map->menu_mapping); kfree(map->name); kfree(map); return -ENOMEM; @@ -2673,7 +2718,8 @@ static void uvc_ctrl_cleanup_mappings(struct uvc_devi= ce *dev, =20 list_for_each_entry_safe(mapping, nm, &ctrl->info.mappings, list) { list_del(&mapping->list); - kfree(mapping->menu_info); + kfree(mapping->menu_names); + kfree(mapping->menu_mapping); kfree(mapping->name); kfree(mapping); } diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc= _driver.c index f9e6208c4636..ee016b370058 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -2371,11 +2371,6 @@ MODULE_PARM_DESC(timeout, "Streaming control request= s timeout"); * Driver initialization and cleanup */ =20 -static const struct uvc_menu_info power_line_frequency_controls_limited[] = =3D { - { 1, "50 Hz" }, - { 2, "60 Hz" }, -}; - static const struct uvc_control_mapping uvc_ctrl_power_line_mapping_limite= d =3D { .id =3D V4L2_CID_POWER_LINE_FREQUENCY, .entity =3D UVC_GUID_UVC_PROCESSING, @@ -2384,8 +2379,8 @@ static const struct uvc_control_mapping uvc_ctrl_powe= r_line_mapping_limited =3D { .offset =3D 0, .v4l2_type =3D V4L2_CTRL_TYPE_MENU, .data_type =3D UVC_CTRL_DATA_TYPE_ENUM, - .menu_info =3D power_line_frequency_controls_limited, - .menu_mask =3D BIT_MASK(ARRAY_SIZE(power_line_frequency_controls_limited)= ), + .menu_mask =3D GENMASK(V4L2_CID_POWER_LINE_FREQUENCY_60HZ, + V4L2_CID_POWER_LINE_FREQUENCY_50HZ), }; =20 static const struct uvc_device_info uvc_ctrl_power_line_limited =3D { diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v= 4l2.c index ed2525e7e2a5..dfa26ed0c7f1 100644 --- a/drivers/media/usb/uvc/uvc_v4l2.c +++ b/drivers/media/usb/uvc/uvc_v4l2.c @@ -26,14 +26,83 @@ =20 #include "uvcvideo.h" =20 +static int uvc_control_add_xu_mapping(struct uvc_video_chain *chain, + struct uvc_control_mapping *map, + const struct uvc_xu_control_mapping *xmap) +{ + unsigned int i; + size_t size; + int ret; + + /* + * Prevent excessive memory consumption, as well as integer + * overflows. + */ + if (xmap->menu_count =3D=3D 0 || + xmap->menu_count > UVC_MAX_CONTROL_MENU_ENTRIES) + return -EINVAL; + + map->menu_names =3D NULL; + map->menu_mapping =3D NULL; + + map->menu_mask =3D BIT_MASK(xmap->menu_count); + + size =3D xmap->menu_count * sizeof(*map->menu_mapping); + map->menu_mapping =3D kzalloc(size, GFP_KERNEL); + if (!map->menu_mapping) { + ret =3D -ENOMEM; + goto exit; + } + + for (i =3D 0; i < xmap->menu_count ; i++) { + if (copy_from_user((u32 *)&map->menu_mapping[i], + &xmap->menu_info[i].value, + sizeof(map->menu_mapping[i]))) { + ret =3D -EACCES; + goto exit; + } + } + + /* Always use the standard naming if available. */ + if (v4l2_ctrl_get_menu(map->id)) + goto done_mapping; + + size =3D xmap->menu_count * sizeof(map->menu_names[0]); + map->menu_names =3D kzalloc(size, GFP_KERNEL); + if (!map->menu_names) { + ret =3D -ENOMEM; + goto exit; + } + + for (i =3D 0; i < xmap->menu_count ; i++) { + /* sizeof(names[i]) - 1: to take care of \0 */ + if (copy_from_user((char *)map->menu_names[i], + xmap->menu_info[i].name, + sizeof(map->menu_names[i]) - 1)) { + ret =3D -EACCES; + goto exit; + } + } + +done_mapping: + ret =3D uvc_ctrl_add_mapping(chain, map); + +exit: + kfree(map->menu_names); + map->menu_names =3D NULL; + kfree(map->menu_mapping); + map->menu_mapping =3D NULL; + + return ret; +} + /* ------------------------------------------------------------------------ * UVC ioctls */ -static int uvc_ioctl_ctrl_map(struct uvc_video_chain *chain, - struct uvc_xu_control_mapping *xmap) +static int uvc_ioctl_xu_ctrl_map(struct uvc_video_chain *chain, + struct uvc_xu_control_mapping *xmap) { struct uvc_control_mapping *map; - unsigned int size; int ret; =20 map =3D kzalloc(sizeof(*map), GFP_KERNEL); @@ -61,39 +130,20 @@ static int uvc_ioctl_ctrl_map(struct uvc_video_chain *= chain, case V4L2_CTRL_TYPE_INTEGER: case V4L2_CTRL_TYPE_BOOLEAN: case V4L2_CTRL_TYPE_BUTTON: + ret =3D uvc_ctrl_add_mapping(chain, map); break; =20 case V4L2_CTRL_TYPE_MENU: - /* - * Prevent excessive memory consumption, as well as integer - * overflows. - */ - if (xmap->menu_count =3D=3D 0 || - xmap->menu_count > UVC_MAX_CONTROL_MENU_ENTRIES) { - ret =3D -EINVAL; - goto free_map; - } - - size =3D xmap->menu_count * sizeof(*map->menu_info); - map->menu_info =3D memdup_user(xmap->menu_info, size); - if (IS_ERR(map->menu_info)) { - ret =3D PTR_ERR(map->menu_info); - goto free_map; - } - - map->menu_mask =3D BIT_MASK(xmap->menu_count); + ret =3D uvc_control_add_xu_mapping(chain, map, xmap); break; =20 default: uvc_dbg(chain->dev, CONTROL, "Unsupported V4L2 control type %u\n", xmap->v4l2_type); ret =3D -ENOTTY; - goto free_map; + break; } =20 - ret =3D uvc_ctrl_add_mapping(chain, map); - - kfree(map->menu_info); free_map: kfree(map); =20 @@ -1316,7 +1366,7 @@ static long uvc_ioctl_default(struct file *file, void= *fh, bool valid_prio, switch (cmd) { /* Dynamic controls. */ case UVCIOC_CTRL_MAP: - return uvc_ioctl_ctrl_map(chain, arg); + return uvc_ioctl_xu_ctrl_map(chain, arg); =20 case UVCIOC_CTRL_QUERY: return uvc_xu_ctrl_query(chain, arg); @@ -1429,7 +1479,7 @@ static long uvc_v4l2_compat_ioctl32(struct file *file, ret =3D uvc_v4l2_get_xu_mapping(&karg.xmap, up); if (ret) return ret; - ret =3D uvc_ioctl_ctrl_map(handle->chain, &karg.xmap); + ret =3D uvc_ioctl_xu_ctrl_map(handle->chain, &karg.xmap); if (ret) return ret; ret =3D uvc_v4l2_put_xu_mapping(&karg.xmap, up); diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvi= deo.h index f75e5864bbf7..0e816be556f2 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -116,7 +116,8 @@ struct uvc_control_mapping { enum v4l2_ctrl_type v4l2_type; u32 data_type; =20 - const struct uvc_menu_info *menu_info; + const u32 *menu_mapping; + const char (*menu_names)[UVC_MENU_NAME_LEN]; unsigned long menu_mask; =20 u32 master_id; diff --git a/include/uapi/linux/uvcvideo.h b/include/uapi/linux/uvcvideo.h index 8288137387c0..d45d0c2ea252 100644 --- a/include/uapi/linux/uvcvideo.h +++ b/include/uapi/linux/uvcvideo.h @@ -36,9 +36,11 @@ UVC_CTRL_FLAG_GET_MAX | UVC_CTRL_FLAG_GET_RES | \ UVC_CTRL_FLAG_GET_DEF) =20 +#define UVC_MENU_NAME_LEN 32 + struct uvc_menu_info { __u32 value; - __u8 name[32]; + __u8 name[UVC_MENU_NAME_LEN]; }; =20 struct uvc_xu_control_mapping { --=20 2.39.0.314.g84b9a713c41-goog-b4-0.11.0-dev-696ae