Module Name: src
Committed By: christos
Date: Fri Dec 9 02:22:34 UTC 2016
Modified Files:
src/sys/dev/isa: files.isa spkr.c spkrio.h
Added Files:
src/sys/dev/isa: spkr_pcppi.c
Log Message:
split out the pcppi attachment of the speaker
XXX: needs more work
To generate a diff of this commit:
cvs rdiff -u -r1.165 -r1.166 src/sys/dev/isa/files.isa
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/isa/spkr.c
cvs rdiff -u -r0 -r1.1 src/sys/dev/isa/spkr_pcppi.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/isa/spkrio.h
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/isa/files.isa
diff -u src/sys/dev/isa/files.isa:1.165 src/sys/dev/isa/files.isa:1.166
--- src/sys/dev/isa/files.isa:1.165 Thu Dec 8 06:31:08 2016
+++ src/sys/dev/isa/files.isa Thu Dec 8 21:22:34 2016
@@ -1,4 +1,4 @@
-# $NetBSD: files.isa,v 1.165 2016/12/08 11:31:08 nat Exp $
+# $NetBSD: files.isa,v 1.166 2016/12/09 02:22:34 christos Exp $
#
# Config file and device description for machine-independent ISA code.
# Included by ports that need it. Requires that the SCSI files be
@@ -434,8 +434,9 @@ device pcppi {}
attach pcppi at isa
file dev/isa/pcppi.c pcppi needs-flag
-attach spkr at pcppi
-file dev/isa/spkr.c spkr & pcppispeaker needs-flag
+attach spkr at pcppi with spkr_pcppi
+file dev/isa/spkr.c spkr needs-flag
+file dev/isa/spkr_pcppi.c spkr_pcppi
attach midi at pcppi with midi_pcppi: midisyn
file dev/isa/midi_pcppi.c midi_pcppi
Index: src/sys/dev/isa/spkr.c
diff -u src/sys/dev/isa/spkr.c:1.38 src/sys/dev/isa/spkr.c:1.39
--- src/sys/dev/isa/spkr.c:1.38 Thu Dec 8 06:31:08 2016
+++ src/sys/dev/isa/spkr.c Thu Dec 8 21:22:34 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: spkr.c,v 1.38 2016/12/08 11:31:08 nat Exp $ */
+/* $NetBSD: spkr.c,v 1.39 2016/12/09 02:22:34 christos Exp $ */
/*
* Copyright (c) 1990 Eric S. Raymond (e...@snark.thyrsus.com)
@@ -42,9 +42,8 @@
* use hz value from param.c
*/
-#ifdef PCPPISPEAKER
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.38 2016/12/08 11:31:08 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.39 2016/12/09 02:22:34 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -60,30 +59,8 @@ __KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.3
#include <sys/bus.h>
-#include <dev/isa/pcppivar.h>
-
#include <dev/isa/spkrio.h>
-void spkrattach(device_t, device_t, void *);
-int spkrdetach(device_t, int);
-
-#include "ioconf.h"
-
-MODULE(MODULE_CLASS_DRIVER, spkr, NULL /* "pcppi" */);
-
-#ifdef _MODULE
-#include "ioconf.c"
-#endif
-
-#endif /* PCPPISPEAKER */
-
-int spkrprobe(device_t, cfdata_t, void *);
-
-#ifdef PCPPISPEAKER
-CFATTACH_DECL_NEW(spkr, 0,
- spkrprobe, spkrattach, spkrdetach, NULL);
-#endif
-
dev_type_open(spkropen);
dev_type_close(spkrclose);
dev_type_write(spkrwrite);
@@ -104,48 +81,15 @@ const struct cdevsw spkr_cdevsw = {
.d_flag = D_OTHER
};
-#ifdef PCPPISPEAKER
-static pcppi_tag_t ppicookie;
-#endif
-
-#define SPKRPRI (PZERO - 1)
-
-static void tone(u_int, u_int);
-static void rest(int);
static void playinit(void);
static void playtone(int, int, int);
static void playstring(char *, int);
-#ifdef PCPPISPEAKER
-static void
-tone(u_int xhz, u_int ticks)
-/* emit tone of frequency hz for given number of ticks */
-{
- pcppi_bell(ppicookie, xhz, ticks, PCPPI_BELL_SLEEP);
-}
-
-static void
-rest(int ticks)
-/* rest for given number of ticks */
-{
- /*
- * Set timeout to endrest function, then give up the timeslice.
- * This is so other processes can execute while the rest is being
- * waited out.
- */
-#ifdef SPKRDEBUG
- printf("rest: %d\n", ticks);
-#endif /* SPKRDEBUG */
- if (ticks > 0)
- tsleep(rest, SPKRPRI | PCATCH, "rest", ticks);
-}
-#endif
-
/**************** PLAY STRING INTERPRETER BEGINS HERE **********************
*
* Play string interpretation is modelled on IBM BASIC 2.0's PLAY statement;
* M[LNS] are missing and the ~ synonym and octave-tracking facility is added.
- * Requires tone(), rest(), and endtone(). String play is not interruptible
+ * Requires spkr_tone(), spkr_rest(). String play is not interruptible
* except possibly at physical block boundaries.
*/
@@ -223,7 +167,7 @@ playtone(int pitch, int val, int sustain
}
if (pitch == -1)
- rest(whole * snum / (val * sdenom));
+ spkr_rest(whole * snum / (val * sdenom));
else
{
sound = (whole * snum) / (val * sdenom)
@@ -235,9 +179,9 @@ playtone(int pitch, int val, int sustain
pitch, sound, silence);
#endif /* SPKRDEBUG */
- tone(pitchtab[pitch], sound);
+ spkr_tone(pitchtab[pitch], sound);
if (fill != LEGATO)
- rest(silence);
+ spkr_rest(silence);
}
}
@@ -418,45 +362,14 @@ playstring(char *cp, int slen)
/******************* UNIX DRIVER HOOKS BEGIN HERE **************************
*
- * This section implements driver hooks to run playstring() and the tone(),
- * endtone(), and rest() functions defined above.
+ * This section implements driver hooks to run playstring() and the spkr_tone()
+ * and spkr_rest() functions defined above.
*/
-static int spkr_active; /* exclusion flag */
+int spkr_active; /* exclusion flag */
+extern int spkr_attached;
static void *spkr_inbuf;
-static int spkr_attached = 0;
-
-int
-spkrprobe(device_t parent, cfdata_t match, void *aux)
-{
- return (!spkr_attached);
-}
-
-#ifdef PCPPISPEAKER
-void
-spkrattach(device_t parent, device_t self, void *aux)
-{
- aprint_naive("\n");
- aprint_normal("\n");
- ppicookie = ((struct pcppi_attach_args *)aux)->pa_cookie;
- spkr_attached = 1;
- if (!pmf_device_register(self, NULL, NULL))
- aprint_error_dev(self, "couldn't establish power handler\n");
-}
-
-int
-spkrdetach(device_t self, int flags)
-{
-
- pmf_device_deregister(self);
- spkr_attached = 0;
- ppicookie = NULL;
-
- return 0;
-}
-#endif
-
int
spkropen(dev_t dev, int flags, int mode, struct lwp *l)
{
@@ -510,7 +423,7 @@ spkrclose(dev_t dev, int flags, int mode
return(ENXIO);
else
{
- tone(0, 0);
+ spkr_tone(0, 0);
free(spkr_inbuf, M_DEVBUF);
spkr_active = 0;
}
@@ -531,9 +444,9 @@ spkrioctl(dev_t dev, u_long cmd, void *d
tone_t *tp = (tone_t *)data;
if (tp->frequency == 0)
- rest(tp->duration);
+ spkr_rest(tp->duration);
else
- tone(tp->frequency, tp->duration);
+ spkr_tone(tp->frequency, tp->duration);
}
else if (cmd == SPKRTUNE)
{
@@ -548,53 +461,12 @@ spkrioctl(dev_t dev, u_long cmd, void *d
if (ttp.duration == 0)
break;
if (ttp.frequency == 0)
- rest(ttp.duration);
+ spkr_rest(ttp.duration);
else
- tone(ttp.frequency, ttp.duration);
+ spkr_tone(ttp.frequency, ttp.duration);
}
}
else
return(EINVAL);
return(0);
}
-
-static int
-spkr_modcmd(modcmd_t cmd, void *arg)
-{
-#ifdef _MODULE
- devmajor_t bmajor, cmajor;
-#endif
- int error = 0;
-
-#ifdef _MODULE
- switch(cmd) {
- case MODULE_CMD_INIT:
- bmajor = cmajor = -1;
- error = devsw_attach(spkr_cd.cd_name, NULL, &bmajor,
- &spkr_cdevsw, &cmajor);
- if (error)
- break;
-
- error = config_init_component(cfdriver_ioconf_spkr,
- cfattach_ioconf_spkr, cfdata_ioconf_spkr);
- if (error) {
- devsw_detach(NULL, &spkr_cdevsw);
- }
- break;
-
- case MODULE_CMD_FINI:
- if (spkr_active)
- return EBUSY;
- error = config_fini_component(cfdriver_ioconf_spkr,
- cfattach_ioconf_spkr, cfdata_ioconf_spkr);
- devsw_detach(NULL, &spkr_cdevsw);
- break;
- default:
- error = ENOTTY;
- break;
- }
-#endif
-
- return error;
-}
-/* spkr.c ends here */
Index: src/sys/dev/isa/spkrio.h
diff -u src/sys/dev/isa/spkrio.h:1.2 src/sys/dev/isa/spkrio.h:1.3
--- src/sys/dev/isa/spkrio.h:1.2 Sun Sep 6 02:01:00 2015
+++ src/sys/dev/isa/spkrio.h Thu Dec 8 21:22:34 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: spkrio.h,v 1.2 2015/09/06 06:01:00 dholland Exp $ */
+/* $NetBSD: spkrio.h,v 1.3 2016/12/09 02:22:34 christos Exp $ */
/*
* spkr.h -- interface definitions for speaker ioctl()
@@ -17,4 +17,7 @@ typedef struct {
int duration; /* in 1/100ths of a second */
} tone_t;
+void spkr_tone(u_int, u_int);
+void spkr_rest(int);
+
#endif /* _DEV_ISA_SPKR_H_ */
Added files:
Index: src/sys/dev/isa/spkr_pcppi.c
diff -u /dev/null src/sys/dev/isa/spkr_pcppi.c:1.1
--- /dev/null Thu Dec 8 21:22:34 2016
+++ src/sys/dev/isa/spkr_pcppi.c Thu Dec 8 21:22:34 2016
@@ -0,0 +1,179 @@
+/* $NetBSD: spkr_pcppi.c,v 1.1 2016/12/09 02:22:34 christos Exp $ */
+
+/*
+ * Copyright (c) 1990 Eric S. Raymond (e...@snark.thyrsus.com)
+ * Copyright (c) 1990 Andrew A. Chernov (a...@astral.msk.su)
+ * Copyright (c) 1990 Lennart Augustsson (lenn...@augustsson.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by Eric S. Raymond
+ * 4. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * spkr.c -- device driver for console speaker on 80386
+ *
+ * v1.1 by Eric S. Raymond (e...@snark.thyrsus.com) Feb 1990
+ * modified for 386bsd by Andrew A. Chernov <a...@astral.msk.su>
+ * 386bsd only clean version, all SYSV stuff removed
+ * use hz value from param.c
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: spkr_pcppi.c,v 1.1 2016/12/09 02:22:34 christos Exp $");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/errno.h>
+#include <sys/device.h>
+#include <sys/malloc.h>
+#include <sys/module.h>
+#include <sys/uio.h>
+#include <sys/proc.h>
+#include <sys/ioctl.h>
+#include <sys/conf.h>
+
+#include <sys/bus.h>
+
+#include <dev/isa/pcppivar.h>
+
+#include <dev/isa/spkrio.h>
+
+void spkrattach(device_t, device_t, void *);
+int spkrdetach(device_t, int);
+int spkrprobe(device_t, cfdata_t, void *);
+
+#include "ioconf.h"
+
+MODULE(MODULE_CLASS_DRIVER, spkr, NULL /* "pcppi" */);
+
+#ifdef _MODULE
+#include "ioconf.c"
+#endif
+
+CFATTACH_DECL_NEW(spkr_pcppi, 0, spkrprobe, spkrattach, spkrdetach, NULL);
+
+static pcppi_tag_t ppicookie;
+
+#define SPKRPRI (PZERO - 1)
+
+void
+spkr_tone(u_int xhz, u_int ticks)
+/* emit tone of frequency hz for given number of ticks */
+{
+ pcppi_bell(ppicookie, xhz, ticks, PCPPI_BELL_SLEEP);
+}
+
+void
+spkr_rest(int ticks)
+/* rest for given number of ticks */
+{
+ /*
+ * Set timeout to endrest function, then give up the timeslice.
+ * This is so other processes can execute while the rest is being
+ * waited out.
+ */
+#ifdef SPKRDEBUG
+ printf("%s: %d\n", __func__, ticks);
+#endif /* SPKRDEBUG */
+ if (ticks > 0)
+ tsleep(spkr_rest, SPKRPRI | PCATCH, "rest", ticks);
+}
+
+extern int spkr_active; /* exclusion flag */
+extern const struct cdevsw spkr_cdevsw;
+
+int spkr_attached = 0;
+
+int
+spkrprobe(device_t parent, cfdata_t match, void *aux)
+{
+ return (!spkr_attached);
+}
+
+void
+spkrattach(device_t parent, device_t self, void *aux)
+{
+ aprint_naive("\n");
+ aprint_normal("\n");
+ ppicookie = ((struct pcppi_attach_args *)aux)->pa_cookie;
+ spkr_attached = 1;
+ if (!pmf_device_register(self, NULL, NULL))
+ aprint_error_dev(self, "couldn't establish power handler\n");
+}
+
+int
+spkrdetach(device_t self, int flags)
+{
+
+ pmf_device_deregister(self);
+ spkr_attached = 0;
+ ppicookie = NULL;
+
+ return 0;
+}
+
+
+static int
+spkr_modcmd(modcmd_t cmd, void *arg)
+{
+#ifdef _MODULE
+ devmajor_t bmajor, cmajor;
+#endif
+ int error = 0;
+
+#ifdef _MODULE
+ switch(cmd) {
+ case MODULE_CMD_INIT:
+ bmajor = cmajor = -1;
+ error = devsw_attach(spkr_cd.cd_name, NULL, &bmajor,
+ &spkr_cdevsw, &cmajor);
+ if (error)
+ break;
+
+ error = config_init_component(cfdriver_ioconf_spkr,
+ cfattach_ioconf_spkr, cfdata_ioconf_spkr);
+ if (error) {
+ devsw_detach(NULL, &spkr_cdevsw);
+ }
+ break;
+
+ case MODULE_CMD_FINI:
+ if (spkr_active)
+ return EBUSY;
+ error = config_fini_component(cfdriver_ioconf_spkr,
+ cfattach_ioconf_spkr, cfdata_ioconf_spkr);
+ devsw_detach(NULL, &spkr_cdevsw);
+ break;
+ default:
+ error = ENOTTY;
+ break;
+ }
+#endif
+
+ return error;
+}
