Date: Fri, 18 Aug 2023 20:05:28 GMT From: John Baldwin <jhb@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 5aacf339f601 - main - sys: Remove SND_DECLARE_FILE Message-ID: <202308182005.37IK5Shs001728@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=5aacf339f60109917f8e18f5645cb66f544b33d2 commit 5aacf339f60109917f8e18f5645cb66f544b33d2 Author: John Baldwin <jhb@FreeBSD.org> AuthorDate: 2023-08-18 20:05:12 +0000 Commit: John Baldwin <jhb@FreeBSD.org> CommitDate: 2023-08-18 20:05:12 +0000 sys: Remove SND_DECLARE_FILE Reviewed by: kbowling, imp, emaste Differential Revision: https://reviews.freebsd.org/D41499 --- 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 | 13 ------------- sys/dev/sound/pcm/sound.c | 2 -- sys/dev/sound/pcm/sound.h | 4 ---- sys/dev/sound/pcm/vchan.c | 2 -- 45 files changed, 103 deletions(-) diff --git a/sys/arm/broadcom/bcm2835/bcm2835_audio.c b/sys/arm/broadcom/bcm2835/bcm2835_audio.c index 0d430cf19df7..e0f525fa9520 100644 --- a/sys/arm/broadcom/bcm2835/bcm2835_audio.c +++ b/sys/arm/broadcom/bcm2835/bcm2835_audio.c @@ -38,8 +38,6 @@ #include "vc_vchi_audioserv_defs.h" -SND_DECLARE_FILE(""); - /* Audio destination */ #define DEST_AUTO 0 #define DEST_HEADPHONES 1 diff --git a/sys/dev/sound/pci/als4000.c b/sys/dev/sound/pci/als4000.c index 89f7d6385493..5b7247517c13 100644 --- a/sys/dev/sound/pci/als4000.c +++ b/sys/dev/sound/pci/als4000.c @@ -48,8 +48,6 @@ #include "mixer_if.h" -SND_DECLARE_FILE(""); - /* Debugging macro's */ #undef DEB #ifndef DEB diff --git a/sys/dev/sound/pci/atiixp.c b/sys/dev/sound/pci/atiixp.c index 99468367c998..78be9475acd3 100644 --- a/sys/dev/sound/pci/atiixp.c +++ b/sys/dev/sound/pci/atiixp.c @@ -69,8 +69,6 @@ #include <dev/sound/pci/atiixp.h> -SND_DECLARE_FILE(""); - #define ATI_IXP_DMA_RETRY_MAX 100 #define ATI_IXP_BUFSZ_MIN 4096 diff --git a/sys/dev/sound/pci/cmi.c b/sys/dev/sound/pci/cmi.c index 89a1eb24d878..4fd6ac4c0a75 100644 --- a/sys/dev/sound/pci/cmi.c +++ b/sys/dev/sound/pci/cmi.c @@ -61,8 +61,6 @@ #include "mixer_if.h" #include "mpufoi_if.h" -SND_DECLARE_FILE(""); - /* Supported chip ID's */ #define CMI8338A_PCI_ID 0x010013f6 #define CMI8338B_PCI_ID 0x010113f6 diff --git a/sys/dev/sound/pci/cs4281.c b/sys/dev/sound/pci/cs4281.c index fccbf807d965..25beb3f7fd0d 100644 --- a/sys/dev/sound/pci/cs4281.c +++ b/sys/dev/sound/pci/cs4281.c @@ -45,8 +45,6 @@ #include <dev/sound/pci/cs4281.h> -SND_DECLARE_FILE(""); - #define CS4281_DEFAULT_BUFSZ 16384 /* Max fifo size for full duplex is 64 */ diff --git a/sys/dev/sound/pci/csa.c b/sys/dev/sound/pci/csa.c index 68edfd9338c2..7bb7967b74e7 100644 --- a/sys/dev/sound/pci/csa.c +++ b/sys/dev/sound/pci/csa.c @@ -54,8 +54,6 @@ #include <dev/sound/pci/cs461x_dsp.h> -SND_DECLARE_FILE(""); - /* This is the pci device id. */ #define CS4610_PCI_ID 0x60011013 #define CS4614_PCI_ID 0x60031013 diff --git a/sys/dev/sound/pci/csamidi.c b/sys/dev/sound/pci/csamidi.c index cc4b41f86af9..df1699092990 100644 --- a/sys/dev/sound/pci/csamidi.c +++ b/sys/dev/sound/pci/csamidi.c @@ -54,8 +54,6 @@ #include "mpufoi_if.h" -SND_DECLARE_FILE(""); - /* pulled from mpu401.c */ #define MPU_DATAPORT 0 #define MPU_CMDPORT 1 diff --git a/sys/dev/sound/pci/csapcm.c b/sys/dev/sound/pci/csapcm.c index 14820a9c2216..8715072ec0e5 100644 --- a/sys/dev/sound/pci/csapcm.c +++ b/sys/dev/sound/pci/csapcm.c @@ -43,8 +43,6 @@ #include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> -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 d4624a549e42..92937c2d0c42 100644 --- a/sys/dev/sound/pci/emu10k1.c +++ b/sys/dev/sound/pci/emu10k1.c @@ -43,8 +43,6 @@ #include <dev/sound/midi/mpu401.h> #include "mpufoi_if.h" -SND_DECLARE_FILE(""); - /* -------------------------------------------------------------------- */ #define NUM_G 64 /* use all channels */ diff --git a/sys/dev/sound/pci/envy24.c b/sys/dev/sound/pci/envy24.c index 8039d4e3186c..24b5abc0eeb9 100644 --- a/sys/dev/sound/pci/envy24.c +++ b/sys/dev/sound/pci/envy24.c @@ -41,8 +41,6 @@ #include "mixer_if.h" -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 e9b6771e2162..6a3ef5afcf59 100644 --- a/sys/dev/sound/pci/envy24ht.c +++ b/sys/dev/sound/pci/envy24ht.c @@ -53,8 +53,6 @@ #include "mixer_if.h" -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 a11a106fee2f..8c1c2b34e1cf 100644 --- a/sys/dev/sound/pci/es137x.c +++ b/sys/dev/sound/pci/es137x.c @@ -90,8 +90,6 @@ #include "mixer_if.h" -SND_DECLARE_FILE(""); - #define MEM_MAP_REG 0x14 /* PCI IDs of supported chips */ diff --git a/sys/dev/sound/pci/fm801.c b/sys/dev/sound/pci/fm801.c index 34fb1f6f1bf6..d7aa731175bb 100644 --- a/sys/dev/sound/pci/fm801.c +++ b/sys/dev/sound/pci/fm801.c @@ -35,8 +35,6 @@ #include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> -SND_DECLARE_FILE(""); - #define PCI_VENDOR_FORTEMEDIA 0x1319 #define PCI_DEVICE_FORTEMEDIA1 0x08011319 /* Audio controller */ #define PCI_DEVICE_FORTEMEDIA2 0x08021319 /* Joystick controller */ diff --git a/sys/dev/sound/pci/hda/hdaa.c b/sys/dev/sound/pci/hda/hdaa.c index ef8f634ac8e8..1831ae0c1f19 100644 --- a/sys/dev/sound/pci/hda/hdaa.c +++ b/sys/dev/sound/pci/hda/hdaa.c @@ -47,8 +47,6 @@ #include "mixer_if.h" -SND_DECLARE_FILE(""); - #define hdaa_lock(devinfo) snd_mtxlock((devinfo)->lock) #define hdaa_unlock(devinfo) snd_mtxunlock((devinfo)->lock) #define hdaa_lockassert(devinfo) snd_mtxassert((devinfo)->lock) diff --git a/sys/dev/sound/pci/hda/hdaa_patches.c b/sys/dev/sound/pci/hda/hdaa_patches.c index 8331312b69c9..5bb4dcd79af7 100644 --- a/sys/dev/sound/pci/hda/hdaa_patches.c +++ b/sys/dev/sound/pci/hda/hdaa_patches.c @@ -47,8 +47,6 @@ #include "pin_patch.h" #include "pin_patch_realtek.h" -SND_DECLARE_FILE(""); - static const struct { uint32_t model; uint32_t id; diff --git a/sys/dev/sound/pci/hda/hdac.c b/sys/dev/sound/pci/hda/hdac.c index 79ab71516cd9..422f7f930ea5 100644 --- a/sys/dev/sound/pci/hda/hdac.c +++ b/sys/dev/sound/pci/hda/hdac.c @@ -51,8 +51,6 @@ #define HDA_DRV_TEST_REV "20120126_0002" -SND_DECLARE_FILE(""); - #define hdac_lock(sc) snd_mtxlock((sc)->lock) #define hdac_unlock(sc) snd_mtxunlock((sc)->lock) #define hdac_lockassert(sc) snd_mtxassert((sc)->lock) diff --git a/sys/dev/sound/pci/hda/hdacc.c b/sys/dev/sound/pci/hda/hdacc.c index 4616b3b23a48..b551b4b37701 100644 --- a/sys/dev/sound/pci/hda/hdacc.c +++ b/sys/dev/sound/pci/hda/hdacc.c @@ -43,8 +43,6 @@ #include <dev/sound/pci/hda/hda_reg.h> #include <dev/sound/pci/hda/hdac.h> -SND_DECLARE_FILE(""); - struct hdacc_fg { device_t dev; nid_t nid; diff --git a/sys/dev/sound/pci/hdspe-pcm.c b/sys/dev/sound/pci/hdspe-pcm.c index b23304d32fc7..04ab7d2d35ce 100644 --- a/sys/dev/sound/pci/hdspe-pcm.c +++ b/sys/dev/sound/pci/hdspe-pcm.c @@ -40,8 +40,6 @@ #include <mixer_if.h> -SND_DECLARE_FILE(""); - struct hdspe_latency { uint32_t n; uint32_t period; diff --git a/sys/dev/sound/pci/hdspe.c b/sys/dev/sound/pci/hdspe.c index ac253b28df3a..7124fb1f5c57 100644 --- a/sys/dev/sound/pci/hdspe.c +++ b/sys/dev/sound/pci/hdspe.c @@ -40,8 +40,6 @@ #include <mixer_if.h> -SND_DECLARE_FILE(""); - static struct hdspe_channel chan_map_aio[] = { { 0, 1, "line", 1, 1 }, { 6, 7, "phone", 1, 0 }, diff --git a/sys/dev/sound/pci/ich.c b/sys/dev/sound/pci/ich.c index d5e8a48a186c..70a9440d9b23 100644 --- a/sys/dev/sound/pci/ich.c +++ b/sys/dev/sound/pci/ich.c @@ -38,8 +38,6 @@ #include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> -SND_DECLARE_FILE(""); - /* -------------------------------------------------------------------- */ #define ICH_TIMEOUT 1000 /* semaphore timeout polling count */ diff --git a/sys/dev/sound/pci/maestro3.c b/sys/dev/sound/pci/maestro3.c index c60c69b6baf5..9ba83fe4de11 100644 --- a/sys/dev/sound/pci/maestro3.c +++ b/sys/dev/sound/pci/maestro3.c @@ -69,8 +69,6 @@ #include <dev/sound/pci/allegro_reg.h> #include <dev/sound/pci/allegro_code.h> -SND_DECLARE_FILE(""); - /* -------------------------------------------------------------------- */ enum {CHANGE=0, CALL=1, INTR=2, BORING=3, NONE=-1}; diff --git a/sys/dev/sound/pci/neomagic.c b/sys/dev/sound/pci/neomagic.c index 162d99b57c70..1b325205da5f 100644 --- a/sys/dev/sound/pci/neomagic.c +++ b/sys/dev/sound/pci/neomagic.c @@ -40,8 +40,6 @@ #include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> -SND_DECLARE_FILE(""); - /* -------------------------------------------------------------------- */ #define NM_BUFFSIZE 16384 diff --git a/sys/dev/sound/pci/solo.c b/sys/dev/sound/pci/solo.c index 1788929811ed..d626da4fbb68 100644 --- a/sys/dev/sound/pci/solo.c +++ b/sys/dev/sound/pci/solo.c @@ -39,8 +39,6 @@ #include "mixer_if.h" -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 b7363402ba8b..250b04426482 100644 --- a/sys/dev/sound/pci/t4dwave.c +++ b/sys/dev/sound/pci/t4dwave.c @@ -37,8 +37,6 @@ #include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> -SND_DECLARE_FILE(""); - /* -------------------------------------------------------------------- */ #define TDX_PCI_ID 0x20001023 diff --git a/sys/dev/sound/pci/via8233.c b/sys/dev/sound/pci/via8233.c index 6656670c9e1c..517e80fadb4f 100644 --- a/sys/dev/sound/pci/via8233.c +++ b/sys/dev/sound/pci/via8233.c @@ -50,8 +50,6 @@ #include <dev/sound/pci/via8233.h> -SND_DECLARE_FILE(""); - #define VIA8233_PCI_ID 0x30591106 #define VIA8233_REV_ID_8233PRE 0x10 diff --git a/sys/dev/sound/pci/via82c686.c b/sys/dev/sound/pci/via82c686.c index 076df8c81aa0..266441a938c6 100644 --- a/sys/dev/sound/pci/via82c686.c +++ b/sys/dev/sound/pci/via82c686.c @@ -39,8 +39,6 @@ #include <dev/sound/pci/via82c686.h> -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 1299f15dc814..538aa961d987 100644 --- a/sys/dev/sound/pci/vibes.c +++ b/sys/dev/sound/pci/vibes.c @@ -44,8 +44,6 @@ #include "mixer_if.h" -SND_DECLARE_FILE(""); - /* ------------------------------------------------------------------------- */ /* Constants */ diff --git a/sys/dev/sound/pcm/ac97.c b/sys/dev/sound/pcm/ac97.c index d83e3f2fefa5..d04ec2d8271c 100644 --- a/sys/dev/sound/pcm/ac97.c +++ b/sys/dev/sound/pcm/ac97.c @@ -38,8 +38,6 @@ #include "mixer_if.h" -SND_DECLARE_FILE(""); - static MALLOC_DEFINE(M_AC97, "ac97", "ac97 codec"); struct ac97mixtable_entry { diff --git a/sys/dev/sound/pcm/ac97_patch.c b/sys/dev/sound/pcm/ac97_patch.c index aff8075fe96c..671b6598f51a 100644 --- a/sys/dev/sound/pcm/ac97_patch.c +++ b/sys/dev/sound/pcm/ac97_patch.c @@ -34,8 +34,6 @@ #include <dev/sound/pcm/ac97.h> #include <dev/sound/pcm/ac97_patch.h> -SND_DECLARE_FILE(""); - void ad1886_patch(struct ac97_info* codec) { #define AC97_AD_JACK_SPDIF 0x72 diff --git a/sys/dev/sound/pcm/buffer.c b/sys/dev/sound/pcm/buffer.c index d5a519362c5e..915c9110f107 100644 --- a/sys/dev/sound/pcm/buffer.c +++ b/sys/dev/sound/pcm/buffer.c @@ -40,8 +40,6 @@ #define SND_DECLARE_FXDIV #include "snd_fxdiv_gen.h" -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 d56f5fb51dc9..4cb2b2a92b44 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -38,8 +38,6 @@ #include "feeder_if.h" -SND_DECLARE_FILE(""); - int report_soft_formats = 1; SYSCTL_INT(_hw_snd, OID_AUTO, report_soft_formats, CTLFLAG_RW, &report_soft_formats, 0, "report software-emulated formats"); diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index 98d241e65a52..5aa7979b98c9 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -43,8 +43,6 @@ #include <vm/vm_page.h> #include <vm/vm_pager.h> -SND_DECLARE_FILE(""); - static int dsp_mmap_allow_prot_exec = 0; SYSCTL_INT(_hw_snd, OID_AUTO, compat_linux_mmap, CTLFLAG_RWTUN, &dsp_mmap_allow_prot_exec, 0, diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c index 8fb377533907..8278a85948a8 100644 --- a/sys/dev/sound/pcm/feeder.c +++ b/sys/dev/sound/pcm/feeder.c @@ -35,8 +35,6 @@ #include "feeder_if.h" -SND_DECLARE_FILE(""); - static MALLOC_DEFINE(M_FEEDER, "feeder", "pcm feeder"); #define MAXFEEDERS 256 diff --git a/sys/dev/sound/pcm/feeder_chain.c b/sys/dev/sound/pcm/feeder_chain.c index 01def5f6e9cb..52351ef58510 100644 --- a/sys/dev/sound/pcm/feeder_chain.c +++ b/sys/dev/sound/pcm/feeder_chain.c @@ -34,8 +34,6 @@ #include "feeder_if.h" -SND_DECLARE_FILE(""); - /* chain state */ struct feeder_chain_state { uint32_t afmt; /* audio format */ diff --git a/sys/dev/sound/pcm/feeder_eq.c b/sys/dev/sound/pcm/feeder_eq.c index 70797a706367..a097b13cd986 100644 --- a/sys/dev/sound/pcm/feeder_eq.c +++ b/sys/dev/sound/pcm/feeder_eq.c @@ -45,8 +45,6 @@ #define SND_USE_FXDIV #include "snd_fxdiv_gen.h" - -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 3a741430e0ca..1e18e3e07450 100644 --- a/sys/dev/sound/pcm/feeder_format.c +++ b/sys/dev/sound/pcm/feeder_format.c @@ -43,8 +43,6 @@ #define SND_USE_FXDIV #include "snd_fxdiv_gen.h" - -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 0afdb47c04d8..f5f02e2bf4f5 100644 --- a/sys/dev/sound/pcm/feeder_matrix.c +++ b/sys/dev/sound/pcm/feeder_matrix.c @@ -53,8 +53,6 @@ #define SND_USE_FXDIV #include "snd_fxdiv_gen.h" - -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 42ebe89d7c09..9f6b653effa3 100644 --- a/sys/dev/sound/pcm/feeder_mixer.c +++ b/sys/dev/sound/pcm/feeder_mixer.c @@ -37,8 +37,6 @@ #define SND_USE_FXDIV #include "snd_fxdiv_gen.h" - -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 b2afe0651bf5..c8cc67e8fa80 100644 --- a/sys/dev/sound/pcm/feeder_rate.c +++ b/sys/dev/sound/pcm/feeder_rate.c @@ -60,8 +60,6 @@ #define SND_USE_FXDIV #include "snd_fxdiv_gen.h" - -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 fa11a089af76..452d8788a5a5 100644 --- a/sys/dev/sound/pcm/feeder_volume.c +++ b/sys/dev/sound/pcm/feeder_volume.c @@ -38,8 +38,6 @@ #define SND_USE_FXDIV #include "snd_fxdiv_gen.h" - -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 0c7576390b72..ee1ed11a8ed0 100644 --- a/sys/dev/sound/pcm/mixer.c +++ b/sys/dev/sound/pcm/mixer.c @@ -37,8 +37,6 @@ #include "feeder_if.h" #include "mixer_if.h" -SND_DECLARE_FILE(""); - static MALLOC_DEFINE(M_MIXER, "mixer", "mixer"); static int mixer_bypass = 1; diff --git a/sys/dev/sound/pcm/sndstat.c b/sys/dev/sound/pcm/sndstat.c index 6bd3e56687bf..32b47b8ee105 100644 --- a/sys/dev/sound/pcm/sndstat.c +++ b/sys/dev/sound/pcm/sndstat.c @@ -49,9 +49,6 @@ #include <dev/sound/pcm/pcm.h> #include <dev/sound/version.h> - -SND_DECLARE_FILE(""); - #define SS_TYPE_PCM 1 #define SS_TYPE_MIDI 2 #define SS_TYPE_SEQUENCER 3 @@ -1100,11 +1097,6 @@ sndstat_register(device_t dev, char *str, sndstat_handler handler) return (0); } -void -sndstat_registerfile(void *dummy __unused) -{ -} - int sndstat_unregister(device_t dev) { @@ -1125,11 +1117,6 @@ sndstat_unregister(device_t dev) return (error); } -void -sndstat_unregisterfile(void *dummy __unused) -{ -} - /************************************************************************/ static int diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index 17dc8d968b3c..b23a28d3af08 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -44,8 +44,6 @@ #include "feeder_if.h" -SND_DECLARE_FILE(""); - devclass_t pcm_devclass; int pcm_veto_load = 1; diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index 1b9168b9171b..5981266116fb 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -347,11 +347,7 @@ void snd_mtxassert(void *m); typedef int (*sndstat_handler)(struct sbuf *s, device_t dev, int verbose); int sndstat_register(device_t dev, char *str, sndstat_handler handler); -void sndstat_registerfile(void *); int sndstat_unregister(device_t dev); -void sndstat_unregisterfile(void *); - -#define SND_DECLARE_FILE(version) /* usage of flags in device config entry (config file) */ #define DV_F_DRQ_MASK 0x00000007 /* mask for secondary drq */ diff --git a/sys/dev/sound/pcm/vchan.c b/sys/dev/sound/pcm/vchan.c index c84d8f14e075..d10c3ff4aabb 100644 --- a/sys/dev/sound/pcm/vchan.c +++ b/sys/dev/sound/pcm/vchan.c @@ -36,8 +36,6 @@ #include <dev/sound/pcm/sound.h> #include <dev/sound/pcm/vchan.h> -SND_DECLARE_FILE(""); - /* * [ac3 , dts , linear , 0, linear, 0] */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308182005.37IK5Shs001728>