diff options
| author | christos <christos@NetBSD.org> | 2016-12-09 04:46:39 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2016-12-09 04:46:39 +0000 |
| commit | a4cc4a33df9c1e94dd5f6aae54f3813f4e86af97 (patch) | |
| tree | 889aefdfcafa7e5b49903fa12730a384249e0a24 /sys/dev | |
| parent | 62b1b0ded34f645e63afe851d8507df8fc2e3a67 (diff) | |
move spkrio.h out of isa
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/Makefile | 4 | ||||
| -rw-r--r-- | sys/dev/isa/Makefile | 4 | ||||
| -rw-r--r-- | sys/dev/isa/spkr_pcppi.c | 5 | ||||
| -rw-r--r-- | sys/dev/spkr.c | 5 | ||||
| -rw-r--r-- | sys/dev/spkrio.h | 14 | ||||
| -rw-r--r-- | sys/dev/spkrvar.h | 9 |
6 files changed, 22 insertions, 19 deletions
diff --git a/sys/dev/Makefile b/sys/dev/Makefile index 260cf62a7ff..f2f2a0fa503 100644 --- a/sys/dev/Makefile +++ b/sys/dev/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2015/08/02 11:09:05 jmcneill Exp $ +# $NetBSD: Makefile,v 1.38 2016/12/09 04:46:39 christos Exp $ SUBDIR= apm ata bluetooth dec dm dmover dtv filemon hdaudio hdmicec hpc \ i2c i2o ic ieee1394 ir isa \ @@ -15,6 +15,6 @@ INCSDIR= /usr/include/dev # Only install includes which are used by userland INCS= biovar.h ccdvar.h cgdvar.h fssvar.h keylock.h kttcpio.h lockstat.h \ - md.h vndvar.h + md.h vndvar.h spkrio.h .include <bsd.kinc.mk> diff --git a/sys/dev/isa/Makefile b/sys/dev/isa/Makefile index 7bd9db080b4..4e50d58e3bc 100644 --- a/sys/dev/isa/Makefile +++ b/sys/dev/isa/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2008/04/02 01:34:36 dyoung Exp $ +# $NetBSD: Makefile,v 1.9 2016/12/09 04:46:39 christos Exp $ INCSDIR= /usr/include/dev/isa # Only install includes which are used by userland -INCS= isvio.h satlinkio.h spkrio.h wtreg.h +INCS= isvio.h satlinkio.h wtreg.h .include <bsd.kinc.mk> diff --git a/sys/dev/isa/spkr_pcppi.c b/sys/dev/isa/spkr_pcppi.c index 9276032f404..60cf38f0f30 100644 --- a/sys/dev/isa/spkr_pcppi.c +++ b/sys/dev/isa/spkr_pcppi.c @@ -1,4 +1,4 @@ -/* $NetBSD: spkr_pcppi.c,v 1.2 2016/12/09 04:32:39 christos Exp $ */ +/* $NetBSD: spkr_pcppi.c,v 1.3 2016/12/09 04:46:39 christos Exp $ */ /* * Copyright (c) 1990 Eric S. Raymond (esr@snark.thyrsus.com) @@ -43,7 +43,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: spkr_pcppi.c,v 1.2 2016/12/09 04:32:39 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: spkr_pcppi.c,v 1.3 2016/12/09 04:46:39 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -61,6 +61,7 @@ __KERNEL_RCSID(0, "$NetBSD: spkr_pcppi.c,v 1.2 2016/12/09 04:32:39 christos Exp #include <dev/isa/pcppivar.h> +#include <dev/spkrvar.h> #include <dev/spkrio.h> extern int spkr_attached; diff --git a/sys/dev/spkr.c b/sys/dev/spkr.c index 0a08000106f..599efa8be90 100644 --- a/sys/dev/spkr.c +++ b/sys/dev/spkr.c @@ -1,4 +1,4 @@ -/* $NetBSD: spkr.c,v 1.1 2016/12/09 04:32:39 christos Exp $ */ +/* $NetBSD: spkr.c,v 1.2 2016/12/09 04:46:39 christos Exp $ */ /* * Copyright (c) 1990 Eric S. Raymond (esr@snark.thyrsus.com) @@ -43,7 +43,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.1 2016/12/09 04:32:39 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.2 2016/12/09 04:46:39 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -60,6 +60,7 @@ __KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.1 2016/12/09 04:32:39 christos Exp $"); #include <sys/bus.h> #include <dev/spkrio.h> +#include <dev/spkrvar.h> dev_type_open(spkropen); dev_type_close(spkrclose); diff --git a/sys/dev/spkrio.h b/sys/dev/spkrio.h index f6719df9fab..db703fc2cbe 100644 --- a/sys/dev/spkrio.h +++ b/sys/dev/spkrio.h @@ -1,11 +1,11 @@ -/* $NetBSD: spkrio.h,v 1.1 2016/12/09 04:32:39 christos Exp $ */ +/* $NetBSD: spkrio.h,v 1.2 2016/12/09 04:46:39 christos Exp $ */ /* - * spkr.h -- interface definitions for speaker ioctl() + * spkrio.h -- interface definitions for speaker ioctl() */ -#ifndef _DEV_ISA_SPKR_H_ -#define _DEV_ISA_SPKR_H_ +#ifndef _DEV_SPKRIO_H_ +#define _DEV_SPKRIO_H_ #include <sys/ioccom.h> @@ -17,10 +17,4 @@ typedef struct { int duration; /* in 1/100ths of a second */ } tone_t; -void spkr_tone(u_int, u_int); -void spkr_rest(int); -int spkr__modcmd(modcmd_t, void *); -int spkr_probe(device_t, cfdata_t, void *); -extern int spkr_attached; - #endif diff --git a/sys/dev/spkrvar.h b/sys/dev/spkrvar.h index 15e094c503f..55dc12c178d 100644 --- a/sys/dev/spkrvar.h +++ b/sys/dev/spkrvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: spkrvar.h,v 1.1 2016/12/08 11:31:08 nat Exp $ */ +/* $NetBSD: spkrvar.h,v 1.2 2016/12/09 04:46:39 christos Exp $ */ #ifndef _SYS_DEV_SPKRVAR_H #define _SYS_DEV_SPKRVAR_H @@ -6,4 +6,11 @@ device_t speakerattach_mi(device_t); void speaker_play(u_int, u_int, u_int); +// XXX: +void spkr_tone(u_int, u_int); +void spkr_rest(int); +int spkr__modcmd(modcmd_t, void *); +int spkr_probe(device_t, cfdata_t, void *); +extern int spkr_attached; + #endif /* _SYS_DEV_SPKRVAR_H */ |
