diff options
| author | phk <phk@FreeBSD.org> | 1999-08-23 20:59:21 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 1999-08-23 20:59:21 +0000 |
| commit | 663cbe4fc26065f7af7d10faaee492a626156145 (patch) | |
| tree | 32e619fadb473bfb85ff8e06044176f2ff323cce /sys/i386/isa/pcaudio.c | |
| parent | 2a5ff1f726f814a9e4717afe3f14250f8030cace (diff) | |
| download | FreeBSD-src-663cbe4fc26065f7af7d10faaee492a626156145.zip FreeBSD-src-663cbe4fc26065f7af7d10faaee492a626156145.tar.gz | |
Convert DEVFS hooks in (most) drivers to make_dev().
Diskslice/label code not yet handled.
Vinum, i4b, alpha, pc98 not dealt with (left to respective Maintainers)
Add the correct hook for devfs to kern_conf.c
The net result of this excercise is that a lot less files depends on DEVFS,
and devtoname() gets more sensible output in many cases.
A few drivers had minor additional cleanups performed relating to cdevsw
registration.
A few drivers don't register a cdevsw{} anymore, but only use make_dev().
Diffstat (limited to 'sys/i386/isa/pcaudio.c')
| -rw-r--r-- | sys/i386/isa/pcaudio.c | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/sys/i386/isa/pcaudio.c b/sys/i386/isa/pcaudio.c index 8ed04da..cdf3b35 100644 --- a/sys/i386/isa/pcaudio.c +++ b/sys/i386/isa/pcaudio.c @@ -25,13 +25,11 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: pcaudio.c,v 1.49 1999/05/30 16:52:21 phk Exp $ + * $Id: pcaudio.c,v 1.50 1999/05/31 11:26:19 phk Exp $ */ #include "pca.h" #if NPCA > 0 -#include "opt_devfs.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/conf.h> @@ -48,10 +46,6 @@ #include <i386/isa/isa_device.h> #include <i386/isa/timerreg.h> -#ifdef DEVFS -#include <sys/devfsext.h> -#endif /* DEVFS */ - #define BUF_SIZE 8192 #define SAMPLE_RATE 8000 #define INTERRUPT_RATE 16000 @@ -118,11 +112,6 @@ static unsigned char alaw_linear[] = { 76, 181, 125, 130, 0, 255, 115, 141, }; -#ifdef DEVFS -static void *pca_devfs_token; -static void *pcac_devfs_token; -#endif - static int pca_sleep = 0; static int pca_initialized = 0; @@ -329,13 +318,8 @@ pcaattach(struct isa_device *dvp) { printf("pca%d: PC speaker audio driver\n", dvp->id_unit); pca_init(); -#ifdef DEVFS - pca_devfs_token = - devfs_add_devswf(&pca_cdevsw, 0, DV_CHR, 0, 0, 0600, "pcaudio"); - pcac_devfs_token = - devfs_add_devswf(&pca_cdevsw, 128, DV_CHR, 0, 0, 0600, - "pcaudioctl"); -#endif /*DEVFS*/ + make_dev(&pca_cdevsw, 0, 0, 0, 0600, "pcaudio"); + make_dev(&pca_cdevsw, 128, 0, 0, 0600, "pcaudioctl"); return 1; } |
