From patchwork Tue Jan 14 17:15:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takashi Iwai X-Patchwork-Id: 857263 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id ADE85C02183 for ; Tue, 14 Jan 2025 17:17:18 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [45.14.194.44]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 7B34A602A9; Tue, 14 Jan 2025 18:17:03 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 7B34A602A9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1736875033; bh=bysMRaQDivjVVIyBu/Gq2xy+1gEUxUxkgfmNXqC+v/s=; h=From:To:Subject:Date:In-Reply-To:References:List-Id:List-Archive: List-Help:List-Owner:List-Post:List-Subscribe:List-Unsubscribe: From; b=a88Jif9yC8IOY/J5vqsXEMMpRK3P45/JlGqcBxWQ9lJ0rUEPRfQ90VCpplLK9jSUG dtnMHjhRl+kj98eCJV05rh73Fhu6nSqADCBUwR1zFMB3+yhSiydy8vS4TGXCWDUqbG Ga5UODrZu9ktG3EjppHSJP2Hz7NPzu59oU71MqvI= Received: by alsa1.perex.cz (Postfix, from userid 50401) id C2A85F805BD; Tue, 14 Jan 2025 18:16:53 +0100 (CET) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 8C720F805C1; Tue, 14 Jan 2025 18:16:53 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id E5119F80563; Tue, 14 Jan 2025 18:15:53 +0100 (CET) Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2a07:de40:b251:101:10:150:64:2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id C98DCF80269 for ; Tue, 14 Jan 2025 18:15:43 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz C98DCF80269 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=qFCxn+s3; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=zaWek0Uf; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=qFCxn+s3; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=zaWek0Uf Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 58CC91F38F; Tue, 14 Jan 2025 17:15:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1736874942; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=01CBHOB1NSiGizGkFpIP8NmZkd6YvcM9Q+m6g5qmSdI=; b=qFCxn+s30egFSuX//id3OTJ1hd5nCKkSzsBKnoCdRsGQew/xq1uSBbTqM5dFVqvcMnHBqB 1F/hDliPln9mCk1NInyL0jLwPZcAGUDFiByOoo2DcMi86lkArqBMQN/JKe9O3YFSlP/IIQ /BPb9fZvq16gk+2a92iC3626DbwV3HA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1736874942; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=01CBHOB1NSiGizGkFpIP8NmZkd6YvcM9Q+m6g5qmSdI=; b=zaWek0UfQsUsE2fQvGyJrJ8ltbG3QuhoHjAFXLvabYnkX7tqeT7i2sHZAC27wBlfkcSuPK 9O8jUnDGeJL/bpBQ== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=qFCxn+s3; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=zaWek0Uf DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1736874942; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=01CBHOB1NSiGizGkFpIP8NmZkd6YvcM9Q+m6g5qmSdI=; b=qFCxn+s30egFSuX//id3OTJ1hd5nCKkSzsBKnoCdRsGQew/xq1uSBbTqM5dFVqvcMnHBqB 1F/hDliPln9mCk1NInyL0jLwPZcAGUDFiByOoo2DcMi86lkArqBMQN/JKe9O3YFSlP/IIQ /BPb9fZvq16gk+2a92iC3626DbwV3HA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1736874942; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=01CBHOB1NSiGizGkFpIP8NmZkd6YvcM9Q+m6g5qmSdI=; b=zaWek0UfQsUsE2fQvGyJrJ8ltbG3QuhoHjAFXLvabYnkX7tqeT7i2sHZAC27wBlfkcSuPK 9O8jUnDGeJL/bpBQ== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 3DFAF13AEB; Tue, 14 Jan 2025 17:15:42 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id SFjFDb6bhmdrFwAAD6G6ig (envelope-from ); Tue, 14 Jan 2025 17:15:42 +0000 From: Takashi Iwai To: alsa-devel@alsa-project.org Subject: [PATCH v2 1/5] Sync UAPI asound.h with 6.14 kernel Date: Tue, 14 Jan 2025 18:15:31 +0100 Message-ID: <20250114171538.2751-2-tiwai@suse.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250114171538.2751-1-tiwai@suse.de> References: <20250114171538.2751-1-tiwai@suse.de> MIME-Version: 1.0 X-Rspamd-Queue-Id: 58CC91F38F X-Rspamd-Action: no action X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[99.99%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; TO_DN_NONE(0.00)[]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; ASN(0.00)[asn:25478, ipnet:::/0, country:RU]; MIME_TRACE(0.00)[0:+]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:rdns,imap1.dmz-prg2.suse.org:helo,suse.de:dkim,suse.de:mid,suse.de:email]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; DKIM_TRACE(0.00)[suse.de:+] X-Rspamd-Server: rspamd1.dmz-prg2.suse.org Message-ID-Hash: GU6R374NPIKKCFADMWPJRZEBF7B7D6SG X-Message-ID-Hash: GU6R374NPIKKCFADMWPJRZEBF7B7D6SG X-MailFrom: tiwai@suse.de X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.9 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: There is a small update of rawmidi API for supporting the UMP tied device info and inactive flag. Signed-off-by: Takashi Iwai --- include/sound/uapi/asound.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/include/sound/uapi/asound.h b/include/sound/uapi/asound.h index 533b7e46cd17..1f91d994fa01 100644 --- a/include/sound/uapi/asound.h +++ b/include/sound/uapi/asound.h @@ -708,7 +708,7 @@ enum { * Raw MIDI section - /dev/snd/midi?? */ -#define SNDRV_RAWMIDI_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 4) +#define SNDRV_RAWMIDI_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 5) enum { SNDRV_RAWMIDI_STREAM_OUTPUT = 0, @@ -720,6 +720,9 @@ enum { #define SNDRV_RAWMIDI_INFO_INPUT 0x00000002 #define SNDRV_RAWMIDI_INFO_DUPLEX 0x00000004 #define SNDRV_RAWMIDI_INFO_UMP 0x00000008 +#define SNDRV_RAWMIDI_INFO_STREAM_INACTIVE 0x00000010 + +#define SNDRV_RAWMIDI_DEVICE_UNKNOWN 0 struct snd_rawmidi_info { unsigned int device; /* RO/WR (control): device number */ @@ -732,7 +735,8 @@ struct snd_rawmidi_info { unsigned char subname[32]; /* name of active or selected subdevice */ unsigned int subdevices_count; unsigned int subdevices_avail; - unsigned char reserved[64]; /* reserved for future use */ + int tied_device; /* R: tied rawmidi device (UMP/legacy) */ + unsigned char reserved[60]; /* reserved for future use */ }; #define SNDRV_RAWMIDI_MODE_FRAMING_MASK (7<<0)