Module Name: src
Committed By: christos
Date: Fri Dec 9 04:46:39 UTC 2016
Modified Files:
src/sys/dev: Makefile spkr.c spkrio.h spkrvar.h
src/sys/dev/isa: Makefile spkr_pcppi.c
Log Message:
move spkrio.h out of isa
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/Makefile
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/spkr.c src/sys/dev/spkrio.h \
src/sys/dev/spkrvar.h
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/isa/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/isa/spkr_pcppi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/Makefile
diff -u src/sys/dev/Makefile:1.37 src/sys/dev/Makefile:1.38
--- src/sys/dev/Makefile:1.37 Sun Aug 2 07:09:05 2015
+++ src/sys/dev/Makefile Thu Dec 8 23:46:39 2016
@@ -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>
Index: src/sys/dev/spkr.c
diff -u src/sys/dev/spkr.c:1.1 src/sys/dev/spkr.c:1.2
--- src/sys/dev/spkr.c:1.1 Thu Dec 8 23:32:39 2016
+++ src/sys/dev/spkr.c Thu Dec 8 23:46:39 2016
@@ -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 (e...@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
#include <sys/bus.h>
#include <dev/spkrio.h>
+#include <dev/spkrvar.h>
dev_type_open(spkropen);
dev_type_close(spkrclose);
Index: src/sys/dev/spkrio.h
diff -u src/sys/dev/spkrio.h:1.1 src/sys/dev/spkrio.h:1.2
--- src/sys/dev/spkrio.h:1.1 Thu Dec 8 23:32:39 2016
+++ src/sys/dev/spkrio.h Thu Dec 8 23:46:39 2016
@@ -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
Index: src/sys/dev/spkrvar.h
diff -u src/sys/dev/spkrvar.h:1.1 src/sys/dev/spkrvar.h:1.2
--- src/sys/dev/spkrvar.h:1.1 Thu Dec 8 06:31:08 2016
+++ src/sys/dev/spkrvar.h Thu Dec 8 23:46:39 2016
@@ -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 */
Index: src/sys/dev/isa/Makefile
diff -u src/sys/dev/isa/Makefile:1.8 src/sys/dev/isa/Makefile:1.9
--- src/sys/dev/isa/Makefile:1.8 Tue Apr 1 21:34:36 2008
+++ src/sys/dev/isa/Makefile Thu Dec 8 23:46:39 2016
@@ -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>
Index: src/sys/dev/isa/spkr_pcppi.c
diff -u src/sys/dev/isa/spkr_pcppi.c:1.2 src/sys/dev/isa/spkr_pcppi.c:1.3
--- src/sys/dev/isa/spkr_pcppi.c:1.2 Thu Dec 8 23:32:39 2016
+++ src/sys/dev/isa/spkr_pcppi.c Thu Dec 8 23:46:39 2016
@@ -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 (e...@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
#include <dev/isa/pcppivar.h>
+#include <dev/spkrvar.h>
#include <dev/spkrio.h>
extern int spkr_attached;
