[src/trunk]: src/sys/dev move spkrio.h out of isa

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ed0143a303d5
branches:  trunk
changeset: 349377:ed0143a303d5
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Dec 09 04:46:39 2016 +0000

description:
move spkrio.h out of isa

diffstat:

 sys/dev/Makefile         |   4 ++--
 sys/dev/isa/Makefile     |   4 ++--
 sys/dev/isa/spkr_pcppi.c |   5 +++--
 sys/dev/spkr.c           |   5 +++--
 sys/dev/spkrio.h         |  14 ++++----------
 sys/dev/spkrvar.h        |   9 ++++++++-
 6 files changed, 22 insertions(+), 19 deletions(-)

diffs (134 lines):

diff -r a49132772caf -r ed0143a303d5 sys/dev/Makefile
--- a/sys/dev/Makefile  Fri Dec 09 04:32:39 2016 +0000
+++ b/sys/dev/Makefile  Fri Dec 09 04:46:39 2016 +0000
@@ -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 @@
 
 # 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 -r a49132772caf -r ed0143a303d5 sys/dev/isa/Makefile
--- a/sys/dev/isa/Makefile      Fri Dec 09 04:32:39 2016 +0000
+++ b/sys/dev/isa/Makefile      Fri Dec 09 04:46:39 2016 +0000
@@ -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 -r a49132772caf -r ed0143a303d5 sys/dev/isa/spkr_pcppi.c
--- a/sys/dev/isa/spkr_pcppi.c  Fri Dec 09 04:32:39 2016 +0000
+++ b/sys/dev/isa/spkr_pcppi.c  Fri Dec 09 04:46:39 2016 +0000
@@ -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@localhost)
@@ -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 @@
 
 #include <dev/isa/pcppivar.h>
 
+#include <dev/spkrvar.h>
 #include <dev/spkrio.h>
 
 extern int spkr_attached;
diff -r a49132772caf -r ed0143a303d5 sys/dev/spkr.c
--- a/sys/dev/spkr.c    Fri Dec 09 04:32:39 2016 +0000
+++ b/sys/dev/spkr.c    Fri Dec 09 04:46:39 2016 +0000
@@ -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@localhost)
@@ -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 @@
 #include <sys/bus.h>
 
 #include <dev/spkrio.h>
+#include <dev/spkrvar.h>
 
 dev_type_open(spkropen);
 dev_type_close(spkrclose);
diff -r a49132772caf -r ed0143a303d5 sys/dev/spkrio.h
--- a/sys/dev/spkrio.h  Fri Dec 09 04:32:39 2016 +0000
+++ b/sys/dev/spkrio.h  Fri Dec 09 04:46:39 2016 +0000
@@ -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 @@
        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 -r a49132772caf -r ed0143a303d5 sys/dev/spkrvar.h
--- a/sys/dev/spkrvar.h Fri Dec 09 04:32:39 2016 +0000
+++ b/sys/dev/spkrvar.h Fri Dec 09 04:46:39 2016 +0000
@@ -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 */