From patchwork Wed Jan 6 20:26:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shuah Khan X-Patchwork-Id: 7970511 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8767ABEEE5 for ; Wed, 6 Jan 2016 20:27:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B0C5A2015E for ; Wed, 6 Jan 2016 20:27:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D939E20154 for ; Wed, 6 Jan 2016 20:27:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752290AbcAFU1h (ORCPT ); Wed, 6 Jan 2016 15:27:37 -0500 Received: from resqmta-po-05v.sys.comcast.net ([96.114.154.164]:36801 "EHLO resqmta-po-05v.sys.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752066AbcAFU13 (ORCPT ); Wed, 6 Jan 2016 15:27:29 -0500 Received: from resomta-po-16v.sys.comcast.net ([96.114.154.240]) by resqmta-po-05v.sys.comcast.net with comcast id 2kTU1s0045BUCh401kTUDZ; Wed, 06 Jan 2016 20:27:28 +0000 Received: from mail.gonehiking.org ([73.181.52.62]) by resomta-po-16v.sys.comcast.net with comcast id 2kTQ1s0011LXgTt01kTQeB; Wed, 06 Jan 2016 20:27:27 +0000 Received: from lorien.internal (lorien-wl.internal [192.168.1.40]) by mail.gonehiking.org (Postfix) with ESMTP id 5C86B9F427; Wed, 6 Jan 2016 13:27:23 -0700 (MST) From: Shuah Khan To: mchehab@osg.samsung.com, tiwai@suse.com, clemens@ladisch.de, hans.verkuil@cisco.com, laurent.pinchart@ideasonboard.com, sakari.ailus@linux.intel.com, javier@osg.samsung.com Cc: Shuah Khan , pawel@osciak.com, m.szyprowski@samsung.com, kyungmin.park@samsung.com, perex@perex.cz, arnd@arndb.de, dan.carpenter@oracle.com, tvboxspy@gmail.com, crope@iki.fi, ruchandani.tina@gmail.com, corbet@lwn.net, chehabrafael@gmail.com, k.kozlowski@samsung.com, stefanr@s5r6.in-berlin.de, inki.dae@samsung.com, jh1009.sung@samsung.com, elfring@users.sourceforge.net, prabhakar.csengg@gmail.com, sw0312.kim@samsung.com, p.zabel@pengutronix.de, ricardo.ribalda@gmail.com, labbott@fedoraproject.org, pierre-louis.bossart@linux.intel.com, ricard.wanderlof@axis.com, julian@jusst.de, takamichiho@gmail.com, dominic.sacre@gmx.de, misterpib@gmail.com, daniel@zonque.org, gtmkramer@xs4all.nl, normalperson@yhbt.net, joe@oampo.co.uk, linuxbugs@vittgam.net, johan@oljud.se, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-api@vger.kernel.org, alsa-devel@alsa-project.org Subject: [PATCH 02/31] media: Add ALSA Media Controller function entities Date: Wed, 6 Jan 2016 13:26:51 -0700 Message-Id: X-Mailer: git-send-email 2.5.0 In-Reply-To: References: In-Reply-To: References: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net; s=q20140121; t=1452112048; bh=Go/R5zHElH5jsWlkNpk42SJSuOxCKBSLIZgVqJDPiwk=; h=Received:Received:Received:From:To:Subject:Date:Message-Id; b=qV3b5S13feNq7ZGRehEiPBprap/EaPV9M1H9UTKBe5n0ds7lieh+ERPqOppE9K7VL 24yq7Tt83DYK8wrDNQn0ezUS7tw++o9ZzXevB5Z36RTmWJAuJSpvgefFy57ce96S/e Kp7Vc3m2Ps8n9JZwp46hmvQ8gzVYae7ipCJ+W+l/+GmbIk4KRNQPloboLMZog0fWaC byt/qTz5Rkb+fFwYWTViGAS0YQtSkjuYfxzMQjiV7SU+Na4YiyQg+7vTVF+CxYzVxv LONVeKpn7PKSNL6dpeQ/1osfbMDhcX1vrlUzANvXmdwimj2Rwopy58afzZ216QID8K mVthVBIBVU73Q== Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable 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 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 75cbe92..53a96ae 100644 --- a/include/uapi/linux/media.h +++ b/include/uapi/linux/media.h @@ -89,6 +89,13 @@ struct media_device_info { #define MEDIA_ENT_F_IO_SWRADIO (MEDIA_ENT_F_BASE + 33) /* + * 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: @@ -130,7 +137,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_V4L #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