From patchwork Fri Oct 2 22:07:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shuah Khan X-Patchwork-Id: 7320121 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 28CCD9F314 for ; Sat, 3 Oct 2015 07:25:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 50DB320859 for ; Sat, 3 Oct 2015 07:25:18 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 7D4BA20706 for ; Sat, 3 Oct 2015 07:25:16 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id A187F266B3B; Sat, 3 Oct 2015 09:25:15 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_LOW, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id D3409261AB0; Sat, 3 Oct 2015 09:23:05 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 504A82669CB; Sat, 3 Oct 2015 00:07:52 +0200 (CEST) Received: from resqmta-po-06v.sys.comcast.net (resqmta-po-06v.sys.comcast.net [96.114.154.165]) by alsa0.perex.cz (Postfix) with ESMTP id BB8EE26698F for ; Sat, 3 Oct 2015 00:07:39 +0200 (CEST) Received: from resomta-po-13v.sys.comcast.net ([96.114.154.237]) by resqmta-po-06v.sys.comcast.net with comcast id QN7e1r00957bBgG01N7e29; Fri, 02 Oct 2015 22:07:38 +0000 Received: from mail.gonehiking.org ([73.181.52.62]) by resomta-po-13v.sys.comcast.net with comcast id QN7b1r00V1LXgTt01N7brY; Fri, 02 Oct 2015 22:07:38 +0000 Received: from lorien.internal (lorien-wl.internal [192.168.1.40]) by mail.gonehiking.org (Postfix) with ESMTP id 7285FA153E; Fri, 2 Oct 2015 16:07:35 -0600 (MDT) From: Shuah Khan To: mchehab@osg.samsung.com, hans.verkuil@cisco.com, laurent.pinchart@ideasonboard.com, sakari.ailus@linux.intel.com, tiwai@suse.de, pawel@osciak.com, m.szyprowski@samsung.com, kyungmin.park@samsung.com, perex@perex.cz, dan.carpenter@oracle.com, tskd08@gmail.com, arnd@arndb.de, ruchandani.tina@gmail.com, corbet@lwn.net, k.kozlowski@samsung.com, chehabrafael@gmail.com, prabhakar.csengg@gmail.com, elfring@users.sourceforge.net, Julia.Lawall@lip6.fr, p.zabel@pengutronix.de, ricardo.ribalda@gmail.com, labbott@fedoraproject.org, chris.j.arges@canonical.com, pierre-louis.bossart@linux.intel.com, johan@oljud.se, wsa@the-dreams.de, jcragg@gmail.com, clemens@ladisch.de, daniel@zonque.org, gtmkramer@xs4all.nl, misterpib@gmail.com, takamichiho@gmail.com, pmatilai@laiskiainen.org, vladcatoi@gmail.com, damien@zamaudio.com, normalperson@yhbt.net, joe@oampo.co.uk, jussi@sonarnerd.net, calcprogrammer1@gmail.com Date: Fri, 2 Oct 2015 16:07:14 -0600 Message-Id: <5817c3708ab4147f4092f2f5b268cd4331bec622.1443822799.git.shuahkh@osg.samsung.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: In-Reply-To: References: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net; s=q20140121; t=1443823658; bh=GwH3D+0wMrdt3KwtNpx9TUX7ZW0DBQyVJ4beHIhCg4c=; h=Received:Received:Received:From:To:Subject:Date:Message-Id; b=YsQRAU6jxMBF72YGkD4Kq3nkyuzdR8/6Me63La8U0me4F7JT5wYxq8IjAJ+6iLlRZ AQ+i0rU9teWeTBPD8H5o4VyK74KSl0vPKt5DFKo/aSjTlerCgQ+xA7wRhwghvQtgzM EWxrDfrlvRkmgGXXQHY0vmoWYboud9FWls9IlvxNcWY3gMdHxL0rm6JAd+kT7bFLtH kCioEfZO9/kUqn6xVMKZo+33IUWFaQydgKfeHfEmgdYOI3wephuhHVk3Kt0ggKPHSh yZpRzjZ9m6Wc5krvCeJpnTwVmWZBC6mfIZxuGkRpDKrpGs854pdcv631Um85SSi9wO lscAe1JNrI7+Q== X-Mailman-Approved-At: Sat, 03 Oct 2015 09:23:02 +0200 Cc: alsa-devel@alsa-project.org, Shuah Khan , linux-media@vger.kernel.org Subject: [alsa-devel] [PATCH MC Next Gen 02/20] media: Add ALSA Media Controller function entities X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP Add ALSA Media Controller capture, playback, and mixer function entity defines. Signed-off-by: Shuah Khan --- include/uapi/linux/media.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h index 90e90a6..46b1e169 100644 --- a/include/uapi/linux/media.h +++ b/include/uapi/linux/media.h @@ -78,6 +78,13 @@ struct media_device_info { #define MEDIA_ENT_F_CONN_TEST (MEDIA_ENT_F_BASE + 24) /* + * ALSA entities MEDIA_ENT_F_AUDIO_IO is for Capture and Playback +*/ +#define MEDIA_ENT_F_AUDIO_CAPTURE (MEDIA_ENT_F_BASE + 200) +#define MEDIA_ENT_F_AUDIO_PLAYBACK (MEDIA_ENT_F_BASE + 201) +#define MEDIA_ENT_F_AUDIO_MIXER (MEDIA_ENT_F_BASE + 202) + +/* * Don't touch on those. The ranges MEDIA_ENT_F_OLD_BASE and * MEDIA_ENT_F_OLD_SUBDEV_BASE are kept to keep backward compatibility * with the legacy v1 API.The number range is out of range by purpose: @@ -115,7 +122,7 @@ struct media_device_info { #define MEDIA_ENT_T_DEVNODE MEDIA_ENT_F_OLD_BASE #define MEDIA_ENT_T_DEVNODE_V4L MEDIA_ENT_F_IO #define MEDIA_ENT_T_DEVNODE_FB (MEDIA_ENT_T_DEVNODE + 2) -#define MEDIA_ENT_T_DEVNODE_ALSA (MEDIA_ENT_T_DEVNODE + 3) +#define MEDIA_ENT_T_DEVNODE_ALSA MEDIA_ENT_F_AUDIO_IO #define MEDIA_ENT_T_DEVNODE_DVB (MEDIA_ENT_T_DEVNODE + 4) #define MEDIA_ENT_T_UNKNOWN MEDIA_ENT_F_UNKNOWN