- Connect the snd_emu10kx driver to the build. [1]

- Bump __FreeBSD_version, no need to build the port now.

Submitted by:	Yuriy Tsibizov <Yuriy.Tsibizov@gfk.ru> [1]

6 files changed, 39 insertions, 5 deletions

diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 4bde8a8..0783b45 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -1962,6 +1962,7 @@ device		sound
 #			4281)
 # snd_ds1:		Yamaha DS-1 PCI.
 # snd_emu10k1:		Creative EMU10K1 PCI and EMU10K2 (Audigy) PCI.
+# snd_emu10kx:		Creative SoundBlaster Live! and Audigy
 # snd_es137x:		Ensoniq AudioPCI ES137x PCI.
 # snd_ess:		Ensoniq ESS ISA PnP/non-PnP, to be used in
 #			conjunction with snd_sbc.
@@ -1998,6 +1999,8 @@ device		snd_cs4281
 device		snd_csa
 device		snd_ds1
 device		snd_emu10k1
+device		snd_emu10kx
+options		SND_EMU10KX_MULTICHANNEL
 device		snd_es137x
 device		snd_ess
 device		snd_fm801
diff --git a/sys/conf/files b/sys/conf/files
index 49898ac..3d4c03c 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -55,6 +55,21 @@ emu10k1-alsa%diked.h		optional snd_emu10k1 pci			   \
 	compile-with	"CC='${CC}' AWK=${AWK} sh $S/tools/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/emu10k1-alsa.h emu10k1-alsa%diked.h" \
 	no-obj no-implicit-rule before-depend				   \
 	clean		"emu10k1-alsa%diked.h"
+emu10k1-alsa%diked.h		optional snd_emu10kx pci			   \
+	dependency	"$S/tools/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/emu10k1-alsa.h" \
+	compile-with	"CC='${CC}' AWK=${AWK} sh $S/tools/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/emu10k1-alsa.h emu10k1-alsa%diked.h" \
+	no-obj no-implicit-rule before-depend				   \
+	clean		"emu10k1-alsa%diked.h"
+p16v-alsa%diked.h		optional snd_emu10kx pci			   \
+	dependency	"$S/tools/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/p16v-alsa.h" \
+	compile-with	"CC='${CC}' AWK=${AWK} sh $S/tools/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/p16v-alsa.h p16v-alsa%diked.h" \
+	no-obj no-implicit-rule before-depend				   \
+	clean		"p16v-alsa%diked.h"
+p17v-alsa%diked.h		optional snd_emu10kx pci			   \
+	dependency	"$S/tools/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/p17v-alsa.h" \
+	compile-with	"CC='${CC}' AWK=${AWK} sh $S/tools/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/p17v-alsa.h p17v-alsa%diked.h" \
+	no-obj no-implicit-rule before-depend				   \
+	clean		"p17v-alsa%diked.h"
 miidevs.h			optional miibus | mii			   \
 	dependency	"$S/tools/miidevs2h.awk $S/dev/mii/miidevs"	   \
 	compile-with	"${AWK} -f $S/tools/miidevs2h.awk $S/dev/mii/miidevs" \
@@ -873,6 +888,19 @@ dev/sound/pci/ds1.c		optional snd_ds1 pci
 dev/sound/pci/emu10k1.c		optional snd_emu10k1 pci \
 	dependency "emu10k1-alsa%diked.h" \
 	warning "kernel contains GPL contaminated emu10k1 headers"
+dev/sound/pci/emu10kx.c		optional snd_emu10kx pci \
+	dependency "emu10k1-alsa%diked.h" \
+	dependency "p16v-alsa%diked.h" \
+	dependency "p17v-alsa%diked.h" \
+	warning "kernel contains GPL contaminated emu10kx headers"
+dev/sound/pci/emu10kx-pcm.c	optional snd_emu10kx pci \
+	dependency "emu10k1-alsa%diked.h" \
+	dependency "p16v-alsa%diked.h" \
+	dependency "p17v-alsa%diked.h" \
+	warning "kernel contains GPL contaminated emu10kx headers"
+dev/sound/pci/emu10kx-midi.c	optional snd_emu10kx pci \
+	dependency "emu10k1-alsa%diked.h" \
+	warning "kernel contains GPL contaminated emu10kx headers"
 dev/sound/pci/es137x.c		optional snd_es137x pci
 dev/sound/pci/fm801.c		optional snd_fm801 pci
 dev/sound/pci/ich.c		optional snd_ich pci
diff --git a/sys/conf/options b/sys/conf/options
index 7cbb2c3..f100d47 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -725,3 +725,6 @@ XBOX			opt_xbox.h
 
 # XFS
 XFS
+
+# snd_emu10kx sound driver options
+SND_EMU10KX_MULTICHANNEL	opt_emu10kx.h
diff --git a/sys/dev/sound/driver.c b/sys/dev/sound/driver.c
index af52fda..29d6ec1 100644
--- a/sys/dev/sound/driver.c
+++ b/sys/dev/sound/driver.c
@@ -62,7 +62,7 @@ MODULE_DEPEND(snd_driver, snd_cs4281, 1, 1, 1);
 MODULE_DEPEND(snd_driver, snd_csa, 1, 1, 1);
 MODULE_DEPEND(snd_driver, snd_csapcm, 1, 1, 1);
 MODULE_DEPEND(snd_driver, snd_ds1, 1, 1, 1);
-MODULE_DEPEND(snd_driver, snd_emu10k1, 1, 1, 1);
+MODULE_DEPEND(snd_driver, snd_emu10kx, 1, 1, 1);
 MODULE_DEPEND(snd_driver, snd_envy24, 1, 1, 1);
 MODULE_DEPEND(snd_driver, snd_es137x, 1, 1, 1);
 MODULE_DEPEND(snd_driver, snd_ess, 1, 1, 1);
diff --git a/sys/modules/sound/driver/Makefile b/sys/modules/sound/driver/Makefile
index b49cf80..121748d 100644
--- a/sys/modules/sound/driver/Makefile
+++ b/sys/modules/sound/driver/Makefile
@@ -3,9 +3,9 @@
 .if ${MACHINE_ARCH} == "sparc64"
 SUBDIR  = audiocs es137x
 .else
-SUBDIR  = ad1816 ak452x als4000 atiixp cmi cs4281 csa ds1 emu10k1 envy24 es137x
-SUBDIR += ess fm801 ich maestro maestro3 mss neomagic sb16 sb8 sbc solo
-SUBDIR += t4dwave via8233 via82c686 vibes
+SUBDIR  = ad1816 ak452x als4000 atiixp cmi cs4281 csa ds1 emu10k1 emu10kx
+SUBDIR += envy24 es137x ess fm801 ich maestro maestro3 mss neomagic sb16 sb8
+SUBDIR += sbc solo t4dwave via8233 via82c686 vibes
 SUBDIR += driver uaudio
 .endif
 
diff --git a/sys/sys/param.h b/sys/sys/param.h
index ed8a0ab..17a2b5e 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -57,7 +57,7 @@
  *		is created, otherwise 1.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 700017	/* Master, propagated to newvers */
+#define __FreeBSD_version 700018	/* Master, propagated to newvers */
 
 #ifndef LOCORE
 #include <sys/types.h>