From nobody Mon May 06 18:36:37 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VY99K4QJ4z5J2Zn; Mon, 06 May 2024 18:36:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VY99K2DnPz4sZ4; Mon, 6 May 2024 18:36:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715020597; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HvfXYkFJDYrRrB5E7eJp3urJNYE37Zcbn86SlfHeA1Q=; b=xKUQJNTs3QE8ToeoH8mlxWNxbf4yQV8dbcUo7Y08oBi/XsiPDWeqwLJ0x63mTON6fwiItk eH4roNhAjSGi8BuyyDNo/09iQFhjOl0XBfQwIeSHBTJJ6h92QUTSmUdsWC+mPtm4dEWo3Y CqlGSQzemyqb97Mly7iKBaB1Vi4Y9GTTEPoiF2HqwbASAxe0LqVAAhkKdOn03kkOKhQW8Q g4KRQjWY2xYhvJDXNRIlA88GhOuS4LPN8L8vy2/utE983uO3c7FmQwUTxOS0KZn2A59IOJ UVF74GTHpA/Ftpaz9EPENh/Q9uWKRdPokIRZ5cwKwfY+I0FDnNnmICt/CBmtRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715020597; a=rsa-sha256; cv=none; b=hy2sL40HZP36w5PhwLG3CXhDn6ZF1LLx9Zb5TluqnWnOqA9ep+/d1bZxqWxUfuPXForHWe /iPGn+nM8/5KnNcCsMxfL4xIiIWi+A61RHBzlYN6gLOzQ1sfhGO3atTEdT4c7se0G2hYob F3es3QWOg2Cv+HKwoFYsygaGSkojIfPe49f2XLVcDhb7c2/vRqq4m/ud4dc7PVkAEviKMz OtM+hb/KYcUu70lyXRvUhGzH608H4LsC45LWFszKhFee0A91AVhsELwBo1I8R+FcFaiFks DWqPowO+6csYrIu3O3/CRSd8kJHFF04Db37rTKBTqFtG/cAD3D577zZNdax2kg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715020597; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HvfXYkFJDYrRrB5E7eJp3urJNYE37Zcbn86SlfHeA1Q=; b=LSMDy4Kkyh6cCmq0qn5TW/m/buKtPH7qD1bRKLMaraBqnYkpvr8iM6qC3QTy6SGGocgU8a YbBnVn3ILpfVqtLer1Drs+dlFoIUiNc8YwOz4vlvATf8WaXKPLSfg/3FiAhpI/XjXbPVtb d1xqAHbyMbYt9yOwC0F/Jw6wJfifZ8r9DF/c9w2xvvlLoYzGTVnYk3cUKvjWstqm+nlBBq BUFxmCZuDpkUF/Duj4YlXDJVVgsQvonuZIxicpvPDiuio6BV0eRGcYDLiv/h8WySo4maPU r2KGumhIV2r8LJpgVGQ88IJxi91ovA30n73q3ElfxwPtLKVNpcDIIgr68BwmnA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VY99K1n4Cz17pN; Mon, 6 May 2024 18:36:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 446IabBe060182; Mon, 6 May 2024 18:36:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 446IabpK060179; Mon, 6 May 2024 18:36:37 GMT (envelope-from git) Date: Mon, 6 May 2024 18:36:37 GMT Message-Id: <202405061836.446IabpK060179@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 923e0040a59a - main - sound: Move chip.h contents to pcm/sound.h List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 923e0040a59af8ac2271d3e673fef1c641d0cce7 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=923e0040a59af8ac2271d3e673fef1c641d0cce7 commit 923e0040a59af8ac2271d3e673fef1c641d0cce7 Author: Christos Margiolis AuthorDate: 2024-05-06 18:32:12 +0000 Commit: Christos Margiolis CommitDate: 2024-05-06 18:35:55 +0000 sound: Move chip.h contents to pcm/sound.h Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D44997 --- sys/dev/sound/chip.h | 47 ---------------------------------------- sys/dev/sound/pci/csa.c | 1 - sys/dev/sound/pci/csamidi.c | 1 - sys/dev/sound/pci/csapcm.c | 1 - sys/dev/sound/pci/emu10kx-midi.c | 1 - sys/dev/sound/pci/emu10kx-pcm.c | 1 - sys/dev/sound/pci/emu10kx.c | 1 - sys/dev/sound/pci/hdspe-pcm.c | 1 - sys/dev/sound/pci/hdspe.c | 1 - sys/dev/sound/pci/solo.c | 1 - sys/dev/sound/pcm/sound.h | 16 ++++++++++++++ sys/dev/sound/usb/uaudio.c | 1 - sys/dev/sound/usb/uaudio_pcm.c | 1 - 13 files changed, 16 insertions(+), 58 deletions(-) diff --git a/sys/dev/sound/chip.h b/sys/dev/sound/chip.h deleted file mode 100644 index bb40d2809a00..000000000000 --- a/sys/dev/sound/chip.h +++ /dev/null @@ -1,47 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 1999 Seigo Tanimura - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -/* - * These are the function codes assigned to the children of - * sound cards. - */ -enum { - SCF_PCM, - SCF_MIDI, - SCF_SYNTH, -}; - -/* - * This is the device information struct, used by - * a bridge device to pass the device function code - * to the children. - */ -struct sndcard_func { - int func; /* The function code. */ - void *varinfo; /* Bridge-specific information. */ -}; diff --git a/sys/dev/sound/pci/csa.c b/sys/dev/sound/pci/csa.c index 7191f0cc4bf9..de7ae7be57c4 100644 --- a/sys/dev/sound/pci/csa.c +++ b/sys/dev/sound/pci/csa.c @@ -45,7 +45,6 @@ #endif #include -#include #include #include diff --git a/sys/dev/sound/pci/csamidi.c b/sys/dev/sound/pci/csamidi.c index df1699092990..29d5548b0954 100644 --- a/sys/dev/sound/pci/csamidi.c +++ b/sys/dev/sound/pci/csamidi.c @@ -43,7 +43,6 @@ #include #include -#include #include #include diff --git a/sys/dev/sound/pci/csapcm.c b/sys/dev/sound/pci/csapcm.c index 71b9a0253cdb..c8424dd3e433 100644 --- a/sys/dev/sound/pci/csapcm.c +++ b/sys/dev/sound/pci/csapcm.c @@ -36,7 +36,6 @@ #include #include -#include #include #include diff --git a/sys/dev/sound/pci/emu10kx-midi.c b/sys/dev/sound/pci/emu10kx-midi.c index 4ed8e6c1dd9c..2a98562f8f39 100644 --- a/sys/dev/sound/pci/emu10kx-midi.c +++ b/sys/dev/sound/pci/emu10kx-midi.c @@ -43,7 +43,6 @@ #include "opt_snd.h" #endif -#include #include #include diff --git a/sys/dev/sound/pci/emu10kx-pcm.c b/sys/dev/sound/pci/emu10kx-pcm.c index 825a39fc4e63..bef6b596646e 100644 --- a/sys/dev/sound/pci/emu10kx-pcm.c +++ b/sys/dev/sound/pci/emu10kx-pcm.c @@ -43,7 +43,6 @@ #include "opt_snd.h" #endif -#include #include #include diff --git a/sys/dev/sound/pci/emu10kx.c b/sys/dev/sound/pci/emu10kx.c index d17f5fb16d34..0f938597e06c 100644 --- a/sys/dev/sound/pci/emu10kx.c +++ b/sys/dev/sound/pci/emu10kx.c @@ -49,7 +49,6 @@ #include "opt_snd.h" #endif -#include #include #include diff --git a/sys/dev/sound/pci/hdspe-pcm.c b/sys/dev/sound/pci/hdspe-pcm.c index 0e78be113a66..e7fa03904595 100644 --- a/sys/dev/sound/pci/hdspe-pcm.c +++ b/sys/dev/sound/pci/hdspe-pcm.c @@ -34,7 +34,6 @@ #include #include -#include #include #include diff --git a/sys/dev/sound/pci/hdspe.c b/sys/dev/sound/pci/hdspe.c index f9c36df359e3..74a9ca968658 100644 --- a/sys/dev/sound/pci/hdspe.c +++ b/sys/dev/sound/pci/hdspe.c @@ -37,7 +37,6 @@ #include #include -#include #include #include diff --git a/sys/dev/sound/pci/solo.c b/sys/dev/sound/pci/solo.c index bee79e723696..82eabf3a4884 100644 --- a/sys/dev/sound/pci/solo.c +++ b/sys/dev/sound/pci/solo.c @@ -35,7 +35,6 @@ #include #include -#include #include "mixer_if.h" diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index 6c9f4c8f18b2..d2ec480b45b0 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -321,6 +321,22 @@ void snd_mtxassert(void *m); int sndstat_register(device_t dev, char *str); int sndstat_unregister(device_t dev); +/* These are the function codes assigned to the children of sound cards. */ +enum { + SCF_PCM, + SCF_MIDI, + SCF_SYNTH, +}; + +/* + * This is the device information struct, used by a bridge device to pass the + * device function code to the children. + */ +struct sndcard_func { + int func; /* The function code. */ + void *varinfo; /* Bridge-specific information. */ +}; + /* * this is rather kludgey- we need to duplicate these struct def'ns from sound.c * so that the macro versions of pcm_{,un}lock can dereference them. diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c index 2351c2522021..d47eb86ed271 100644 --- a/sys/dev/sound/usb/uaudio.c +++ b/sys/dev/sound/usb/uaudio.c @@ -90,7 +90,6 @@ #include #include #include -#include #include "feeder_if.h" static int uaudio_default_rate = 0; /* use rate list */ diff --git a/sys/dev/sound/usb/uaudio_pcm.c b/sys/dev/sound/usb/uaudio_pcm.c index 9b17cb232907..0b3da9b20440 100644 --- a/sys/dev/sound/usb/uaudio_pcm.c +++ b/sys/dev/sound/usb/uaudio_pcm.c @@ -32,7 +32,6 @@ #endif #include -#include #include #include "mixer_if.h"