summaryrefslogtreecommitdiffstats
path: root/sys/modules/sound
diff options
context:
space:
mode:
authortanimura <tanimura@FreeBSD.org>2004-07-16 04:00:08 +0000
committertanimura <tanimura@FreeBSD.org>2004-07-16 04:00:08 +0000
commit217e78b7457004446a61ac3de506050009ca0bef (patch)
tree5419140a7517d7d82581984a80f60302e0c26f45 /sys/modules/sound
parentb89aa7ae3fe36fd58577692d8167156e891a56df (diff)
downloadFreeBSD-src-217e78b7457004446a61ac3de506050009ca0bef.zip
FreeBSD-src-217e78b7457004446a61ac3de506050009ca0bef.tar.gz
Rename the sound device drivers:
- `sound' The generic sound driver, always required. - `snd_*' Device-dependent drivers, named after the sound module names. Configure accordingly to your hardware. In addition, rename the `snd_pcm' module to `sound' in order to sync with the driver names. Suggested by: cg
Diffstat (limited to 'sys/modules/sound')
-rw-r--r--sys/modules/sound/Makefile2
-rw-r--r--sys/modules/sound/pcm/Makefile17
-rw-r--r--sys/modules/sound/sound/Makefile2
3 files changed, 2 insertions, 19 deletions
diff --git a/sys/modules/sound/Makefile b/sys/modules/sound/Makefile
index 41ea856..d686733 100644
--- a/sys/modules/sound/Makefile
+++ b/sys/modules/sound/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
SUBDIR =
-SUBDIR += pcm
+SUBDIR += sound
SUBDIR += driver
.include <bsd.subdir.mk>
diff --git a/sys/modules/sound/pcm/Makefile b/sys/modules/sound/pcm/Makefile
deleted file mode 100644
index f540aeb..0000000
--- a/sys/modules/sound/pcm/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../../dev/sound/pcm
-.PATH: ${.CURDIR}/../../../dev/sound/isa
-
-KMOD= snd_pcm
-SRCS= device_if.h bus_if.h isa_if.h pci_if.h
-SRCS+= ac97_if.h channel_if.h feeder_if.h mixer_if.h
-SRCS+= ac97_if.c channel_if.c feeder_if.c mixer_if.c
-SRCS+= ac97.c ac97_patch.c buffer.c channel.c dsp.c
-SRCS+= fake.c feeder.c feeder_fmt.c feeder_rate.c
-SRCS+= mixer.c sndstat.c sound.c vchan.c
-SRCS+= sndbuf_dma.c
-
-EXPORT_SYMS= YES # XXX evaluate
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/sound/sound/Makefile b/sys/modules/sound/sound/Makefile
index f540aeb..752fadd 100644
--- a/sys/modules/sound/sound/Makefile
+++ b/sys/modules/sound/sound/Makefile
@@ -3,7 +3,7 @@
.PATH: ${.CURDIR}/../../../dev/sound/pcm
.PATH: ${.CURDIR}/../../../dev/sound/isa
-KMOD= snd_pcm
+KMOD= sound
SRCS= device_if.h bus_if.h isa_if.h pci_if.h
SRCS+= ac97_if.h channel_if.h feeder_if.h mixer_if.h
SRCS+= ac97_if.c channel_if.c feeder_if.c mixer_if.c
OpenPOWER on IntegriCloud