Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 16 Aug 2023 12:32:56 -0600
From:      Warner Losh <imp@bsdimp.com>
To:        Kevin Bowling <kevin.bowling@kev009.com>
Cc:        Warner Losh <imp@freebsd.org>, src-committers <src-committers@freebsd.org>,  "<dev-commits-src-all@freebsd.org>" <dev-commits-src-all@freebsd.org>,  "<dev-commits-src-main@freebsd.org>" <dev-commits-src-main@freebsd.org>
Subject:   Re: git: 82a265ad9bad - main - sys: Remove $FreeBSD$: sound driver version
Message-ID:  <CANCZdfq1eMeBOVMA14h0Q3AdKdA_mvdSzwnJvOrBHKDAkcwTBQ@mail.gmail.com>
In-Reply-To: <CAK7dMtDb8xCCat-wt-pev9fLmk4t3XtEV_qbO1EDOLEv=qZuBQ@mail.gmail.com>
References:  <202308161756.37GHufPp058798@gitrepo.freebsd.org> <CAK7dMtDb8xCCat-wt-pev9fLmk4t3XtEV_qbO1EDOLEv=qZuBQ@mail.gmail.com>

next in thread | previous in thread | raw e-mail | index | archive | help
--000000000000ea271906030e8687
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Wed, Aug 16, 2023, 12:12 PM Kevin Bowling <kevin.bowling@kev009.com>
wrote:

> On Wed, Aug 16, 2023 at 10:56=E2=80=AFAM Warner Losh <imp@freebsd.org> wr=
ote:
> >
> > The branch main has been updated by imp:
> >
> > URL:
> https://cgit.FreeBSD.org/src/commit/?id=3D82a265ad9bad315000a2d60b853c466=
9f1600cd0
> >
> > commit 82a265ad9bad315000a2d60b853c4669f1600cd0
> > Author:     Warner Losh <imp@FreeBSD.org>
> > AuthorDate: 2023-08-16 17:53:59 +0000
> > Commit:     Warner Losh <imp@FreeBSD.org>
> > CommitDate: 2023-08-16 17:53:59 +0000
> >
> >     sys: Remove $FreeBSD$: sound driver version
> >
> >     Remove /SND_DECLARE_FILE\("\$FreeBSD\$"\);/
>
> It seems like SND_DECLARE_FILE(""); should probably go away or the
> string within shall be dropped.  Its idea of 'uniq' is a little
> concerning.
>

Likely. It actually adds the driver to a list, so I didn't just remove it.

Warner

