From patchwork Sat Jul 19 13:10:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Herrmann X-Patchwork-Id: 4589441 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8E7099F462 for ; Sat, 19 Jul 2014 13:11:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BD11F20179 for ; Sat, 19 Jul 2014 13:11:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 995B3201BF for ; Sat, 19 Jul 2014 13:11:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754772AbaGSNLE (ORCPT ); Sat, 19 Jul 2014 09:11:04 -0400 Received: from mail-we0-f181.google.com ([74.125.82.181]:56056 "EHLO mail-we0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754859AbaGSNLD (ORCPT ); Sat, 19 Jul 2014 09:11:03 -0400 Received: by mail-we0-f181.google.com with SMTP id k48so4530873wev.40 for ; Sat, 19 Jul 2014 06:11:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hr0qBBDdoX+NNSZCoAjSQQVpoKzBfIpGCNnB5tLXyEs=; b=vpNW2261vm/AiwNQk+Apo9QGiamnl4saIPPuRzexb1b0dV9LHgC5uQI/vxZh+TvtHz OH6JJds2JiLZysyG5BrJPNRygQTazsvI2nUvxMkZD/B4UecuEPr63Sik83+/peq/PUuh amvUF2W2p399x50ninJv7hM6VZMWn3golgvm/nqVt/7Gx5xi8ilzz5gT1E6qPEwJwZ9z CaH74AjgzANBGlBq55T4PwR1dAaQfnGvP+ZLHY7mReeD0ZAWX8E8pZuAyjivwUrncDE/ 6vwCarBdi9DZAwobL0y41K94iS3B0pSTcaYaKnII/+oRkxRgUgxIrTJGSC/8krEZawU3 DH+A== X-Received: by 10.194.200.37 with SMTP id jp5mr4915636wjc.120.1405775462556; Sat, 19 Jul 2014 06:11:02 -0700 (PDT) Received: from david-tp.localdomain (stgt-5f72b883.pool.mediaWays.net. [95.114.184.131]) by mx.google.com with ESMTPSA id ek3sm21919229wjd.17.2014.07.19.06.11.01 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 19 Jul 2014 06:11:01 -0700 (PDT) From: David Herrmann To: linux-input@vger.kernel.org Cc: Peter Hutterer , Dmitry Torokhov , Dmitry Torokhov , David Herrmann Subject: [PATCH RESEND 3/5] Input: uinput - add UI_GET_VERSION ioctl Date: Sat, 19 Jul 2014 15:10:43 +0200 Message-Id: <1405775445-4454-4-git-send-email-dh.herrmann@gmail.com> X-Mailer: git-send-email 2.0.2 In-Reply-To: <1405775445-4454-1-git-send-email-dh.herrmann@gmail.com> References: <1405775445-4454-1-git-send-email-dh.herrmann@gmail.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This ioctl is the counterpart to EVIOCGVERSION and returns the uinput-version the kernel was compiled with. Reviewed-by: Peter Hutterer Signed-off-by: David Herrmann --- drivers/input/misc/uinput.c | 6 ++++++ include/uapi/linux/uinput.h | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c index 615324c..a2a3895 100644 --- a/drivers/input/misc/uinput.c +++ b/drivers/input/misc/uinput.c @@ -722,6 +722,12 @@ static long uinput_ioctl_handler(struct file *file, unsigned int cmd, } switch (cmd) { + case UI_GET_VERSION: + if (put_user(UINPUT_VERSION, + (unsigned int __user*)p)) + retval = -EFAULT; + goto out; + case UI_DEV_CREATE: retval = uinput_create_device(udev); goto out; diff --git a/include/uapi/linux/uinput.h b/include/uapi/linux/uinput.h index 0389b48..19339cf 100644 --- a/include/uapi/linux/uinput.h +++ b/include/uapi/linux/uinput.h @@ -84,6 +84,15 @@ struct uinput_ff_erase { */ #define UI_GET_SYSNAME(len) _IOC(_IOC_READ, UINPUT_IOCTL_BASE, 300, len) +/** + * UI_GET_VERSION - Return uinput version of the kernel + * + * This writes the kernel's uinput version into the integer pointed to by the + * ioctl argument. The uinput-version is hard-coded in the kernel and + * independent of the uinput device. + */ +#define UI_GET_VERSION _IOR(UINPUT_IOCTL_BASE, 301, unsigned int) + /* * To write a force-feedback-capable driver, the upload_effect * and erase_effect callbacks in input_dev must be implemented.