From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mx1.redhat.com ([209.132.183.28]:45438 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755827Ab2DHP55 (ORCPT ); Sun, 8 Apr 2012 11:57:57 -0400 From: Hans de Goede To: Laurent Pinchart Cc: Linux Media Mailing List , Hans de Goede Subject: [PATCH 09/10] uvcvideo: Send control change events for slave ctrls when the master changes Date: Sun, 8 Apr 2012 17:59:53 +0200 Message-Id: <1333900794-1932-10-git-send-email-hdegoede@redhat.com> In-Reply-To: <1333900794-1932-1-git-send-email-hdegoede@redhat.com> References: <1333900794-1932-1-git-send-email-hdegoede@redhat.com> Sender: linux-media-owner@vger.kernel.org List-ID: This allows v4l2 control UI-s to update the inactive state (ie grey-ing out of controls) for slave controls when the master control changes. Signed-off-by: Hans de Goede --- drivers/media/video/uvc/uvc_ctrl.c | 57 ++++++++++++++++++++++++++++++++++-- 1 file changed, 54 insertions(+), 3 deletions(-) diff --git a/drivers/media/video/uvc/uvc_ctrl.c b/drivers/media/video/uvc/uvc_ctrl.c index 75a4995..38d633a 100644 --- a/drivers/media/video/uvc/uvc_ctrl.c +++ b/drivers/media/video/uvc/uvc_ctrl.c @@ -1177,21 +1177,72 @@ static void uvc_ctrl_send_event(struct uvc_fh *handle, list_for_each_entry(sev, &mapping->ev_subs, node) if (sev->fh && (sev->fh != &handle->vfh || - (sev->flags & V4L2_EVENT_SUB_FL_ALLOW_FEEDBACK))) + (sev->flags & V4L2_EVENT_SUB_FL_ALLOW_FEEDBACK) || + (changes & V4L2_EVENT_CTRL_CH_FLAGS))) v4l2_event_queue_fh(sev->fh, &ev); } -static void uvc_ctrl_send_events(struct uvc_fh *handle, +static void uvc_ctrl_send_slave_event(struct uvc_fh *handle, u32 slave_id, const struct v4l2_ext_control *xctrls, unsigned int xctrls_count) { struct uvc_control_mapping *mapping; struct uvc_control *ctrl; + u32 changes = V4L2_EVENT_CTRL_CH_FLAGS; + s32 val = 0; unsigned int i; + /* + * We can skip sending an event for the slave if the slave + * is being modified in the same transaction. + */ + for (i = 0; i < xctrls_count; i++) + if (xctrls[i].id == slave_id) + return; + + ctrl = uvc_find_control(handle->chain, slave_id, &mapping); + if (ctrl == NULL) + return; + + if (__uvc_ctrl_get(handle->chain, ctrl, mapping, &val) == 0) + changes |= V4L2_EVENT_CTRL_CH_VALUE; + + uvc_ctrl_send_event(handle, ctrl, mapping, val, changes); +} + +static void uvc_ctrl_send_events(struct uvc_fh *handle, + const struct v4l2_ext_control *xctrls, unsigned int xctrls_count) +{ + struct uvc_control_mapping *mapping; + struct uvc_control *ctrl; + u32 changes = V4L2_EVENT_CTRL_CH_VALUE; + unsigned int i, j; + for (i = 0; i < xctrls_count; ++i) { ctrl = uvc_find_control(handle->chain, xctrls[i].id, &mapping); + + for (j = 0; j < ARRAY_SIZE(mapping->slave_ids); ++j) { + if (!mapping->slave_ids[j]) + break; + uvc_ctrl_send_slave_event(handle, + mapping->slave_ids[j], + xctrls, xctrls_count); + } + + /* + * If the master is being modified in the same transaction + * flags may change too. + */ + if (mapping->master_id) { + for (j = 0; j < xctrls_count; j++) { + if (xctrls[j].id == mapping->master_id) { + changes |= V4L2_EVENT_CTRL_CH_FLAGS; + break; + } + } + } + uvc_ctrl_send_event(handle, ctrl, mapping, xctrls[i].value, - V4L2_EVENT_CTRL_CH_VALUE); + changes); } } -- 1.7.9.3