> ---
> >  sys/arm/broadcom/bcm2835/bcm2835_audio.c | 2 +-
> >  sys/dev/sound/pci/als4000.c              | 2 +-
> >  sys/dev/sound/pci/atiixp.c               | 2 +-
> >  sys/dev/sound/pci/cmi.c                  | 2 +-
> >  sys/dev/sound/pci/cs4281.c               | 2 +-
> >  sys/dev/sound/pci/csa.c                  | 2 +-
> >  sys/dev/sound/pci/csamidi.c              | 2 +-
> >  sys/dev/sound/pci/csapcm.c               | 2 +-
> >  sys/dev/sound/pci/emu10k1.c              | 2 +-
> >  sys/dev/sound/pci/envy24.c               | 2 +-
> >  sys/dev/sound/pci/envy24ht.c             | 2 +-
> >  sys/dev/sound/pci/es137x.c               | 2 +-
> >  sys/dev/sound/pci/fm801.c                | 2 +-
> >  sys/dev/sound/pci/hda/hdaa.c             | 2 +-
> >  sys/dev/sound/pci/hda/hdaa_patches.c     | 2 +-
> >  sys/dev/sound/pci/hda/hdac.c             | 2 +-
> >  sys/dev/sound/pci/hda/hdacc.c            | 2 +-
> >  sys/dev/sound/pci/hdspe-pcm.c            | 2 +-
> >  sys/dev/sound/pci/hdspe.c                | 2 +-
> >  sys/dev/sound/pci/ich.c                  | 2 +-
> >  sys/dev/sound/pci/maestro3.c             | 2 +-
> >  sys/dev/sound/pci/neomagic.c             | 2 +-
> >  sys/dev/sound/pci/solo.c                 | 2 +-
> >  sys/dev/sound/pci/t4dwave.c              | 2 +-
> >  sys/dev/sound/pci/via8233.c              | 2 +-
> >  sys/dev/sound/pci/via82c686.c            | 2 +-
> >  sys/dev/sound/pci/vibes.c                | 2 +-
> >  sys/dev/sound/pcm/ac97.c                 | 2 +-
> >  sys/dev/sound/pcm/ac97_patch.c           | 2 +-
> >  sys/dev/sound/pcm/buffer.c               | 2 +-
> >  sys/dev/sound/pcm/channel.c              | 2 +-
> >  sys/dev/sound/pcm/dsp.c                  | 2 +-
> >  sys/dev/sound/pcm/feeder.c               | 2 +-
> >  sys/dev/sound/pcm/feeder_chain.c         | 2 +-
> >  sys/dev/sound/pcm/feeder_eq.c            | 2 +-
> >  sys/dev/sound/pcm/feeder_format.c        | 2 +-
> >  sys/dev/sound/pcm/feeder_matrix.c        | 2 +-
> >  sys/dev/sound/pcm/feeder_mixer.c         | 2 +-
> >  sys/dev/sound/pcm/feeder_rate.c          | 2 +-
> >  sys/dev/sound/pcm/feeder_volume.c        | 2 +-
> >  sys/dev/sound/pcm/mixer.c                | 2 +-
> >  sys/dev/sound/pcm/sndstat.c              | 2 +-
> >  sys/dev/sound/pcm/sound.c                | 2 +-
> >  sys/dev/sound/pcm/vchan.c                | 2 +-
> >  44 files changed, 44 insertions(+), 44 deletions(-)
> >
> > diff --git a/sys/arm/broadcom/bcm2835/bcm2835_audio.c
> b/sys/arm/broadcom/bcm2835/bcm2835_audio.c
> > index 36b1dc86535b..0d430cf19df7 100644
> > --- a/sys/arm/broadcom/bcm2835/bcm2835_audio.c
> > +++ b/sys/arm/broadcom/bcm2835/bcm2835_audio.c
> > @@ -38,7 +38,7 @@
> >
> >  #include "vc_vchi_audioserv_defs.h"
> >
> > -SND_DECLARE_FILE("$FreeBSD$");
> > +SND_DECLARE_FILE("");
> >
> >  /* Audio destination */
> >  #define        DEST_AUTO               0
> > diff --git a/sys/dev/sound/pci/als4000.c b/sys/dev/sound/pci/als4000.c
> > index 71f6c4f909c7..89f7d6385493 100644
> > --- a/sys/dev/sound/pci/als4000.c
> > +++ b/sys/dev/sound/pci/als4000.c
> > @@ -48,7 +48,7 @@
> >
> >  #include "mixer_if.h"
> >
> > -SND_DECLARE_FILE("$FreeBSD$");
> > +SND_DECLARE_FILE("");
> >
> >  /* Debugging macro's */
> >  #undef DEB
> > diff --git a/sys/dev/sound/pci/atiixp.c b/sys/dev/sound/pci/atiixp.c
> > index 83eee21a333e..99468367c998 100644
> > --- a/sys/dev/sound/pci/atiixp.c
> > +++ b/sys/dev/sound/pci/atiixp.c
> > @@ -69,7 +69,7 @@
> >
> >  #include <dev/sound/pci/atiixp.h>
> >
> > -SND_DECLARE_FILE("$FreeBSD$");
> > +SND_DECLARE_FILE("");
> >
> >  #define ATI_IXP_DMA_RETRY_MAX  100
> >
> > diff --git a/sys/dev/sound/pci/cmi.c b/sys/dev/sound/pci/cmi.c
> > index 6b4acbb4ddae..89a1eb24d878 100644
> > --- a/sys/dev/sound/pci/cmi.c
> > +++ b/sys/dev/sound/pci/cmi.c
> > @@ -61,7 +61,7 @@
> >  #include "mixer_if.h"
> >  #include "mpufoi_if.h"
> >
> > -SND_DECLARE_FILE("$FreeBSD$");
> > +SND_DECLARE_FILE("");
> >
> >  /* Supported chip ID's */
> >  #define CMI8338A_PCI_ID   0x010013f6
> > diff --git a/sys/dev/sound/pci/cs4281.c b/sys/dev/sound/pci/cs4281.c
> > index b011f67e763e..fccbf807d965 100644
> > --- a/sys/dev/sound/pci/cs4281.c
> > +++ b/sys/dev/sound/pci/cs4281.c
> > @@ -45,7 +45,7 @@
> >
> >  #include <dev/sound/pci/cs4281.h>
> >
> > -SND_DECLARE_FILE("$FreeBSD$");
> > +SND_DECLARE_FILE("");
> >
> >  #define CS4281_DEFAULT_BUFSZ 16384
> >
> > diff --git a/sys/dev/sound/pci/csa.c b/sys/dev/sound/pci/csa.c
> > index a03f319d85d5..68edfd9338c2 100644
> > --- a/sys/dev/sound/pci/csa.c
> > +++ b/sys/dev/sound/pci/csa.c
> > @@ -54,7 +54,7 @@
> >
> >  #include <dev/sound/pci/cs461x_dsp.h>
> >
> > -SND_DECLARE_FILE("$FreeBSD$");
> > +SND_DECLARE_FILE("");
> >
> >  /* This is the pci device id. */
> >  #define CS4610_PCI_ID 0x60011013
> > diff --git a/sys/dev/sound/pci/csamidi.c b/sys/dev/sound/pci/csamidi.c
> > index e9d6006544b3..cc4b41f86af9 100644
> > --- a/sys/dev/sound/pci/csamidi.c
> > +++ b/sys/dev/sound/pci/csamidi.c
> > @@ -54,7 +54,7 @@
> >
> >  #include "mpufoi_if.h"
> >
> > -SND_DECLARE_FILE("$FreeBSD$");
> > +SND_DECLARE_FILE("");
> >
> >  /* pulled from mpu401.c */
> >  #define        MPU_DATAPORT    0
> > diff --git a/sys/dev/sound/pci/csapcm.c b/sys/dev/sound/pci/csapcm.c
> > index d915a14a536f..14820a9c2216 100644
> > --- a/sys/dev/sound/pci/csapcm.c
> > +++ b/sys/dev/sound/pci/csapcm.c
> > @@ -43,7 +43,7 @@
> >  #include <dev/pci/pcireg.h>
> >  #include <dev/pci/pcivar.h>
> >
> > -SND_DECLARE_FILE("$FreeBSD$");
> > +SND_DECLARE_FILE("");
> >
> >  /* Buffer size on dma transfer. Fixed for CS416x. */
> >  #define CS461x_BUFFSIZE   (4 * 1024)
> > diff --git a/sys/dev/sound/pci/emu10k1.c b/sys/dev/sound/pci/emu10k1.c
> > index abb586e34525..d4624a549e42 100644
> > --- a/sys/dev/sound/pci/emu10k1.c
> > +++ b/sys/dev/sound/pci/emu10k1.c
> > @@ -43,7 +43,7 @@
> >  #include <dev/sound/midi/mpu401.h>
> >  #include "mpufoi_if.h"
> >
> > -SND_DECLARE_FILE("$FreeBSD$");
> > +SND_DECLARE_FILE("");
> >
> >  /* -------------------------------------------------------------------=
-
> */
> >
> > diff --git a/sys/dev/sound/pci/envy24.c b/sys/dev/sound/pci/envy24.c
> > index b95a3438ce79..8039d4e3186c 100644
> > --- a/sys/dev/sound/pci/envy24.c
> > +++ b/sys/dev/sound/pci/envy24.c
> > @@ -41,7 +41,7 @@
> >
> >  #include "mixer_if.h"
> >
> > -SND_DECLARE_FILE("$FreeBSD$");
> > +SND_DECLARE_FILE("");
> >
> >  static MALLOC_DEFINE(M_ENVY24, "envy24", "envy24 audio");
> >
> > diff --git a/sys/dev/sound/pci/envy24ht.c b/sys/dev/sound/pci/envy24ht.=
c
> > index 4bfef99f600f..e9b6771e2162 100644
> > --- a/sys/dev/sound/pci/envy24ht.c
> > +++ b/sys/dev/sound/pci/envy24ht.c
> > @@ -53,7 +53,7 @@
> >
> >  #include "mixer_if.h"
> >
> > -SND_DECLARE_FILE("$FreeBSD$");
> > +SND_DECLARE_FILE("");
> >
> >  static MALLOC_DEFINE(M_ENVY24HT, "envy24ht", "envy24ht audio");
> >
> > diff --git a/sys/dev/sound/pci/es137x.c b/sys/dev/sound/pci/es137x.c
> > index f1c94f16a123..a11a106fee2f 100644
> > --- a/sys/dev/sound/pci/es137x.c
> > +++ b/sys/dev/sound/pci/es137x.c
> > @@ -90,7 +90,7 @@
> >
> >  #include "mixer_if.h"
> >
> > -SND_DECLARE_FILE("$FreeBSD$");
> > +SND_DECLARE_FILE("");
> >
> >  #define MEM_MAP_REG 0x14
> >
> > diff --git a/sys/dev/sound/pci/fm801.c b/sys/dev/sound/pci/fm801.c
> > index 2469fdba967f..34fb1f6f1bf6 100644
> > --- a/sys/dev/sound/pci/fm801.c
> > +++ b/sys/dev/sound/pci/fm801.c
> > @@ -35,7 +35,7 @@
> >  #include <dev/pci/pcireg.h>
> >  #include <dev/pci/pcivar.h>
> >
> > -SND_DECLARE_FILE("$FreeBSD$");
> > +SND_DECLARE_FILE("");
> >
> >  #define PCI_VENDOR_FORTEMEDIA  0x1319
> >  #define PCI_DEVICE_FORTEMEDIA1 0x08011319      /* Audio controller */
> > diff --git a/sys/dev/sound/pci/hda/hdaa.c b/sys/dev/sound/pci/hda/hdaa.=
c
> > index c7706d2bd967..ef8f634ac8e8 100644
> > --- a/sys/dev/sound/pci/hda/hdaa.c
> > +++ b/sys/dev/sound/pci/hda/hdaa.c
> > @@ -47,7 +47,7 @@
> >
> >  #include "mixer_if.h"
> >
> > -SND_DECLARE_FILE("$FreeBSD$");
> > +SND_DECLARE_FILE("");
> >
> >  #define hdaa_lock(devinfo)     snd_mtxlock((devinfo)->lock)
> >  #define hdaa_unlock(devinfo)   snd_mtxunlock((devinfo)->lock)
> > diff --git a/sys/dev/sound/pci/hda/hdaa_patches.c
> b/sys/dev/sound/pci/hda/hdaa_patches.c
> > index bec8590745c5..8331312b69c9 100644
> > --- a/sys/dev/sound/pci/hda/hdaa_patches.c
> > +++ b/sys/dev/sound/pci/hda/hdaa_patches.c
> > @@ -47,7 +47,7 @@
> >  #include "pin_patch.h"
> >  #include "pin_patch_realtek.h"
> >
> > -SND_DECLARE_FILE("$FreeBSD$");
> > +SND_DECLARE_FILE("");
> >
> >  static const struct {
> >         uint32_t model;
> > diff --git a/sys/dev/sound/pci/hda/hdac.c b/sys/dev/sound/pci/hda/hdac.=
c
> > index aca9bd7ac9ab..79ab71516cd9 100644
> > --- a/sys/dev/sound/pci/hda/hdac.c
> > +++ b/sys/dev/sound/pci/hda/hdac.c
> > @@ -51,7 +51,7 @@
> >
> >  #define HDA_DRV_TEST_REV       "20120126_0002"
> >
> > -SND_DECLARE_FILE("$FreeBSD$");
> > +SND_DECLARE_FILE("");
> >
> >  #define hdac_lock(sc)          snd_mtxlock((sc)->lock)
> >  #define hdac_unlock(sc)                snd_mtxunlock((sc)->lock)
> > diff --git a/sys/dev/sound/pci/hda/hdacc.c
> b/sys/dev/sound/pci/hda/hdacc.c
> > index 33eea6ef67c5..4616b3b23a48 100644
> > --- a/sys/dev/sound/pci/hda/hdacc.c
> > +++ b/sys/dev/sound/pci/hda/hdacc.c
> > @@ -43,7 +43,7 @@
> >  #include <dev/sound/pci/hda/hda_reg.h>
> >  #include <dev/sound/pci/hda/hdac.h>
> >
> > -SND_DECLARE_FILE("$FreeBSD$");
> > +SND_DECLARE_FILE("");
> >
> >  struct hdacc_fg {
> >         device_t        dev;
> > diff --git a/sys/dev/sound/pci/hdspe-pcm.c
> b/sys/dev/sound/pci/hdspe-pcm.c
> > index 6de5b353ab5b..b23304d32fc7 100644
> > --- a/sys/dev/sound/pci/hdspe-pcm.c
> > +++ b/sys/dev/sound/pci/hdspe-pcm.c
> > @@ -40,7 +40,7 @@
> >
> >  #include <mixer_if.h>
> >
> > -SND_DECLARE_FILE("$FreeBSD$");
> > +SND_DECLARE_FILE("");
> >
> >  struct hdspe_latency {
> >         uint32_t n;
> > diff --git a/sys/dev/sound/pci/hdspe.c b/sys/dev/sound/pci/hdspe.c
> > index 943c20bba4f1..ac253b28df3a 100644
> > --- a/sys/dev/sound/pci/hdspe.c
> > +++ b/sys/dev/sound/pci/hdspe.c
> > @@ -40,7 +40,7 @@
> >
> >  #include <mixer_if.h>
> >
> > -SND_DECLARE_FILE("$FreeBSD$");
> > +SND_DECLARE_FILE("");
> >
> >  static struct hdspe_channel chan_map_aio[] =3D {
> >         {  0,  1,   "line", 1, 1 },
> > diff --git a/sys/dev/sound/pci/ich.c b/sys/dev/sound/pci/ich.c
> > index feb0175d2839..d5e8a48a186c 100644
> > --- a/sys/dev/sound/pci/ich.c
> > +++ b/sys/dev/sound/pci/ich.c
> > @@ -38,7 +38,7 @@
> >  #include <dev/pci/pcireg.h>
> >  #include <dev/pci/pcivar.h>
> >
> > -SND_DECLARE_FILE("$FreeBSD$");
> > +SND_DECLARE_FILE("");
> >
> >  /* -------------------------------------------------------------------=
-
> */
> >
> > diff --git a/sys/dev/sound/pci/maestro3.c b/sys/dev/sound/pci/maestro3.=
c
> > index f46b587daf7c..c60c69b6baf5 100644
> > --- a/sys/dev/sound/pci/maestro3.c
> > +++ b/sys/dev/sound/pci/maestro3.c
> > @@ -69,7 +69,7 @@
> >  #include <dev/sound/pci/allegro_reg.h>
> >  #include <dev/sound/pci/allegro_code.h>
> >
> > -SND_DECLARE_FILE("$FreeBSD$");
> > +SND_DECLARE_FILE("");
> >
> >  /* -------------------------------------------------------------------=
-
> */
> >
> > diff --git a/sys/dev/sound/pci/neomagic.c b/sys/dev/sound/pci/neomagic.=
c
> > index 5616223b7590..162d99b57c70 100644
> > --- a/sys/dev/sound/pci/neomagic.c
> > +++ b/sys/dev/sound/pci/neomagic.c
> > @@ -40,7 +40,7 @@
> >  #include <dev/pci/pcireg.h>
> >  #include <dev/pci/pcivar.h>
> >
> > -SND_DECLARE_FILE("$FreeBSD$");
> > +SND_DECLARE_FILE("");
> >
> >  /* -------------------------------------------------------------------=
-
> */
> >
> > diff --git a/sys/dev/sound/pci/solo.c b/sys/dev/sound/pci/solo.c
> > index dc8351e9c117..1788929811ed 100644
> > --- a/sys/dev/sound/pci/solo.c
> > +++ b/sys/dev/sound/pci/solo.c
> > @@ -39,7 +39,7 @@
> >
> >  #include "mixer_if.h"
> >
> > -SND_DECLARE_FILE("$FreeBSD$");
> > +SND_DECLARE_FILE("");
> >
> >  #define SOLO_DEFAULT_BUFSZ 16384
> >  #define ABS(x) (((x) < 0)? -(x) : (x))
> > diff --git a/sys/dev/sound/pci/t4dwave.c b/sys/dev/sound/pci/t4dwave.c
> > index fc99a90b94e7..b7363402ba8b 100644
> > --- a/sys/dev/sound/pci/t4dwave.c
> > +++ b/sys/dev/sound/pci/t4dwave.c
> > @@ -37,7 +37,7 @@
> >  #include <dev/pci/pcireg.h>
> >  #include <dev/pci/pcivar.h>
> >
> > -SND_DECLARE_FILE("$FreeBSD$");
> > +SND_DECLARE_FILE("");
> >
> >  /* -------------------------------------------------------------------=
-
> */
> >
> > diff --git a/sys/dev/sound/pci/via8233.c b/sys/dev/sound/pci/via8233.c
> > index 9de5b18cd031..6656670c9e1c 100644
> > --- a/sys/dev/sound/pci/via8233.c
> > +++ b/sys/dev/sound/pci/via8233.c
> > @@ -50,7 +50,7 @@
> >
> >  #include <dev/sound/pci/via8233.h>
> >
> > -SND_DECLARE_FILE("$FreeBSD$");
> > +SND_DECLARE_FILE("");
> >
> >  #define VIA8233_PCI_ID 0x30591106
> >
> > diff --git a/sys/dev/sound/pci/via82c686.c
> b/sys/dev/sound/pci/via82c686.c
> > index 6bd604941cf8..076df8c81aa0 100644
> > --- a/sys/dev/sound/pci/via82c686.c
> > +++ b/sys/dev/sound/pci/via82c686.c
> > @@ -39,7 +39,7 @@
> >
> >  #include <dev/sound/pci/via82c686.h>
> >
> > -SND_DECLARE_FILE("$FreeBSD$");
> > +SND_DECLARE_FILE("");
> >
> >  #define VIA_PCI_ID 0x30581106
> >  #define        NSEGS           4       /* Number of segments in SGD
> table */
> > diff --git a/sys/dev/sound/pci/vibes.c b/sys/dev/sound/pci/vibes.c
> > index 81401796d68c..1299f15dc814 100644
> > --- a/sys/dev/sound/pci/vibes.c
> > +++ b/sys/dev/sound/pci/vibes.c
> > @@ -44,7 +44,7 @@
> >
> >  #include "mixer_if.h"
> >
> > -SND_DECLARE_FILE("$FreeBSD$");
> > +SND_DECLARE_FILE("");
> >
> >  /*
> -------------------------------------------------------------------------=
 */
> >  /* Constants */
> > diff --git a/sys/dev/sound/pcm/ac97.c b/sys/dev/sound/pcm/ac97.c
> > index 763188291009..d83e3f2fefa5 100644
> > --- a/sys/dev/sound/pcm/ac97.c
> > +++ b/sys/dev/sound/pcm/ac97.c
> > @@ -38,7 +38,7 @@
> >
> >  #include "mixer_if.h"
> >
> > -SND_DECLARE_FILE("$FreeBSD$");
> > +SND_DECLARE_FILE("");
> >
> >  static MALLOC_DEFINE(M_AC97, "ac97", "ac97 codec");
> >
> > diff --git a/sys/dev/sound/pcm/ac97_patch.c
> b/sys/dev/sound/pcm/ac97_patch.c
> > index f1a358b50958..aff8075fe96c 100644
> > --- a/sys/dev/sound/pcm/ac97_patch.c
> > +++ b/sys/dev/sound/pcm/ac97_patch.c
> > @@ -34,7 +34,7 @@
> >  #include <dev/sound/pcm/ac97.h>
> >  #include <dev/sound/pcm/ac97_patch.h>
> >
> > -SND_DECLARE_FILE("$FreeBSD$");
> > +SND_DECLARE_FILE("");
> >
> >  void ad1886_patch(struct ac97_info* codec)
> >  {
> > diff --git a/sys/dev/sound/pcm/buffer.c b/sys/dev/sound/pcm/buffer.c
> > index d75890eaddfb..d5a519362c5e 100644
> > --- a/sys/dev/sound/pcm/buffer.c
> > +++ b/sys/dev/sound/pcm/buffer.c
> > @@ -40,7 +40,7 @@
> >  #define        SND_DECLARE_FXDIV
> >  #include "snd_fxdiv_gen.h"
> >
> > -SND_DECLARE_FILE("$FreeBSD$");
> > +SND_DECLARE_FILE("");
> >
> >  struct snd_dbuf *
> >  sndbuf_create(device_t dev, char *drv, char *desc, struct pcm_channel
> *channel)
> > diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c
> > index 1d192de54712..d56f5fb51dc9 100644
> > --- a/sys/dev/sound/pcm/channel.c
> > +++ b/sys/dev/sound/pcm/channel.c
> > @@ -38,7 +38,7 @@
> >
> >  #include "feeder_if.h"
> >
> > -SND_DECLARE_FILE("$FreeBSD$");
> > +SND_DECLARE_FILE("");
> >
> >  int report_soft_formats =3D 1;
> >  SYSCTL_INT(_hw_snd, OID_AUTO, report_soft_formats, CTLFLAG_RW,
> > diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c
> > index bb435bc3925c..98d241e65a52 100644
> > --- a/sys/dev/sound/pcm/dsp.c
> > +++ b/sys/dev/sound/pcm/dsp.c
> > @@ -43,7 +43,7 @@
> >  #include <vm/vm_page.h>
> >  #include <vm/vm_pager.h>
> >
> > -SND_DECLARE_FILE("$FreeBSD$");
> > +SND_DECLARE_FILE("");
> >
> >  static int dsp_mmap_allow_prot_exec =3D 0;
> >  SYSCTL_INT(_hw_snd, OID_AUTO, compat_linux_mmap, CTLFLAG_RWTUN,
> > diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c
> > index d379d06b8664..8fb377533907 100644
> > --- a/sys/dev/sound/pcm/feeder.c
> > +++ b/sys/dev/sound/pcm/feeder.c
> > @@ -35,7 +35,7 @@
> >
> >  #include "feeder_if.h"
> >
> > -SND_DECLARE_FILE("$FreeBSD$");
> > +SND_DECLARE_FILE("");
> >
> >  static MALLOC_DEFINE(M_FEEDER, "feeder", "pcm feeder");
> >
> > diff --git a/sys/dev/sound/pcm/feeder_chain.c
> b/sys/dev/sound/pcm/feeder_chain.c
> > index 9c3baaf282b5..01def5f6e9cb 100644
> > --- a/sys/dev/sound/pcm/feeder_chain.c
> > +++ b/sys/dev/sound/pcm/feeder_chain.c
> > @@ -34,7 +34,7 @@
> >
> >  #include "feeder_if.h"
> >
> > -SND_DECLARE_FILE("$FreeBSD$");
> > +SND_DECLARE_FILE("");
> >
> >  /* chain state */
> >  struct feeder_chain_state {
> > diff --git a/sys/dev/sound/pcm/feeder_eq.c
> b/sys/dev/sound/pcm/feeder_eq.c
> > index bc39d33c03fb..70797a706367 100644
> > --- a/sys/dev/sound/pcm/feeder_eq.c
> > +++ b/sys/dev/sound/pcm/feeder_eq.c
> > @@ -46,7 +46,7 @@
> >  #define SND_USE_FXDIV
> >  #include "snd_fxdiv_gen.h"
> >
> > -SND_DECLARE_FILE("$FreeBSD$");
> > +SND_DECLARE_FILE("");
> >  #endif
> >
> >  #include "feeder_eq_gen.h"
> > diff --git a/sys/dev/sound/pcm/feeder_format.c
> b/sys/dev/sound/pcm/feeder_format.c
> > index 8a9054561b2b..3a741430e0ca 100644
> > --- a/sys/dev/sound/pcm/feeder_format.c
> > +++ b/sys/dev/sound/pcm/feeder_format.c
> > @@ -44,7 +44,7 @@
> >  #define SND_USE_FXDIV
> >  #include "snd_fxdiv_gen.h"
> >
> > -SND_DECLARE_FILE("$FreeBSD$");
> > +SND_DECLARE_FILE("");
> >  #endif
> >
> >  #define FEEDFORMAT_RESERVOIR   (SND_CHN_MAX * PCM_32_BPS)
> > diff --git a/sys/dev/sound/pcm/feeder_matrix.c
> b/sys/dev/sound/pcm/feeder_matrix.c
> > index 33bf3ec11ee0..0afdb47c04d8 100644
> > --- a/sys/dev/sound/pcm/feeder_matrix.c
> > +++ b/sys/dev/sound/pcm/feeder_matrix.c
> > @@ -54,7 +54,7 @@
> >  #define SND_USE_FXDIV
> >  #include "snd_fxdiv_gen.h"
> >
> > -SND_DECLARE_FILE("$FreeBSD$");
> > +SND_DECLARE_FILE("");
> >  #endif
> >
> >  #define FEEDMATRIX_RESERVOIR   (SND_CHN_MAX * PCM_32_BPS)
> > diff --git a/sys/dev/sound/pcm/feeder_mixer.c
> b/sys/dev/sound/pcm/feeder_mixer.c
> > index 13afceabf28e..42ebe89d7c09 100644
> > --- a/sys/dev/sound/pcm/feeder_mixer.c
> > +++ b/sys/dev/sound/pcm/feeder_mixer.c
> > @@ -38,7 +38,7 @@
> >  #define SND_USE_FXDIV
> >  #include "snd_fxdiv_gen.h"
> >
> > -SND_DECLARE_FILE("$FreeBSD$");
> > +SND_DECLARE_FILE("");
> >  #endif
> >
> >  #undef SND_FEEDER_MULTIFORMAT
> > diff --git a/sys/dev/sound/pcm/feeder_rate.c
> b/sys/dev/sound/pcm/feeder_rate.c
> > index 0784c477197a..b2afe0651bf5 100644
> > --- a/sys/dev/sound/pcm/feeder_rate.c
> > +++ b/sys/dev/sound/pcm/feeder_rate.c
> > @@ -61,7 +61,7 @@
> >  #define SND_USE_FXDIV
> >  #include "snd_fxdiv_gen.h"
> >
> > -SND_DECLARE_FILE("$FreeBSD$");
> > +SND_DECLARE_FILE("");
> >  #endif
> >
> >  #include "feeder_rate_gen.h"
> > diff --git a/sys/dev/sound/pcm/feeder_volume.c
> b/sys/dev/sound/pcm/feeder_volume.c
> > index 724d5a0922e8..fa11a089af76 100644
> > --- a/sys/dev/sound/pcm/feeder_volume.c
> > +++ b/sys/dev/sound/pcm/feeder_volume.c
> > @@ -39,7 +39,7 @@
> >  #define SND_USE_FXDIV
> >  #include "snd_fxdiv_gen.h"
> >
> > -SND_DECLARE_FILE("$FreeBSD$");
> > +SND_DECLARE_FILE("");
> >  #endif
> >
> >  typedef void (*feed_volume_t)(int *, int *, uint32_t, uint8_t *,
> uint32_t);
> > diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c
> > index 080daeced12d..0c7576390b72 100644
> > --- a/sys/dev/sound/pcm/mixer.c
> > +++ b/sys/dev/sound/pcm/mixer.c
> > @@ -37,7 +37,7 @@
> >  #include "feeder_if.h"
> >  #include "mixer_if.h"
> >
> > -SND_DECLARE_FILE("$FreeBSD$");
> > +SND_DECLARE_FILE("");
> >
> >  static MALLOC_DEFINE(M_MIXER, "mixer", "mixer");
> >
> > diff --git a/sys/dev/sound/pcm/sndstat.c b/sys/dev/sound/pcm/sndstat.c
> > index 64e0a1ca5d82..fc92bd783587 100644
> > --- a/sys/dev/sound/pcm/sndstat.c
> > +++ b/sys/dev/sound/pcm/sndstat.c
> > @@ -50,7 +50,7 @@
> >  #include <dev/sound/version.h>
> >
> >
> > -SND_DECLARE_FILE("$FreeBSD$");
> > +SND_DECLARE_FILE("");
> >
> >  #define        SS_TYPE_MODULE          0
> >  #define        SS_TYPE_PCM             1
> > diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c
> > index 1a7f8dc2fa68..17dc8d968b3c 100644
> > --- a/sys/dev/sound/pcm/sound.c
> > +++ b/sys/dev/sound/pcm/sound.c
> > @@ -44,7 +44,7 @@
> >
> >  #include "feeder_if.h"
> >
> > -SND_DECLARE_FILE("$FreeBSD$");
> > +SND_DECLARE_FILE("");
> >
> >  devclass_t pcm_devclass;
> >
> > diff --git a/sys/dev/sound/pcm/vchan.c b/sys/dev/sound/pcm/vchan.c
> > index 0b0ddc224094..c84d8f14e075 100644
> > --- a/sys/dev/sound/pcm/vchan.c
> > +++ b/sys/dev/sound/pcm/vchan.c
> > @@ -36,7 +36,7 @@
> >  #include <dev/sound/pcm/sound.h>
> >  #include <dev/sound/pcm/vchan.h>
> >
> > -SND_DECLARE_FILE("$FreeBSD$");
> > +SND_DECLARE_FILE("");
> >
> >  /*
> >   * [ac3 , dts , linear , 0, linear, 0]
> >
>

--000000000000ea271906030e8687
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

<div dir=3D"auto"><div><br><br><div class=3D"gmail_quote"><div dir=3D"ltr" =
class=3D"gmail_attr">On Wed, Aug 16, 2023, 12:12 PM Kevin Bowling &lt;<a hr=
ef=3D"mailto:kevin.bowling@kev009.com">kevin.bowling@kev009.com</a>&gt; wro=
te:<br></div><blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;b=
order-left:1px #ccc solid;padding-left:1ex">On Wed, Aug 16, 2023 at 10:56=
=E2=80=AFAM Warner Losh &lt;<a href=3D"mailto:imp@freebsd.org" target=3D"_b=
lank" rel=3D"noreferrer">imp@freebsd.org</a>&gt; wrote:<br>
&gt;<br>
&gt; The branch main has been updated by imp:<br>
&gt;<br>
&gt; URL: <a href=3D"https://cgit.FreeBSD.org/src/commit/?id=3D82a265ad9bad=
315000a2d60b853c4669f1600cd0" rel=3D"noreferrer noreferrer" target=3D"_blan=
k">https://cgit.FreeBSD.org/src/commit/?id=3D82a265ad9bad315000a2d60b853c46=
69f1600cd0</a><br>
&gt;<br>
&gt; commit 82a265ad9bad315000a2d60b853c4669f1600cd0<br>
&gt; Author:=C2=A0 =C2=A0 =C2=A0Warner Losh &lt;imp@FreeBSD.org&gt;<br>
&gt; AuthorDate: 2023-08-16 17:53:59 +0000<br>
&gt; Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh &lt;imp@FreeBSD.org&gt;<br>
&gt; CommitDate: 2023-08-16 17:53:59 +0000<br>
&gt;<br>
&gt;=C2=A0 =C2=A0 =C2=A0sys: Remove $FreeBSD$: sound driver version<br>
&gt;<br>
&gt;=C2=A0 =C2=A0 =C2=A0Remove /SND_DECLARE_FILE\(&quot;\$FreeBSD\$&quot;\)=
;/<br>
<br>
It seems like SND_DECLARE_FILE(&quot;&quot;); should probably go away or th=
e<br>
string within shall be dropped.=C2=A0 Its idea of &#39;uniq&#39; is a littl=
e<br>
concerning.<br></blockquote></div></div><div dir=3D"auto"><br></div><div di=
r=3D"auto">Likely. It actually adds the driver to a list, so I didn&#39;t j=
ust remove it.</div><div dir=3D"auto"><br></div><div dir=3D"auto">Warner</d=
iv><div dir=3D"auto"><br></div><div dir=3D"auto"><div class=3D"gmail_quote"=
><blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1=
px #ccc solid;padding-left:1ex">
&gt; ---<br>
&gt;=C2=A0 sys/arm/broadcom/bcm2835/bcm2835_audio.c | 2 +-<br>
&gt;=C2=A0 sys/dev/sound/pci/als4000.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =
=C2=A0 =C2=A0 | 2 +-<br>
&gt;=C2=A0 sys/dev/sound/pci/atiixp.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0| 2 +-<br>
&gt;=C2=A0 sys/dev/sound/pci/cmi.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0=
 =C2=A0 =C2=A0 =C2=A0 | 2 +-<br>
&gt;=C2=A0 sys/dev/sound/pci/cs4281.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0| 2 +-<br>
&gt;=C2=A0 sys/dev/sound/pci/csa.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0=
 =C2=A0 =C2=A0 =C2=A0 | 2 +-<br>
&gt;=C2=A0 sys/dev/sound/pci/csamidi.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =
=C2=A0 =C2=A0 | 2 +-<br>
&gt;=C2=A0 sys/dev/sound/pci/csapcm.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0| 2 +-<br>
&gt;=C2=A0 sys/dev/sound/pci/emu10k1.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =
=C2=A0 =C2=A0 | 2 +-<br>
&gt;=C2=A0 sys/dev/sound/pci/envy24.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0| 2 +-<br>
&gt;=C2=A0 sys/dev/sound/pci/envy24ht.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =
=C2=A0 =C2=A0| 2 +-<br>
&gt;=C2=A0 sys/dev/sound/pci/es137x.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0| 2 +-<br>
&gt;=C2=A0 sys/dev/sound/pci/fm801.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 | 2 +-<br>
&gt;=C2=A0 sys/dev/sound/pci/hda/hdaa.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =
=C2=A0 =C2=A0| 2 +-<br>
&gt;=C2=A0 sys/dev/sound/pci/hda/hdaa_patches.c=C2=A0 =C2=A0 =C2=A0| 2 +-<b=
r>
&gt;=C2=A0 sys/dev/sound/pci/hda/hdac.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =
=C2=A0 =C2=A0| 2 +-<br>
&gt;=C2=A0 sys/dev/sound/pci/hda/hdacc.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =
=C2=A0 | 2 +-<br>
&gt;=C2=A0 sys/dev/sound/pci/hdspe-pcm.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =
=C2=A0 | 2 +-<br>
&gt;=C2=A0 sys/dev/sound/pci/hdspe.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 | 2 +-<br>
&gt;=C2=A0 sys/dev/sound/pci/ich.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0=
 =C2=A0 =C2=A0 =C2=A0 | 2 +-<br>
&gt;=C2=A0 sys/dev/sound/pci/maestro3.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =
=C2=A0 =C2=A0| 2 +-<br>
&gt;=C2=A0 sys/dev/sound/pci/neomagic.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =
=C2=A0 =C2=A0| 2 +-<br>
&gt;=C2=A0 sys/dev/sound/pci/solo.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 =C2=A0| 2 +-<br>
&gt;=C2=A0 sys/dev/sound/pci/t4dwave.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =
=C2=A0 =C2=A0 | 2 +-<br>
&gt;=C2=A0 sys/dev/sound/pci/via8233.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =
=C2=A0 =C2=A0 | 2 +-<br>
&gt;=C2=A0 sys/dev/sound/pci/via82c686.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =
=C2=A0 | 2 +-<br>
&gt;=C2=A0 sys/dev/sound/pci/vibes.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 | 2 +-<br>
&gt;=C2=A0 sys/dev/sound/pcm/ac97.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 =C2=A0| 2 +-<br>
&gt;=C2=A0 sys/dev/sound/pcm/ac97_patch.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0=
 =C2=A0| 2 +-<br>
&gt;=C2=A0 sys/dev/sound/pcm/buffer.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0| 2 +-<br>
&gt;=C2=A0 sys/dev/sound/pcm/channel.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =
=C2=A0 =C2=A0 | 2 +-<br>
&gt;=C2=A0 sys/dev/sound/pcm/dsp.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0=
 =C2=A0 =C2=A0 =C2=A0 | 2 +-<br>
&gt;=C2=A0 sys/dev/sound/pcm/feeder.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0| 2 +-<br>
&gt;=C2=A0 sys/dev/sound/pcm/feeder_chain.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0| 2 +-<br>
&gt;=C2=A0 sys/dev/sound/pcm/feeder_eq.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =
=C2=A0 | 2 +-<br>
&gt;=C2=A0 sys/dev/sound/pcm/feeder_format.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 | 2=
 +-<br>
&gt;=C2=A0 sys/dev/sound/pcm/feeder_matrix.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 | 2=
 +-<br>
&gt;=C2=A0 sys/dev/sound/pcm/feeder_mixer.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0| 2 +-<br>
&gt;=C2=A0 sys/dev/sound/pcm/feeder_rate.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 | 2 +-<br>
&gt;=C2=A0 sys/dev/sound/pcm/feeder_volume.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 | 2=
 +-<br>
&gt;=C2=A0 sys/dev/sound/pcm/mixer.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 | 2 +-<br>
&gt;=C2=A0 sys/dev/sound/pcm/sndstat.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =
=C2=A0 =C2=A0 | 2 +-<br>
&gt;=C2=A0 sys/dev/sound/pcm/sound.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 | 2 +-<br>
&gt;=C2=A0 sys/dev/sound/pcm/vchan.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 | 2 +-<br>
&gt;=C2=A0 44 files changed, 44 insertions(+), 44 deletions(-)<br>
&gt;<br>
&gt; diff --git a/sys/arm/broadcom/bcm2835/bcm2835_audio.c b/sys/arm/broadc=
om/bcm2835/bcm2835_audio.c<br>
&gt; index 36b1dc86535b..0d430cf19df7 100644<br>
&gt; --- a/sys/arm/broadcom/bcm2835/bcm2835_audio.c<br>
&gt; +++ b/sys/arm/broadcom/bcm2835/bcm2835_audio.c<br>
&gt; @@ -38,7 +38,7 @@<br>
&gt;<br>
&gt;=C2=A0 #include &quot;vc_vchi_audioserv_defs.h&quot;<br>
&gt;<br>
&gt; -SND_DECLARE_FILE(&quot;$FreeBSD$&quot;);<br>
&gt; +SND_DECLARE_FILE(&quot;&quot;);<br>
&gt;<br>
&gt;=C2=A0 /* Audio destination */<br>
&gt;=C2=A0 #define=C2=A0 =C2=A0 =C2=A0 =C2=A0 DEST_AUTO=C2=A0 =C2=A0 =C2=A0=
 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A00<br>
&gt; diff --git a/sys/dev/sound/pci/als4000.c b/sys/dev/sound/pci/als4000.c=
<br>
&gt; index 71f6c4f909c7..89f7d6385493 100644<br>
&gt; --- a/sys/dev/sound/pci/als4000.c<br>
&gt; +++ b/sys/dev/sound/pci/als4000.c<br>
&gt; @@ -48,7 +48,7 @@<br>
&gt;<br>
&gt;=C2=A0 #include &quot;mixer_if.h&quot;<br>
&gt;<br>
&gt; -SND_DECLARE_FILE(&quot;$FreeBSD$&quot;);<br>
&gt; +SND_DECLARE_FILE(&quot;&quot;);<br>
&gt;<br>
&gt;=C2=A0 /* Debugging macro&#39;s */<br>
&gt;=C2=A0 #undef DEB<br>
&gt; diff --git a/sys/dev/sound/pci/atiixp.c b/sys/dev/sound/pci/atiixp.c<b=
r>
&gt; index 83eee21a333e..99468367c998 100644<br>
&gt; --- a/sys/dev/sound/pci/atiixp.c<br>
&gt; +++ b/sys/dev/sound/pci/atiixp.c<br>
&gt; @@ -69,7 +69,7 @@<br>
&gt;<br>
&gt;=C2=A0 #include &lt;dev/sound/pci/atiixp.h&gt;<br>
&gt;<br>
&gt; -SND_DECLARE_FILE(&quot;$FreeBSD$&quot;);<br>
&gt; +SND_DECLARE_FILE(&quot;&quot;);<br>
&gt;<br>
&gt;=C2=A0 #define ATI_IXP_DMA_RETRY_MAX=C2=A0 100<br>
&gt;<br>
&gt; diff --git a/sys/dev/sound/pci/cmi.c b/sys/dev/sound/pci/cmi.c<br>
&gt; index 6b4acbb4ddae..89a1eb24d878 100644<br>
&gt; --- a/sys/dev/sound/pci/cmi.c<br>
&gt; +++ b/sys/dev/sound/pci/cmi.c<br>
&gt; @@ -61,7 +61,7 @@<br>
&gt;=C2=A0 #include &quot;mixer_if.h&quot;<br>
&gt;=C2=A0 #include &quot;mpufoi_if.h&quot;<br>
&gt;<br>
&gt; -SND_DECLARE_FILE(&quot;$FreeBSD$&quot;);<br>
&gt; +SND_DECLARE_FILE(&quot;&quot;);<br>
&gt;<br>
&gt;=C2=A0 /* Supported chip ID&#39;s */<br>
&gt;=C2=A0 #define CMI8338A_PCI_ID=C2=A0 =C2=A00x010013f6<br>
&gt; diff --git a/sys/dev/sound/pci/cs4281.c b/sys/dev/sound/pci/cs4281.c<b=
r>
&gt; index b011f67e763e..fccbf807d965 100644<br>
&gt; --- a/sys/dev/sound/pci/cs4281.c<br>
&gt; +++ b/sys/dev/sound/pci/cs4281.c<br>
&gt; @@ -45,7 +45,7 @@<br>
&gt;<br>
&gt;=C2=A0 #include &lt;dev/sound/pci/cs4281.h&gt;<br>
&gt;<br>
&gt; -SND_DECLARE_FILE(&quot;$FreeBSD$&quot;);<br>
&gt; +SND_DECLARE_FILE(&quot;&quot;);<br>
&gt;<br>
&gt;=C2=A0 #define CS4281_DEFAULT_BUFSZ 16384<br>
&gt;<br>
&gt; diff --git a/sys/dev/sound/pci/csa.c b/sys/dev/sound/pci/csa.c<br>
&gt; index a03f319d85d5..68edfd9338c2 100644<br>
&gt; --- a/sys/dev/sound/pci/csa.c<br>
&gt; +++ b/sys/dev/sound/pci/csa.c<br>
&gt; @@ -54,7 +54,7 @@<br>
&gt;<br>
&gt;=C2=A0 #include &lt;dev/sound/pci/cs461x_dsp.h&gt;<br>
&gt;<br>
&gt; -SND_DECLARE_FILE(&quot;$FreeBSD$&quot;);<br>
&gt; +SND_DECLARE_FILE(&quot;&quot;);<br>
&gt;<br>
&gt;=C2=A0 /* This is the pci device id. */<br>
&gt;=C2=A0 #define CS4610_PCI_ID 0x60011013<br>
&gt; diff --git a/sys/dev/sound/pci/csamidi.c b/sys/dev/sound/pci/csamidi.c=
<br>
&gt; index e9d6006544b3..cc4b41f86af9 100644<br>
&gt; --- a/sys/dev/sound/pci/csamidi.c<br>
&gt; +++ b/sys/dev/sound/pci/csamidi.c<br>
&gt; @@ -54,7 +54,7 @@<br>
&gt;<br>
&gt;=C2=A0 #include &quot;mpufoi_if.h&quot;<br>
&gt;<br>
&gt; -SND_DECLARE_FILE(&quot;$FreeBSD$&quot;);<br>
&gt; +SND_DECLARE_FILE(&quot;&quot;);<br>
&gt;<br>
&gt;=C2=A0 /* pulled from mpu401.c */<br>
&gt;=C2=A0 #define=C2=A0 =C2=A0 =C2=A0 =C2=A0 MPU_DATAPORT=C2=A0 =C2=A0 0<b=
r>
&gt; diff --git a/sys/dev/sound/pci/csapcm.c b/sys/dev/sound/pci/csapcm.c<b=
r>
&gt; index d915a14a536f..14820a9c2216 100644<br>
&gt; --- a/sys/dev/sound/pci/csapcm.c<br>
&gt; +++ b/sys/dev/sound/pci/csapcm.c<br>
&gt; @@ -43,7 +43,7 @@<br>
&gt;=C2=A0 #include &lt;dev/pci/pcireg.h&gt;<br>
&gt;=C2=A0 #include &lt;dev/pci/pcivar.h&gt;<br>
&gt;<br>
&gt; -SND_DECLARE_FILE(&quot;$FreeBSD$&quot;);<br>
&gt; +SND_DECLARE_FILE(&quot;&quot;);<br>
&gt;<br>
&gt;=C2=A0 /* Buffer size on dma transfer. Fixed for CS416x. */<br>
&gt;=C2=A0 #define CS461x_BUFFSIZE=C2=A0 =C2=A0(4 * 1024)<br>
&gt; diff --git a/sys/dev/sound/pci/emu10k1.c b/sys/dev/sound/pci/emu10k1.c=
<br>
&gt; index abb586e34525..d4624a549e42 100644<br>
&gt; --- a/sys/dev/sound/pci/emu10k1.c<br>
&gt; +++ b/sys/dev/sound/pci/emu10k1.c<br>
&gt; @@ -43,7 +43,7 @@<br>
&gt;=C2=A0 #include &lt;dev/sound/midi/mpu401.h&gt;<br>
&gt;=C2=A0 #include &quot;mpufoi_if.h&quot;<br>
&gt;<br>
&gt; -SND_DECLARE_FILE(&quot;$FreeBSD$&quot;);<br>
&gt; +SND_DECLARE_FILE(&quot;&quot;);<br>
&gt;<br>
&gt;=C2=A0 /* -------------------------------------------------------------=
------- */<br>
&gt;<br>
&gt; diff --git a/sys/dev/sound/pci/envy24.c b/sys/dev/sound/pci/envy24.c<b=
r>
&gt; index b95a3438ce79..8039d4e3186c 100644<br>
&gt; --- a/sys/dev/sound/pci/envy24.c<br>
&gt; +++ b/sys/dev/sound/pci/envy24.c<br>
&gt; @@ -41,7 +41,7 @@<br>
&gt;<br>
&gt;=C2=A0 #include &quot;mixer_if.h&quot;<br>
&gt;<br>
&gt; -SND_DECLARE_FILE(&quot;$FreeBSD$&quot;);<br>
&gt; +SND_DECLARE_FILE(&quot;&quot;);<br>
&gt;<br>
&gt;=C2=A0 static MALLOC_DEFINE(M_ENVY24, &quot;envy24&quot;, &quot;envy24 =
audio&quot;);<br>
&gt;<br>
&gt; diff --git a/sys/dev/sound/pci/envy24ht.c b/sys/dev/sound/pci/envy24ht=
.c<br>
&gt; index 4bfef99f600f..e9b6771e2162 100644<br>
&gt; --- a/sys/dev/sound/pci/envy24ht.c<br>
&gt; +++ b/sys/dev/sound/pci/envy24ht.c<br>
&gt; @@ -53,7 +53,7 @@<br>
&gt;<br>
&gt;=C2=A0 #include &quot;mixer_if.h&quot;<br>
&gt;<br>
&gt; -SND_DECLARE_FILE(&quot;$FreeBSD$&quot;);<br>
&gt; +SND_DECLARE_FILE(&quot;&quot;);<br>
&gt;<br>
&gt;=C2=A0 static MALLOC_DEFINE(M_ENVY24HT, &quot;envy24ht&quot;, &quot;env=
y24ht audio&quot;);<br>
&gt;<br>
&gt; diff --git a/sys/dev/sound/pci/es137x.c b/sys/dev/sound/pci/es137x.c<b=
r>
&gt; index f1c94f16a123..a11a106fee2f 100644<br>
&gt; --- a/sys/dev/sound/pci/es137x.c<br>
&gt; +++ b/sys/dev/sound/pci/es137x.c<br>
&gt; @@ -90,7 +90,7 @@<br>
&gt;<br>
&gt;=C2=A0 #include &quot;mixer_if.h&quot;<br>
&gt;<br>
&gt; -SND_DECLARE_FILE(&quot;$FreeBSD$&quot;);<br>
&gt; +SND_DECLARE_FILE(&quot;&quot;);<br>
&gt;<br>
&gt;=C2=A0 #define MEM_MAP_REG 0x14<br>
&gt;<br>
&gt; diff --git a/sys/dev/sound/pci/fm801.c b/sys/dev/sound/pci/fm801.c<br>
&gt; index 2469fdba967f..34fb1f6f1bf6 100644<br>
&gt; --- a/sys/dev/sound/pci/fm801.c<br>
&gt; +++ b/sys/dev/sound/pci/fm801.c<br>
&gt; @@ -35,7 +35,7 @@<br>
&gt;=C2=A0 #include &lt;dev/pci/pcireg.h&gt;<br>
&gt;=C2=A0 #include &lt;dev/pci/pcivar.h&gt;<br>
&gt;<br>
&gt; -SND_DECLARE_FILE(&quot;$FreeBSD$&quot;);<br>
&gt; +SND_DECLARE_FILE(&quot;&quot;);<br>
&gt;<br>
&gt;=C2=A0 #define PCI_VENDOR_FORTEMEDIA=C2=A0 0x1319<br>
&gt;=C2=A0 #define PCI_DEVICE_FORTEMEDIA1 0x08011319=C2=A0 =C2=A0 =C2=A0 /*=
 Audio controller */<br>
&gt; diff --git a/sys/dev/sound/pci/hda/hdaa.c b/sys/dev/sound/pci/hda/hdaa=
.c<br>
&gt; index c7706d2bd967..ef8f634ac8e8 100644<br>
&gt; --- a/sys/dev/sound/pci/hda/hdaa.c<br>
&gt; +++ b/sys/dev/sound/pci/hda/hdaa.c<br>
&gt; @@ -47,7 +47,7 @@<br>
&gt;<br>
&gt;=C2=A0 #include &quot;mixer_if.h&quot;<br>
&gt;<br>
&gt; -SND_DECLARE_FILE(&quot;$FreeBSD$&quot;);<br>
&gt; +SND_DECLARE_FILE(&quot;&quot;);<br>
&gt;<br>
&gt;=C2=A0 #define hdaa_lock(devinfo)=C2=A0 =C2=A0 =C2=A0snd_mtxlock((devin=
fo)-&gt;lock)<br>
&gt;=C2=A0 #define hdaa_unlock(devinfo)=C2=A0 =C2=A0snd_mtxunlock((devinfo)=
-&gt;lock)<br>
&gt; diff --git a/sys/dev/sound/pci/hda/hdaa_patches.c b/sys/dev/sound/pci/=
hda/hdaa_patches.c<br>
&gt; index bec8590745c5..8331312b69c9 100644<br>
&gt; --- a/sys/dev/sound/pci/hda/hdaa_patches.c<br>
&gt; +++ b/sys/dev/sound/pci/hda/hdaa_patches.c<br>
&gt; @@ -47,7 +47,7 @@<br>
&gt;=C2=A0 #include &quot;pin_patch.h&quot;<br>
&gt;=C2=A0 #include &quot;pin_patch_realtek.h&quot;<br>
&gt;<br>
&gt; -SND_DECLARE_FILE(&quot;$FreeBSD$&quot;);<br>
&gt; +SND_DECLARE_FILE(&quot;&quot;);<br>
&gt;<br>
&gt;=C2=A0 static const struct {<br>
&gt;=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint32_t model;<br>
&gt; diff --git a/sys/dev/sound/pci/hda/hdac.c b/sys/dev/sound/pci/hda/hdac=
.c<br>
&gt; index aca9bd7ac9ab..79ab71516cd9 100644<br>
&gt; --- a/sys/dev/sound/pci/hda/hdac.c<br>
&gt; +++ b/sys/dev/sound/pci/hda/hdac.c<br>
&gt; @@ -51,7 +51,7 @@<br>
&gt;<br>
&gt;=C2=A0 #define HDA_DRV_TEST_REV=C2=A0 =C2=A0 =C2=A0 =C2=A0&quot;2012012=
6_0002&quot;<br>
&gt;<br>
&gt; -SND_DECLARE_FILE(&quot;$FreeBSD$&quot;);<br>
&gt; +SND_DECLARE_FILE(&quot;&quot;);<br>
&gt;<br>
&gt;=C2=A0 #define hdac_lock(sc)=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 snd_mtxl=
ock((sc)-&gt;lock)<br>
&gt;=C2=A0 #define hdac_unlock(sc)=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0=
 =C2=A0 =C2=A0 snd_mtxunlock((sc)-&gt;lock)<br>
&gt; diff --git a/sys/dev/sound/pci/hda/hdacc.c b/sys/dev/sound/pci/hda/hda=
cc.c<br>
&gt; index 33eea6ef67c5..4616b3b23a48 100644<br>
&gt; --- a/sys/dev/sound/pci/hda/hdacc.c<br>
&gt; +++ b/sys/dev/sound/pci/hda/hdacc.c<br>
&gt; @@ -43,7 +43,7 @@<br>
&gt;=C2=A0 #include &lt;dev/sound/pci/hda/hda_reg.h&gt;<br>
&gt;=C2=A0 #include &lt;dev/sound/pci/hda/hdac.h&gt;<br>
&gt;<br>
&gt; -SND_DECLARE_FILE(&quot;$FreeBSD$&quot;);<br>
&gt; +SND_DECLARE_FILE(&quot;&quot;);<br>
&gt;<br>
&gt;=C2=A0 struct hdacc_fg {<br>
&gt;=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0device_t=C2=A0 =C2=A0 =C2=A0 =C2=A0 d=
ev;<br>
&gt; diff --git a/sys/dev/sound/pci/hdspe-pcm.c b/sys/dev/sound/pci/hdspe-p=
cm.c<br>
&gt; index 6de5b353ab5b..b23304d32fc7 100644<br>
&gt; --- a/sys/dev/sound/pci/hdspe-pcm.c<br>
&gt; +++ b/sys/dev/sound/pci/hdspe-pcm.c<br>
&gt; @@ -40,7 +40,7 @@<br>
&gt;<br>
&gt;=C2=A0 #include &lt;mixer_if.h&gt;<br>
&gt;<br>
&gt; -SND_DECLARE_FILE(&quot;$FreeBSD$&quot;);<br>
&gt; +SND_DECLARE_FILE(&quot;&quot;);<br>
&gt;<br>
&gt;=C2=A0 struct hdspe_latency {<br>
&gt;=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint32_t n;<br>
&gt; diff --git a/sys/dev/sound/pci/hdspe.c b/sys/dev/sound/pci/hdspe.c<br>
&gt; index 943c20bba4f1..ac253b28df3a 100644<br>
&gt; --- a/sys/dev/sound/pci/hdspe.c<br>
&gt; +++ b/sys/dev/sound/pci/hdspe.c<br>
&gt; @@ -40,7 +40,7 @@<br>
&gt;<br>
&gt;=C2=A0 #include &lt;mixer_if.h&gt;<br>
&gt;<br>
&gt; -SND_DECLARE_FILE(&quot;$FreeBSD$&quot;);<br>
&gt; +SND_DECLARE_FILE(&quot;&quot;);<br>
&gt;<br>
&gt;=C2=A0 static struct hdspe_channel chan_map_aio[] =3D {<br>
&gt;=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0{=C2=A0 0,=C2=A0 1,=C2=A0 =C2=A0&quot=
;line&quot;, 1, 1 },<br>
&gt; diff --git a/sys/dev/sound/pci/ich.c b/sys/dev/sound/pci/ich.c<br>
&gt; index feb0175d2839..d5e8a48a186c 100644<br>
&gt; --- a/sys/dev/sound/pci/ich.c<br>
&gt; +++ b/sys/dev/sound/pci/ich.c<br>
&gt; @@ -38,7 +38,7 @@<br>
&gt;=C2=A0 #include &lt;dev/pci/pcireg.h&gt;<br>
&gt;=C2=A0 #include &lt;dev/pci/pcivar.h&gt;<br>
&gt;<br>
&gt; -SND_DECLARE_FILE(&quot;$FreeBSD$&quot;);<br>
&gt; +SND_DECLARE_FILE(&quot;&quot;);<br>
&gt;<br>
&gt;=C2=A0 /* -------------------------------------------------------------=
------- */<br>
&gt;<br>
&gt; diff --git a/sys/dev/sound/pci/maestro3.c b/sys/dev/sound/pci/maestro3=
.c<br>
&gt; index f46b587daf7c..c60c69b6baf5 100644<br>
&gt; --- a/sys/dev/sound/pci/maestro3.c<br>
&gt; +++ b/sys/dev/sound/pci/maestro3.c<br>
&gt; @@ -69,7 +69,7 @@<br>
&gt;=C2=A0 #include &lt;dev/sound/pci/allegro_reg.h&gt;<br>
&gt;=C2=A0 #include &lt;dev/sound/pci/allegro_code.h&gt;<br>
&gt;<br>
&gt; -SND_DECLARE_FILE(&quot;$FreeBSD$&quot;);<br>
&gt; +SND_DECLARE_FILE(&quot;&quot;);<br>
&gt;<br>
&gt;=C2=A0 /* -------------------------------------------------------------=
------- */<br>
&gt;<br>
&gt; diff --git a/sys/dev/sound/pci/neomagic.c b/sys/dev/sound/pci/neomagic=
.c<br>
&gt; index 5616223b7590..162d99b57c70 100644<br>
&gt; --- a/sys/dev/sound/pci/neomagic.c<br>
&gt; +++ b/sys/dev/sound/pci/neomagic.c<br>
&gt; @@ -40,7 +40,7 @@<br>
&gt;=C2=A0 #include &lt;dev/pci/pcireg.h&gt;<br>
&gt;=C2=A0 #include &lt;dev/pci/pcivar.h&gt;<br>
&gt;<br>
&gt; -SND_DECLARE_FILE(&quot;$FreeBSD$&quot;);<br>
&gt; +SND_DECLARE_FILE(&quot;&quot;);<br>
&gt;<br>
&gt;=C2=A0 /* -------------------------------------------------------------=
------- */<br>
&gt;<br>
&gt; diff --git a/sys/dev/sound/pci/solo.c b/sys/dev/sound/pci/solo.c<br>
&gt; index dc8351e9c117..1788929811ed 100644<br>
&gt; --- a/sys/dev/sound/pci/solo.c<br>
&gt; +++ b/sys/dev/sound/pci/solo.c<br>
&gt; @@ -39,7 +39,7 @@<br>
&gt;<br>
&gt;=C2=A0 #include &quot;mixer_if.h&quot;<br>
&gt;<br>
&gt; -SND_DECLARE_FILE(&quot;$FreeBSD$&quot;);<br>
&gt; +SND_DECLARE_FILE(&quot;&quot;);<br>
&gt;<br>
&gt;=C2=A0 #define SOLO_DEFAULT_BUFSZ 16384<br>
&gt;=C2=A0 #define ABS(x) (((x) &lt; 0)? -(x) : (x))<br>
&gt; diff --git a/sys/dev/sound/pci/t4dwave.c b/sys/dev/sound/pci/t4dwave.c=
<br>
&gt; index fc99a90b94e7..b7363402ba8b 100644<br>
&gt; --- a/sys/dev/sound/pci/t4dwave.c<br>
&gt; +++ b/sys/dev/sound/pci/t4dwave.c<br>
&gt; @@ -37,7 +37,7 @@<br>
&gt;=C2=A0 #include &lt;dev/pci/pcireg.h&gt;<br>
&gt;=C2=A0 #include &lt;dev/pci/pcivar.h&gt;<br>
&gt;<br>
&gt; -SND_DECLARE_FILE(&quot;$FreeBSD$&quot;);<br>
&gt; +SND_DECLARE_FILE(&quot;&quot;);<br>
&gt;<br>
&gt;=C2=A0 /* -------------------------------------------------------------=
------- */<br>
&gt;<br>
&gt; diff --git a/sys/dev/sound/pci/via8233.c b/sys/dev/sound/pci/via8233.c=
<br>
&gt; index 9de5b18cd031..6656670c9e1c 100644<br>
&gt; --- a/sys/dev/sound/pci/via8233.c<br>
&gt; +++ b/sys/dev/sound/pci/via8233.c<br>
&gt; @@ -50,7 +50,7 @@<br>
&gt;<br>
&gt;=C2=A0 #include &lt;dev/sound/pci/via8233.h&gt;<br>
&gt;<br>
&gt; -SND_DECLARE_FILE(&quot;$FreeBSD$&quot;);<br>
&gt; +SND_DECLARE_FILE(&quot;&quot;);<br>
&gt;<br>
&gt;=C2=A0 #define VIA8233_PCI_ID 0x30591106<br>
&gt;<br>
&gt; diff --git a/sys/dev/sound/pci/via82c686.c b/sys/dev/sound/pci/via82c6=
86.c<br>
&gt; index 6bd604941cf8..076df8c81aa0 100644<br>
&gt; --- a/sys/dev/sound/pci/via82c686.c<br>
&gt; +++ b/sys/dev/sound/pci/via82c686.c<br>
&gt; @@ -39,7 +39,7 @@<br>
&gt;<br>
&gt;=C2=A0 #include &lt;dev/sound/pci/via82c686.h&gt;<br>
&gt;<br>
&gt; -SND_DECLARE_FILE(&quot;$FreeBSD$&quot;);<br>
&gt; +SND_DECLARE_FILE(&quot;&quot;);<br>
&gt;<br>
&gt;=C2=A0 #define VIA_PCI_ID 0x30581106<br>
&gt;=C2=A0 #define=C2=A0 =C2=A0 =C2=A0 =C2=A0 NSEGS=C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A04=C2=A0 =C2=A0 =C2=A0 =C2=A0/* Number of segments in SGD t=
able */<br>
&gt; diff --git a/sys/dev/sound/pci/vibes.c b/sys/dev/sound/pci/vibes.c<br>
&gt; index 81401796d68c..1299f15dc814 100644<br>
&gt; --- a/sys/dev/sound/pci/vibes.c<br>
&gt; +++ b/sys/dev/sound/pci/vibes.c<br>
&gt; @@ -44,7 +44,7 @@<br>
&gt;<br>
&gt;=C2=A0 #include &quot;mixer_if.h&quot;<br>
&gt;<br>
&gt; -SND_DECLARE_FILE(&quot;$FreeBSD$&quot;);<br>
&gt; +SND_DECLARE_FILE(&quot;&quot;);<br>
&gt;<br>
&gt;=C2=A0 /* -------------------------------------------------------------=
------------ */<br>
&gt;=C2=A0 /* Constants */<br>
&gt; diff --git a/sys/dev/sound/pcm/ac97.c b/sys/dev/sound/pcm/ac97.c<br>
&gt; index 763188291009..d83e3f2fefa5 100644<br>
&gt; --- a/sys/dev/sound/pcm/ac97.c<br>
&gt; +++ b/sys/dev/sound/pcm/ac97.c<br>
&gt; @@ -38,7 +38,7 @@<br>
&gt;<br>
&gt;=C2=A0 #include &quot;mixer_if.h&quot;<br>
&gt;<br>
&gt; -SND_DECLARE_FILE(&quot;$FreeBSD$&quot;);<br>
&gt; +SND_DECLARE_FILE(&quot;&quot;);<br>
&gt;<br>
&gt;=C2=A0 static MALLOC_DEFINE(M_AC97, &quot;ac97&quot;, &quot;ac97 codec&=
quot;);<br>
&gt;<br>
&gt; diff --git a/sys/dev/sound/pcm/ac97_patch.c b/sys/dev/sound/pcm/ac97_p=
atch.c<br>
&gt; index f1a358b50958..aff8075fe96c 100644<br>
&gt; --- a/sys/dev/sound/pcm/ac97_patch.c<br>
&gt; +++ b/sys/dev/sound/pcm/ac97_patch.c<br>
&gt; @@ -34,7 +34,7 @@<br>
&gt;=C2=A0 #include &lt;dev/sound/pcm/ac97.h&gt;<br>
&gt;=C2=A0 #include &lt;dev/sound/pcm/ac97_patch.h&gt;<br>
&gt;<br>
&gt; -SND_DECLARE_FILE(&quot;$FreeBSD$&quot;);<br>
&gt; +SND_DECLARE_FILE(&quot;&quot;);<br>
&gt;<br>
&gt;=C2=A0 void ad1886_patch(struct ac97_info* codec)<br>
&gt;=C2=A0 {<br>
&gt; diff --git a/sys/dev/sound/pcm/buffer.c b/sys/dev/sound/pcm/buffer.c<b=
r>
&gt; index d75890eaddfb..d5a519362c5e 100644<br>
&gt; --- a/sys/dev/sound/pcm/buffer.c<br>
&gt; +++ b/sys/dev/sound/pcm/buffer.c<br>
&gt; @@ -40,7 +40,7 @@<br>
&gt;=C2=A0 #define=C2=A0 =C2=A0 =C2=A0 =C2=A0 SND_DECLARE_FXDIV<br>
&gt;=C2=A0 #include &quot;snd_fxdiv_gen.h&quot;<br>
&gt;<br>
&gt; -SND_DECLARE_FILE(&quot;$FreeBSD$&quot;);<br>
&gt; +SND_DECLARE_FILE(&quot;&quot;);<br>
&gt;<br>
&gt;=C2=A0 struct snd_dbuf *<br>
&gt;=C2=A0 sndbuf_create(device_t dev, char *drv, char *desc, struct pcm_ch=
annel *channel)<br>
&gt; diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c=
<br>
&gt; index 1d192de54712..d56f5fb51dc9 100644<br>
&gt; --- a/sys/dev/sound/pcm/channel.c<br>
&gt; +++ b/sys/dev/sound/pcm/channel.c<br>
&gt; @@ -38,7 +38,7 @@<br>
&gt;<br>
&gt;=C2=A0 #include &quot;feeder_if.h&quot;<br>
&gt;<br>
&gt; -SND_DECLARE_FILE(&quot;$FreeBSD$&quot;);<br>
&gt; +SND_DECLARE_FILE(&quot;&quot;);<br>
&gt;<br>
&gt;=C2=A0 int report_soft_formats =3D 1;<br>
&gt;=C2=A0 SYSCTL_INT(_hw_snd, OID_AUTO, report_soft_formats, CTLFLAG_RW,<b=
r>
&gt; diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c<br>
&gt; index bb435bc3925c..98d241e65a52 100644<br>
&gt; --- a/sys/dev/sound/pcm/dsp.c<br>
&gt; +++ b/sys/dev/sound/pcm/dsp.c<br>
&gt; @@ -43,7 +43,7 @@<br>
&gt;=C2=A0 #include &lt;vm/vm_page.h&gt;<br>
&gt;=C2=A0 #include &lt;vm/vm_pager.h&gt;<br>
&gt;<br>
&gt; -SND_DECLARE_FILE(&quot;$FreeBSD$&quot;);<br>
&gt; +SND_DECLARE_FILE(&quot;&quot;);<br>
&gt;<br>
&gt;=C2=A0 static int dsp_mmap_allow_prot_exec =3D 0;<br>
&gt;=C2=A0 SYSCTL_INT(_hw_snd, OID_AUTO, compat_linux_mmap, CTLFLAG_RWTUN,<=
br>
&gt; diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c<b=
r>
&gt; index d379d06b8664..8fb377533907 100644<br>
&gt; --- a/sys/dev/sound/pcm/feeder.c<br>
&gt; +++ b/sys/dev/sound/pcm/feeder.c<br>
&gt; @@ -35,7 +35,7 @@<br>
&gt;<br>
&gt;=C2=A0 #include &quot;feeder_if.h&quot;<br>
&gt;<br>
&gt; -SND_DECLARE_FILE(&quot;$FreeBSD$&quot;);<br>
&gt; +SND_DECLARE_FILE(&quot;&quot;);<br>
&gt;<br>
&gt;=C2=A0 static MALLOC_DEFINE(M_FEEDER, &quot;feeder&quot;, &quot;pcm fee=
der&quot;);<br>
&gt;<br>
&gt; diff --git a/sys/dev/sound/pcm/feeder_chain.c b/sys/dev/sound/pcm/feed=
er_chain.c<br>
&gt; index 9c3baaf282b5..01def5f6e9cb 100644<br>
&gt; --- a/sys/dev/sound/pcm/feeder_chain.c<br>
&gt; +++ b/sys/dev/sound/pcm/feeder_chain.c<br>
&gt; @@ -34,7 +34,7 @@<br>
&gt;<br>
&gt;=C2=A0 #include &quot;feeder_if.h&quot;<br>
&gt;<br>
&gt; -SND_DECLARE_FILE(&quot;$FreeBSD$&quot;);<br>
&gt; +SND_DECLARE_FILE(&quot;&quot;);<br>
&gt;<br>
&gt;=C2=A0 /* chain state */<br>
&gt;=C2=A0 struct feeder_chain_state {<br>
&gt; diff --git a/sys/dev/sound/pcm/feeder_eq.c b/sys/dev/sound/pcm/feeder_=
eq.c<br>
&gt; index bc39d33c03fb..70797a706367 100644<br>
&gt; --- a/sys/dev/sound/pcm/feeder_eq.c<br>
&gt; +++ b/sys/dev/sound/pcm/feeder_eq.c<br>
&gt; @@ -46,7 +46,7 @@<br>
&gt;=C2=A0 #define SND_USE_FXDIV<br>
&gt;=C2=A0 #include &quot;snd_fxdiv_gen.h&quot;<br>
&gt;<br>
&gt; -SND_DECLARE_FILE(&quot;$FreeBSD$&quot;);<br>
&gt; +SND_DECLARE_FILE(&quot;&quot;);<br>
&gt;=C2=A0 #endif<br>
&gt;<br>
&gt;=C2=A0 #include &quot;feeder_eq_gen.h&quot;<br>
&gt; diff --git a/sys/dev/sound/pcm/feeder_format.c b/sys/dev/sound/pcm/fee=
der_format.c<br>
&gt; index 8a9054561b2b..3a741430e0ca 100644<br>
&gt; --- a/sys/dev/sound/pcm/feeder_format.c<br>
&gt; +++ b/sys/dev/sound/pcm/feeder_format.c<br>
&gt; @@ -44,7 +44,7 @@<br>
&gt;=C2=A0 #define SND_USE_FXDIV<br>
&gt;=C2=A0 #include &quot;snd_fxdiv_gen.h&quot;<br>
&gt;<br>
&gt; -SND_DECLARE_FILE(&quot;$FreeBSD$&quot;);<br>
&gt; +SND_DECLARE_FILE(&quot;&quot;);<br>
&gt;=C2=A0 #endif<br>
&gt;<br>
&gt;=C2=A0 #define FEEDFORMAT_RESERVOIR=C2=A0 =C2=A0(SND_CHN_MAX * PCM_32_B=
PS)<br>
&gt; diff --git a/sys/dev/sound/pcm/feeder_matrix.c b/sys/dev/sound/pcm/fee=
der_matrix.c<br>
&gt; index 33bf3ec11ee0..0afdb47c04d8 100644<br>
&gt; --- a/sys/dev/sound/pcm/feeder_matrix.c<br>
&gt; +++ b/sys/dev/sound/pcm/feeder_matrix.c<br>
&gt; @@ -54,7 +54,7 @@<br>
&gt;=C2=A0 #define SND_USE_FXDIV<br>
&gt;=C2=A0 #include &quot;snd_fxdiv_gen.h&quot;<br>
&gt;<br>
&gt; -SND_DECLARE_FILE(&quot;$FreeBSD$&quot;);<br>
&gt; +SND_DECLARE_FILE(&quot;&quot;);<br>
&gt;=C2=A0 #endif<br>
&gt;<br>
&gt;=C2=A0 #define FEEDMATRIX_RESERVOIR=C2=A0 =C2=A0(SND_CHN_MAX * PCM_32_B=
PS)<br>
&gt; diff --git a/sys/dev/sound/pcm/feeder_mixer.c b/sys/dev/sound/pcm/feed=
er_mixer.c<br>
&gt; index 13afceabf28e..42ebe89d7c09 100644<br>
&gt; --- a/sys/dev/sound/pcm/feeder_mixer.c<br>
&gt; +++ b/sys/dev/sound/pcm/feeder_mixer.c<br>
&gt; @@ -38,7 +38,7 @@<br>
&gt;=C2=A0 #define SND_USE_FXDIV<br>
&gt;=C2=A0 #include &quot;snd_fxdiv_gen.h&quot;<br>
&gt;<br>
&gt; -SND_DECLARE_FILE(&quot;$FreeBSD$&quot;);<br>
&gt; +SND_DECLARE_FILE(&quot;&quot;);<br>
&gt;=C2=A0 #endif<br>
&gt;<br>
&gt;=C2=A0 #undef SND_FEEDER_MULTIFORMAT<br>
&gt; diff --git a/sys/dev/sound/pcm/feeder_rate.c b/sys/dev/sound/pcm/feede=
r_rate.c<br>
&gt; index 0784c477197a..b2afe0651bf5 100644<br>
&gt; --- a/sys/dev/sound/pcm/feeder_rate.c<br>
&gt; +++ b/sys/dev/sound/pcm/feeder_rate.c<br>
&gt; @@ -61,7 +61,7 @@<br>
&gt;=C2=A0 #define SND_USE_FXDIV<br>
&gt;=C2=A0 #include &quot;snd_fxdiv_gen.h&quot;<br>
&gt;<br>
&gt; -SND_DECLARE_FILE(&quot;$FreeBSD$&quot;);<br>
&gt; +SND_DECLARE_FILE(&quot;&quot;);<br>
&gt;=C2=A0 #endif<br>
&gt;<br>
&gt;=C2=A0 #include &quot;feeder_rate_gen.h&quot;<br>
&gt; diff --git a/sys/dev/sound/pcm/feeder_volume.c b/sys/dev/sound/pcm/fee=
der_volume.c<br>
&gt; index 724d5a0922e8..fa11a089af76 100644<br>
&gt; --- a/sys/dev/sound/pcm/feeder_volume.c<br>
&gt; +++ b/sys/dev/sound/pcm/feeder_volume.c<br>
&gt; @@ -39,7 +39,7 @@<br>
&gt;=C2=A0 #define SND_USE_FXDIV<br>
&gt;=C2=A0 #include &quot;snd_fxdiv_gen.h&quot;<br>
&gt;<br>
&gt; -SND_DECLARE_FILE(&quot;$FreeBSD$&quot;);<br>
&gt; +SND_DECLARE_FILE(&quot;&quot;);<br>
&gt;=C2=A0 #endif<br>
&gt;<br>
&gt;=C2=A0 typedef void (*feed_volume_t)(int *, int *, uint32_t, uint8_t *,=
 uint32_t);<br>
&gt; diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c<br>
&gt; index 080daeced12d..0c7576390b72 100644<br>
&gt; --- a/sys/dev/sound/pcm/mixer.c<br>
&gt; +++ b/sys/dev/sound/pcm/mixer.c<br>
&gt; @@ -37,7 +37,7 @@<br>
&gt;=C2=A0 #include &quot;feeder_if.h&quot;<br>
&gt;=C2=A0 #include &quot;mixer_if.h&quot;<br>
&gt;<br>
&gt; -SND_DECLARE_FILE(&quot;$FreeBSD$&quot;);<br>
&gt; +SND_DECLARE_FILE(&quot;&quot;);<br>
&gt;<br>
&gt;=C2=A0 static MALLOC_DEFINE(M_MIXER, &quot;mixer&quot;, &quot;mixer&quo=
t;);<br>
&gt;<br>
&gt; diff --git a/sys/dev/sound/pcm/sndstat.c b/sys/dev/sound/pcm/sndstat.c=
<br>
&gt; index 64e0a1ca5d82..fc92bd783587 100644<br>
&gt; --- a/sys/dev/sound/pcm/sndstat.c<br>
&gt; +++ b/sys/dev/sound/pcm/sndstat.c<br>
&gt; @@ -50,7 +50,7 @@<br>
&gt;=C2=A0 #include &lt;dev/sound/version.h&gt;<br>
&gt;<br>
&gt;<br>
&gt; -SND_DECLARE_FILE(&quot;$FreeBSD$&quot;);<br>
&gt; +SND_DECLARE_FILE(&quot;&quot;);<br>
&gt;<br>
&gt;=C2=A0 #define=C2=A0 =C2=A0 =C2=A0 =C2=A0 SS_TYPE_MODULE=C2=A0 =C2=A0 =
=C2=A0 =C2=A0 =C2=A0 0<br>
&gt;=C2=A0 #define=C2=A0 =C2=A0 =C2=A0 =C2=A0 SS_TYPE_PCM=C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A01<br>
&gt; diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c<br>
&gt; index 1a7f8dc2fa68..17dc8d968b3c 100644<br>
&gt; --- a/sys/dev/sound/pcm/sound.c<br>
&gt; +++ b/sys/dev/sound/pcm/sound.c<br>
&gt; @@ -44,7 +44,7 @@<br>
&gt;<br>
&gt;=C2=A0 #include &quot;feeder_if.h&quot;<br>
&gt;<br>
&gt; -SND_DECLARE_FILE(&quot;$FreeBSD$&quot;);<br>
&gt; +SND_DECLARE_FILE(&quot;&quot;);<br>
&gt;<br>
&gt;=C2=A0 devclass_t pcm_devclass;<br>
&gt;<br>
&gt; diff --git a/sys/dev/sound/pcm/vchan.c b/sys/dev/sound/pcm/vchan.c<br>
&gt; index 0b0ddc224094..c84d8f14e075 100644<br>
&gt; --- a/sys/dev/sound/pcm/vchan.c<br>
&gt; +++ b/sys/dev/sound/pcm/vchan.c<br>
&gt; @@ -36,7 +36,7 @@<br>
&gt;=C2=A0 #include &lt;dev/sound/pcm/sound.h&gt;<br>
&gt;=C2=A0 #include &lt;dev/sound/pcm/vchan.h&gt;<br>
&gt;<br>
&gt; -SND_DECLARE_FILE(&quot;$FreeBSD$&quot;);<br>
&gt; +SND_DECLARE_FILE(&quot;&quot;);<br>
&gt;<br>
&gt;=C2=A0 /*<br>
&gt;=C2=A0 =C2=A0* [ac3 , dts , linear , 0, linear, 0]<br>
&gt;<br>
</blockquote></div></div></div>

--000000000000ea271906030e8687--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfq1eMeBOVMA14h0Q3AdKdA_mvdSzwnJvOrBHKDAkcwTBQ>