summaryrefslogtreecommitdiffstats
path: root/sys/dev/sound
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>2000-09-02 19:17:34 +0000
committerphk <phk@FreeBSD.org>2000-09-02 19:17:34 +0000
commite47f61e18396b6e5f61ee91b9f9f832976ee96cf (patch)
treebc17f23dc3fa3b9663516bac048049a5f02652ea /sys/dev/sound
parent0ab175f21b9e105fcbe4db6569019e946f23e13c (diff)
downloadFreeBSD-src-e47f61e18396b6e5f61ee91b9f9f832976ee96cf.zip
FreeBSD-src-e47f61e18396b6e5f61ee91b9f9f832976ee96cf.tar.gz
Avoid the modules madness I inadvertently introduced by making the
cloning infrastructure standard in kern_conf. Modules are now the same with or without devfs support. If you need to detect if devfs is present, in modules or elsewhere, check the integer variable "devfs_present". This happily removes an ugly hack from kern/vfs_conf.c. This forces a rename of the eventhandler and the standard clone helper function. Include <sys/eventhandler.h> in <sys/conf.h>: it's a helper #include like <sys/queue.h> Remove all #includes of opt_devfs.h they no longer matter.
Diffstat (limited to 'sys/dev/sound')
-rw-r--r--sys/dev/sound/isa/emu8000.c3
-rw-r--r--sys/dev/sound/isa/mpu.c2
-rw-r--r--sys/dev/sound/isa/opl.c2
-rw-r--r--sys/dev/sound/isa/uartsio.c2
-rw-r--r--sys/dev/sound/midi/midi.c2
-rw-r--r--sys/dev/sound/midi/midibuf.c2
-rw-r--r--sys/dev/sound/midi/midisynth.c2
-rw-r--r--sys/dev/sound/midi/sequencer.c2
-rw-r--r--sys/dev/sound/pci/csamidi.c2
9 files changed, 0 insertions, 19 deletions
diff --git a/sys/dev/sound/isa/emu8000.c b/sys/dev/sound/isa/emu8000.c
index d69d67c..65208ab 100644
--- a/sys/dev/sound/isa/emu8000.c
+++ b/sys/dev/sound/isa/emu8000.c
@@ -32,9 +32,6 @@
*
*/
-
-#include "opt_devfs.h"
-
#include <dev/sound/midi/midi.h>
#include <isa/isavar.h>
diff --git a/sys/dev/sound/isa/mpu.c b/sys/dev/sound/isa/mpu.c
index 7fd89bb..2ed93c1 100644
--- a/sys/dev/sound/isa/mpu.c
+++ b/sys/dev/sound/isa/mpu.c
@@ -37,8 +37,6 @@
*
*/
-#include "opt_devfs.h"
-
#include <dev/sound/midi/midi.h>
#include <dev/sound/chip.h>
#include <machine/cpufunc.h>
diff --git a/sys/dev/sound/isa/opl.c b/sys/dev/sound/isa/opl.c
index 3d2c9d6..3669e44 100644
--- a/sys/dev/sound/isa/opl.c
+++ b/sys/dev/sound/isa/opl.c
@@ -44,8 +44,6 @@
*
*/
-#include "opt_devfs.h"
-
#include <dev/sound/midi/midi.h>
#include <dev/sound/chip.h>
diff --git a/sys/dev/sound/isa/uartsio.c b/sys/dev/sound/isa/uartsio.c
index 9b43331..56b4e5d 100644
--- a/sys/dev/sound/isa/uartsio.c
+++ b/sys/dev/sound/isa/uartsio.c
@@ -46,8 +46,6 @@
*
*/
-#include "opt_devfs.h"
-
#include <isa/sioreg.h>
#include <isa/ic/ns16550.h>
#include <dev/sound/midi/midi.h>
diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c
index 83152cf..429a564 100644
--- a/sys/dev/sound/midi/midi.c
+++ b/sys/dev/sound/midi/midi.c
@@ -50,8 +50,6 @@
*
*/
-#include "opt_devfs.h"
-
#include <dev/sound/midi/midi.h>
static devclass_t midi_devclass;
diff --git a/sys/dev/sound/midi/midibuf.c b/sys/dev/sound/midi/midibuf.c
index 4e23800..5922a5b 100644
--- a/sys/dev/sound/midi/midibuf.c
+++ b/sys/dev/sound/midi/midibuf.c
@@ -35,8 +35,6 @@
* transmit to or received from a midi interface.
*/
-#include "opt_devfs.h"
-
#include <dev/sound/midi/midi.h>
/* Some macros to handle the queue. */
diff --git a/sys/dev/sound/midi/midisynth.c b/sys/dev/sound/midi/midisynth.c
index 7d668fd..42a2a7e 100644
--- a/sys/dev/sound/midi/midisynth.c
+++ b/sys/dev/sound/midi/midisynth.c
@@ -34,8 +34,6 @@
* midi messages, and vice versa.
*/
-#include "opt_devfs.h"
-
#include <stddef.h>
#include <dev/sound/midi/midi.h>
diff --git a/sys/dev/sound/midi/sequencer.c b/sys/dev/sound/midi/sequencer.c
index ba6a21d..9ba15a4 100644
--- a/sys/dev/sound/midi/sequencer.c
+++ b/sys/dev/sound/midi/sequencer.c
@@ -33,8 +33,6 @@
* to and from a midi device or synthesizer.
*/
-#include "opt_devfs.h"
-
#include <dev/sound/midi/midi.h>
#include <dev/sound/midi/sequencer.h>
diff --git a/sys/dev/sound/pci/csamidi.c b/sys/dev/sound/pci/csamidi.c
index 39ecda6..74ebb6e 100644
--- a/sys/dev/sound/pci/csamidi.c
+++ b/sys/dev/sound/pci/csamidi.c
@@ -26,8 +26,6 @@
* $FreeBSD$
*/
-#include "opt_devfs.h"
-
#include <dev/sound/midi/midi.h>
#include <dev/sound/chip.h>
#include <dev/sound/pci/csareg.h>
OpenPOWER on IntegriCloud