From e2339ccc4c9ddfe6a68716633a28dcd59c4ae104 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Mon, 8 Jan 2007 01:38:02 +0000 Subject: [PATCH] * Sync with FreeBSD-RELENG_6. * Add some devices to LINT. * Do some cleanup in sys/conf/files. OK-by: corecode --- sys/conf/files | 6 ++---- sys/config/LINT | 11 +++++++++-- sys/dev/sound/pci/atiixp.c | 8 ++++---- sys/dev/sound/pci/ich.c | 12 +++++++++--- 4 files changed, 24 insertions(+), 13 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index fe3d07fb2b..0da202a933 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1,5 +1,5 @@ # $FreeBSD: src/sys/conf/files,v 1.340.2.137 2003/06/04 17:10:30 sam Exp $ -# $DragonFly: src/sys/conf/files,v 1.148 2007/01/04 21:47:00 corecode Exp $ +# $DragonFly: src/sys/conf/files,v 1.149 2007/01/08 01:38:02 swildner Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1204,7 +1204,6 @@ bus/isa/pnp.c optional isa bus/isa/pnpparse.c optional isa # dev/sound/isa/ad1816.c optional snd_ad1816 isa -dev/sound/isa/es1888.c optional snd_ess isa dev/sound/isa/ess.c optional snd_ess isa dev/sound/isa/gusc.c optional snd_gusc isa dev/sound/isa/mss.c optional snd_mss isa @@ -1214,7 +1213,6 @@ dev/sound/isa/sbc.c optional snd_sbc isa dev/sound/isa/sndbuf_dma.c optional pcm isa dev/sound/pci/als4000.c optional snd_als4000 pci dev/sound/pci/atiixp.c optional snd_atiixp pci -#dev/sound/pci/au88x0.c optional snd_au88x0 pci dev/sound/pci/cmi.c optional snd_cmi pci dev/sound/pci/cs4281.c optional snd_cs4281 pci dev/sound/pci/csa.c optional snd_csa pci @@ -1224,6 +1222,7 @@ dev/sound/pci/emu10k1.c optional snd_emu10k1 pci \ dependency "emu10k1-alsa%diked.h" dev/sound/pci/es137x.c optional snd_es137x pci dev/sound/pci/fm801.c optional snd_fm801 pci +dev/sound/pci/hda/hdac.c optional snd_hda pci dev/sound/pci/ich.c optional snd_ich pci dev/sound/pci/maestro.c optional snd_maestro pci dev/sound/pci/maestro3.c optional snd_maestro3 pci @@ -1251,7 +1250,6 @@ dev/sound/pcm/mixer_if.m optional pcm dev/sound/pcm/sndstat.c optional pcm dev/sound/pcm/sound.c optional pcm dev/sound/pcm/vchan.c optional pcm -#dev/sound/usb/upcm.c optional snd_upcm usb dev/sound/usb/uaudio.c optional snd_uaudio usb dev/sound/usb/uaudio_pcm.c optional snd_uaudio usb # diff --git a/sys/config/LINT b/sys/config/LINT index 6a0b457795..f5e5f2f078 100644 --- a/sys/config/LINT +++ b/sys/config/LINT @@ -3,7 +3,7 @@ # as much of the source tree as it can. # # $FreeBSD: src/sys/i386/conf/LINT,v 1.749.2.144 2003/06/04 17:56:59 sam Exp $ -# $DragonFly: src/sys/config/LINT,v 1.100 2007/01/04 21:47:00 corecode Exp $ +# $DragonFly: src/sys/config/LINT,v 1.101 2007/01/08 01:38:02 swildner Exp $ # # NB: You probably don't want to try running a kernel built from this # file. Instead, you should start from GENERIC, and add options from @@ -1474,6 +1474,7 @@ options NATM #native ATM # Basic sound card support: device pcm # For PnP/PCI sound cards: +device "snd_ad1816" device "snd_als4000" device "snd_atiixp" device "snd_cmi" @@ -1482,11 +1483,17 @@ device "snd_csa" device "snd_ds1" device "snd_emu10k1" device "snd_es137x" +device "snd_ess" device "snd_fm801" +device "snd_hda" device "snd_ich" device "snd_maestro" device "snd_maestro3" +device "snd_mss" device "snd_neomagic" +device "snd_sb16" +device "snd_sb8" +device "snd_sbc" device "snd_solo" device "snd_t4dwave" device "snd_via8233" @@ -1494,7 +1501,7 @@ device "snd_via82c686" device "snd_vibes" # For non-pnp sound cards: device pcm0 at isa? irq 10 drq 1 flags 0x0 -# Usb +# USB device "snd_uaudio" # diff --git a/sys/dev/sound/pci/atiixp.c b/sys/dev/sound/pci/atiixp.c index 5d134aad8b..87376927f9 100644 --- a/sys/dev/sound/pci/atiixp.c +++ b/sys/dev/sound/pci/atiixp.c @@ -23,8 +23,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THEPOSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/sound/pci/atiixp.c,v 1.2.2.4 2006/04/04 17:24:33 ariff Exp $ - * $DragonFly: src/sys/dev/sound/pci/atiixp.c,v 1.1 2007/01/04 21:47:02 corecode Exp $ + * $FreeBSD: src/sys/dev/sound/pci/atiixp.c,v 1.2.2.5 2006/11/14 13:08:11 ariff Exp $ + * $DragonFly: src/sys/dev/sound/pci/atiixp.c,v 1.2 2007/01/08 01:38:02 swildner Exp $ */ /* @@ -66,7 +66,7 @@ #include -SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/atiixp.c,v 1.1 2007/01/04 21:47:02 corecode Exp $"); +SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/atiixp.c,v 1.2 2007/01/08 01:38:02 swildner Exp $"); struct atiixp_dma_op { volatile uint32_t addr; @@ -965,7 +965,7 @@ atiixp_pci_attach(device_t dev) /* * DMA tag for scatter-gather buffers and link pointers */ - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/sc->bufsz, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/2, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, diff --git a/sys/dev/sound/pci/ich.c b/sys/dev/sound/pci/ich.c index 47160a97d6..8a609ead53 100644 --- a/sys/dev/sound/pci/ich.c +++ b/sys/dev/sound/pci/ich.c @@ -24,8 +24,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THEPOSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/sound/pci/ich.c,v 1.53.2.8 2006/08/22 02:37:03 yongari Exp $ - * $DragonFly: src/sys/dev/sound/pci/ich.c,v 1.13 2007/01/04 21:47:02 corecode Exp $ + * $FreeBSD: src/sys/dev/sound/pci/ich.c,v 1.53.2.9 2006/12/24 05:44:10 ariff Exp $ + * $DragonFly: src/sys/dev/sound/pci/ich.c,v 1.14 2007/01/08 01:38:02 swildner Exp $ */ #include @@ -35,7 +35,7 @@ #include #include -SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/ich.c,v 1.13 2007/01/04 21:47:02 corecode Exp $"); +SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/ich.c,v 1.14 2007/01/08 01:38:02 swildner Exp $"); /* -------------------------------------------------------------------- */ @@ -67,6 +67,7 @@ SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/ich.c,v 1.13 2007/01/04 21:4 #define NVIDIA_NFORCE3_250 0x00ea #define NVIDIA_NFORCE4 0x0059 #define NVIDIA_NFORCE_410_MCP 0x026b +#define NVIDIA_NFORCE4_MCP 0x003a #define AMD_768 0x7445 #define AMD_8111 0x746d @@ -117,6 +118,8 @@ static const struct ich_type { "nVidia nForce4" }, { NVIDIA_VENDORID, NVIDIA_NFORCE_410_MCP, 0, "nVidia nForce 410 MCP" }, + { NVIDIA_VENDORID, NVIDIA_NFORCE4_MCP, 0, + "nVidia nForce 4 MCP" }, { AMD_VENDORID, AMD_768, 0, "AMD-768" }, { AMD_VENDORID, AMD_8111, 0, @@ -854,6 +857,9 @@ ich_pci_attach(device_t dev) case 0x81c0104d: /* Sony VAIO type T */ case 0x81c5104d: /* Sony VAIO VGN B1VP/B1XP */ case 0x3089103c: /* Compaq Presario B3800 */ + case 0x309a103c: /* HP Compaq nx4300 */ + case 0x82131033: /* NEC VersaPro VJ10F/BH */ + case 0x82be1033: /* NEC VersaPro VJ12F/CH */ ac97_setflags(sc->codec, ac97_getflags(sc->codec) | AC97_F_EAPD_INV); break; default: -- 2.41.0