From patchwork Wed Feb 10 14:58:08 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sakari Ailus X-Patchwork-Id: 2678 Return-path: Envelope-to: mchehab@infradead.org Delivery-date: Wed, 10 Feb 2010 14:58:32 +0000 Received: from bombadil.infradead.org [18.85.46.34] by pedra with IMAP (fetchmail-6.3.6) for (single-drop); Wed, 10 Feb 2010 13:00:02 -0200 (BRST) Received: from vger.kernel.org ([209.132.180.67]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1NfE1Q-0000A0-DE; Wed, 10 Feb 2010 14:58:32 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754176Ab0BJO6b (ORCPT + 1 other); Wed, 10 Feb 2010 09:58:31 -0500 Received: from smtp.nokia.com ([192.100.122.233]:43888 "EHLO mgw-mx06.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750763Ab0BJO6a (ORCPT ); Wed, 10 Feb 2010 09:58:30 -0500 Received: from vaebh106.NOE.Nokia.com (vaebh106.europe.nokia.com [10.160.244.32]) by mgw-mx06.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o1AEwPRY027836; Wed, 10 Feb 2010 16:58:27 +0200 Received: from vaebh104.NOE.Nokia.com ([10.160.244.30]) by vaebh106.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Wed, 10 Feb 2010 16:58:20 +0200 Received: from mgw-da02.ext.nokia.com ([147.243.128.26]) by vaebh104.NOE.Nokia.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Wed, 10 Feb 2010 16:58:19 +0200 Received: from maxwell.research.nokia.com (maxwell.research.nokia.com [172.21.50.162]) by mgw-da02.ext.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o1AEwEFk006380 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 10 Feb 2010 16:58:16 +0200 Received: from lanttu (unknown [192.168.239.74]) by maxwell.research.nokia.com (Postfix) with ESMTPS id 47AB470088; Wed, 10 Feb 2010 16:58:14 +0200 (EET) Received: from sakke by lanttu with local (Exim 4.69) (envelope-from ) id 1NfE16-0004hA-4k; Wed, 10 Feb 2010 16:58:12 +0200 From: Sakari Ailus To: linux-media@vger.kernel.org Cc: hverkuil@xs4all.nl, laurent.pinchart@ideasonboard.com, iivanov@mm-sol.com, gururaj.nagendra@intel.com, david.cohen@nokia.com Subject: [PATCH v4 6/7] V4L: Events: Sequence numbers Date: Wed, 10 Feb 2010 16:58:08 +0200 Message-Id: <1265813889-17847-6-git-send-email-sakari.ailus@maxwell.research.nokia.com> X-Mailer: git-send-email 1.5.6.5 In-Reply-To: <1265813889-17847-5-git-send-email-sakari.ailus@maxwell.research.nokia.com> References: <4B72C965.7040204@maxwell.research.nokia.com> <1265813889-17847-1-git-send-email-sakari.ailus@maxwell.research.nokia.com> <1265813889-17847-2-git-send-email-sakari.ailus@maxwell.research.nokia.com> <1265813889-17847-3-git-send-email-sakari.ailus@maxwell.research.nokia.com> <1265813889-17847-4-git-send-email-sakari.ailus@maxwell.research.nokia.com> <1265813889-17847-5-git-send-email-sakari.ailus@maxwell.research.nokia.com> X-OriginalArrivalTime: 10 Feb 2010 14:58:19.0710 (UTC) FILETIME=[7BAF0DE0:01CAAA61] X-Nokia-AV: Clean Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Add sequence numbers to events. Signed-off-by: Sakari Ailus --- drivers/media/video/v4l2-event.c | 16 +++++++++++++--- include/media/v4l2-event.h | 1 + 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/drivers/media/video/v4l2-event.c b/drivers/media/video/v4l2-event.c index bbdc149..0af0de5 100644 --- a/drivers/media/video/v4l2-event.c +++ b/drivers/media/video/v4l2-event.c @@ -95,6 +95,7 @@ int v4l2_event_init(struct v4l2_fh *fh, unsigned int n, unsigned int max_alloc) fh->events->navailable = 0; fh->events->max_alloc = max_alloc; + fh->events->sequence = -1; ret = v4l2_event_alloc(fh, n); if (ret < 0) @@ -175,15 +176,24 @@ void v4l2_event_queue(struct video_device *vdev, struct v4l2_event *ev) list_for_each_entry(fh, &vdev->fh_list, list) { struct v4l2_events *events = fh->events; struct v4l2_kevent *kev; + u32 sequence; - /* Do we have any free events and are we subscribed? */ - if (list_empty(&events->free) || - !__v4l2_event_subscribed(fh, ev->type)) + /* Are we subscribed? */ + if (!__v4l2_event_subscribed(fh, ev->type)) + continue; + + /* Increase event sequence number on fh. */ + events->sequence++; + sequence = events->sequence; + + /* Do we have any free events? */ + if (list_empty(&events->free)) continue; /* Take one and fill it. */ kev = list_first_entry(&events->free, struct v4l2_kevent, list); kev->event = *ev; + kev->event.sequence = sequence; list_move_tail(&kev->list, &events->available); events->navailable++; diff --git a/include/media/v4l2-event.h b/include/media/v4l2-event.h index 671c8f7..5760597 100644 --- a/include/media/v4l2-event.h +++ b/include/media/v4l2-event.h @@ -50,6 +50,7 @@ struct v4l2_events { unsigned int navailable; unsigned int max_alloc; /* Never allocate more. */ struct list_head free; /* Events ready for use */ + u32 sequence; }; int v4l2_event_alloc(struct v4l2_fh *fh, unsigned int n);