D41499.id.diff
No OneTemporary
Actions

Size

14 KB

Referenced Files

None

Subscribers

None

D41499.id.diff
View Options

	diff --git a/sys/arm/broadcom/bcm2835/bcm2835_audio.c b/sys/arm/broadcom/bcm2835/bcm2835_audio.c
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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
	--- 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 @@
	return (0);
	}

	-void
	-sndstat_registerfile(void *dummy __unused)
	-{
	-}
	-
	int
	sndstat_unregister(device_t dev)
	{
	@@ -1125,11 +1117,6 @@
	return (error);
	}

	-void
	-sndstat_unregisterfile(void *dummy __unused)
	-{
	-}
	-
	/************************************************************************/

	static int
	diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h
	--- a/sys/dev/sound/pcm/sound.h
	+++ b/sys/dev/sound/pcm/sound.h
	@@ -347,11 +347,7 @@

	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/sound.c b/sys/dev/sound/pcm/sound.c
	--- 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/vchan.c b/sys/dev/sound/pcm/vchan.c
	--- 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]
	*/

File Metadata

Mime Type: text/plain
Expires: Sun, Apr 12, 7:40 PM (10 h, 19 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 31366889
Default Alt Text: D41499.id.diff (14 KB)

D41499.id.diffNo OneTemporaryActions

D41499.id.diffView Options

File Metadata

Event Timeline

D41499.id.diff
No OneTemporary
Actions

D41499.id.diff
View Options