Received: by 2002:ac0:98c7:0:0:0:0:0 with SMTP id g7-v6csp1515749imd; Thu, 1 Nov 2018 17:32:27 -0700 (PDT) X-Google-Smtp-Source: AJdET5eJ1McD+sDd8H0mJluOAKuxUt5u9Za014dln9KsmZbAx2zLNRpBNCDpGX9jmR3lGBFn14EB X-Received: by 2002:a17:902:1105:: with SMTP id d5-v6mr9909689pla.28.1541118747293; Thu, 01 Nov 2018 17:32:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1541118747; cv=none; d=google.com; s=arc-20160816; b=UDOUnsZZUWS62GhHlrIJTFVdP2pQW5YnAb8Cy0/uPnCd5/LiLlxKzNvfUaZI1TjciF yhPMTz6/+yGp7lela963cGbVJhBJ71GQghAPVikch2oLUTqfcBkl/l1nDR3I8aIi/drx Hdq8DTf7etpOoflB2ChBBndalw2ilL52ppC6cgIYVGj1tS9Xp4Rk/AXnk1ZZf/b0OCb1 P5CK8fMI0ww8n6lJjBGN2FnFLOyWM0sKApWH8kpkydjOJFCZoJ98lnuczzbiLsKvOxLJ bAUwIBL/CWWi7RUYBKSQFIkUaniR38Z385nuQdUy5cQzJXvlJyDXtBR0PJqKQ0sOaLKv OUag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=YJezzs1BLMxNHvhNaGHZVdHnwz1Rg7e+UAUZsM5K4gA=; b=e9X/TKh1OevMurFyuBnpT248aZeIkJ/VCFJimEH5tBLKNyZshxzjxt5G1zDQ0++ZGS GclcM9LZ/EhvOLsPgnL3cKyWmB+6DfD0b/BhU63uO0LmuEQ16CNI4cv+QDoZGjor50jP BTpuw/QuZEiF4ecnrbtPNdzGqNwNJ/I4JqQAQoUdEcLFPt+7ZH0DQNJVQ1sOMsmg7oXW iF7gbtalJotwoHdqsjUqUT/AltZXel5rCxT6Jeh4WOoWNlxvODmfxT6vLYTM4FA+BLEl QxVJX0Ft852SS07d4pQ7FIu78JTki/XYSK+vrFE6Kz/gg8nLmbSRCKVXc9RNnr1Wnd6K NA4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=HZcIGl3F; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 15-v6si33285141pfr.242.2018.11.01.17.32.12; Thu, 01 Nov 2018 17:32:27 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=HZcIGl3F; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728446AbeKBJg7 (ORCPT + 99 others); Fri, 2 Nov 2018 05:36:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:41912 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728058AbeKBJg7 (ORCPT ); Fri, 2 Nov 2018 05:36:59 -0400 Received: from localhost.localdomain (c-24-9-64-241.hsd1.co.comcast.net [24.9.64.241]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C48D720840; Fri, 2 Nov 2018 00:31:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1541118707; bh=J52tuGlXP99up45X1moW9a/M3v90My264/sTTr+JuCg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:In-Reply-To: References:From; b=HZcIGl3FsVoY+yKjUfuwIHJNv+NtxzUtGhvkpVbNosV5dHNk+bPypKLYZqmsyZy02 9ltIcjxLDyoAGkmWl+S4a7T7O67er+8YNnPXnWhz+gMusbjOQ8msuQUGkHdxhsEFyr SokI/2TN8CbXH1DwAAIfiHZvSdvFrf/JmhKUxyKY= From: shuah@kernel.org To: mchehab@kernel.org, perex@perex.cz, tiwai@suse.com Cc: Shuah Khan , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org Subject: [RFC PATCH v8 3/4] media: media.h: Enable ALSA MEDIA_INTF_T* interface types Date: Thu, 1 Nov 2018 18:31:32 -0600 Message-Id: <0f47952fd84fd275646e3c9a18e208ced08dd6bb.1541109584.git.shuah@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Shuah Khan Move ALSA MEDIA_INTF_T* interface types back into __KERNEL__ scope to get ready for adding ALSA support to the media controller. Signed-off-by: Shuah Khan --- include/uapi/linux/media.h | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h index 36f76e777ef9..07be07263597 100644 --- a/include/uapi/linux/media.h +++ b/include/uapi/linux/media.h @@ -262,6 +262,16 @@ struct media_links_enum { #define MEDIA_INTF_T_V4L_SWRADIO (MEDIA_INTF_T_V4L_BASE + 4) #define MEDIA_INTF_T_V4L_TOUCH (MEDIA_INTF_T_V4L_BASE + 5) +#define MEDIA_INTF_T_ALSA_BASE 0x00000300 +#define MEDIA_INTF_T_ALSA_PCM_CAPTURE (MEDIA_INTF_T_ALSA_BASE) +#define MEDIA_INTF_T_ALSA_PCM_PLAYBACK (MEDIA_INTF_T_ALSA_BASE + 1) +#define MEDIA_INTF_T_ALSA_CONTROL (MEDIA_INTF_T_ALSA_BASE + 2) +#define MEDIA_INTF_T_ALSA_COMPRESS (MEDIA_INTF_T_ALSA_BASE + 3) +#define MEDIA_INTF_T_ALSA_RAWMIDI (MEDIA_INTF_T_ALSA_BASE + 4) +#define MEDIA_INTF_T_ALSA_HWDEP (MEDIA_INTF_T_ALSA_BASE + 5) +#define MEDIA_INTF_T_ALSA_SEQUENCER (MEDIA_INTF_T_ALSA_BASE + 6) +#define MEDIA_INTF_T_ALSA_TIMER (MEDIA_INTF_T_ALSA_BASE + 7) + #if defined(__KERNEL__) /* @@ -404,21 +414,6 @@ struct media_v2_topology { #define MEDIA_ENT_F_DTV_DECODER MEDIA_ENT_F_DV_DECODER -/* - * There is still no ALSA support in the media controller. These - * defines should not have been added and we leave them here only - * in case some application tries to use these defines. - */ -#define MEDIA_INTF_T_ALSA_BASE 0x00000300 -#define MEDIA_INTF_T_ALSA_PCM_CAPTURE (MEDIA_INTF_T_ALSA_BASE) -#define MEDIA_INTF_T_ALSA_PCM_PLAYBACK (MEDIA_INTF_T_ALSA_BASE + 1) -#define MEDIA_INTF_T_ALSA_CONTROL (MEDIA_INTF_T_ALSA_BASE + 2) -#define MEDIA_INTF_T_ALSA_COMPRESS (MEDIA_INTF_T_ALSA_BASE + 3) -#define MEDIA_INTF_T_ALSA_RAWMIDI (MEDIA_INTF_T_ALSA_BASE + 4) -#define MEDIA_INTF_T_ALSA_HWDEP (MEDIA_INTF_T_ALSA_BASE + 5) -#define MEDIA_INTF_T_ALSA_SEQUENCER (MEDIA_INTF_T_ALSA_BASE + 6) -#define MEDIA_INTF_T_ALSA_TIMER (MEDIA_INTF_T_ALSA_BASE + 7) - /* Obsolete symbol for media_version, no longer used in the kernel */ #define MEDIA_API_VERSION ((0 << 16) | (1 << 8) | 0) -- 2.17.0