 @@ -1,14 +1,14 @@
-/*	$NetBSD: spkr.c,v 1.31 2010/07/27 14:34:34 jakllsch Exp $	*/
+/*	$NetBSD: spkr.c,v 1.32 2012/02/01 02:01:28 matt Exp $	*/
 /*
  * Copyright (c) 1990 Eric S. Raymond (esr@snark.thyrsus.com)
  * Copyright (c) 1990 Andrew A. Chernov (ache@astral.msk.su)
  * Copyright (c) 1990 Lennart Augustsson (lennart@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
 @@ -33,27 +33,27 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * spkr.c -- device driver for console speaker on 80386
+ *
  * v1.1 by Eric S. Raymond (esr@snark.thyrsus.com) Feb 1990
  *      modified for 386bsd by Andrew A. Chernov <ache@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.c,v 1.31 2010/07/27 14:34:34 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.32 2012/02/01 02:01:28 matt 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/uio.h>
 #include <sys/proc.h>
 #include <sys/ioctl.h>
 #include <sys/conf.h>
 #include <sys/bus.h>
 @@ -78,38 +78,36 @@ const struct cdevsw spkr_cdevsw = {
 	nostop, notty, nopoll, nommap, nokqfilter, D_OTHER,
 };
 static pcppi_tag_t ppicookie;
 #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);
-static
+static void
-void tone(xhz, ticks)
+tone(u_int xhz, u_int ticks)
 /* emit tone of frequency hz for given number of ticks */
     u_int xhz, ticks;
+{
 	pcppi_bell(ppicookie, xhz, ticks, PCPPI_BELL_SLEEP);
+}
 static void
-rest(ticks)
+rest(int ticks)
 /* rest for given number of ticks */
     int	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);
+}
 @@ -172,29 +170,28 @@ static const int pitchtab[] =
 static void
 playinit(void)
+{
     octave = DFLT_OCTAVE;
     whole = (hz * SECS_PER_MIN * WHOLE_NOTE) / DFLT_TEMPO;
     fill = NORMAL;
     value = DFLT_VALUE;
     octtrack = false;
     octprefix = true;	/* act as though there was an initial O(n) */
+}
 static void
-playtone(pitch, val, sustain)
+playtone(int pitch, int val, int sustain)
 /* play tone of proper duration for current rhythm signature */
     int	pitch, val, sustain;
+{
     int	sound, silence, snum = 1, sdenom = 1;
     /* this weirdness avoids floating-point arithmetic */
     for (; sustain; sustain--)
+    {
 	snum *= NUM_MULT;
 	sdenom *= DENOM_MULT;
+    }
     if (pitch == -1)
 	rest(whole * snum / (val * sdenom));
     else
 @@ -205,30 +202,28 @@ playtone(pitch, val, sustain)
 #ifdef SPKRDEBUG
 	printf("playtone: pitch %d for %d ticks, rest for %d ticks\n",
 	    pitch, sound, silence);
 #endif /* SPKRDEBUG */
 	tone(pitchtab[pitch], sound);
 	if (fill != LEGATO)
 	    rest(silence);
+    }
+}
 static void
-playstring(cp, slen)
+playstring(char *cp, int slen)
 /* interpret and play an item from a notation string */
     char	*cp;
     int		slen;
+{
     int		pitch, lastpitch = OCTAVE_NOTES * DFLT_OCTAVE;
 #define GETNUM(cp, v)	for(v=0; slen > 0 && isdigit(cp[1]); ) \
 				{v = v * 10 + (*++cp - '0'); slen--;}
     for (; slen--; cp++)
+    {
 	int		sustain, timeval, tempo;
 	char	c = toupper(*cp);
 #ifdef SPKRDEBUG
 	printf("playstring: %c (%x)\n", c, c);
 #endif /* SPKRDEBUG */
 @@ -404,30 +399,29 @@ static 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)
+{
 	printf("\n");
 	ppicookie = ((struct pcppi_attach_args *)aux)->pa_cookie;
 	spkr_attached = 1;
-        if (!device_pmf_is_registered(self))
+        if (!device_pmf_is_registered(self)
-		if (!pmf_device_register(self, NULL, NULL))
+	    && !pmf_device_register(self, NULL, NULL))
-			aprint_error_dev(self,
+		aprint_error_dev(self, "couldn't establish power handler\n");
 			    "couldn't establish power handler\n");
+}
 int
 spkropen(dev_t dev, int	flags, int mode, struct lwp *l)
+{
 #ifdef SPKRDEBUG
     printf("spkropen: entering with dev = %"PRIx64"\n", dev);
 #endif /* SPKRDEBUG */
     if (minor(dev) != 0 || !spkr_attached)
 	return(ENXIO);
     else if (spkr_active)
 @@ -453,46 +447,46 @@ spkrwrite(dev_t dev, struct uio *uio, in
     if (minor(dev) != 0)
 	return(ENXIO);
     else
+    {
 	n = min(DEV_BSIZE, uio->uio_resid);
 	error = uiomove(spkr_inbuf, n, uio);
 	if (!error)
 		playstring((char *)spkr_inbuf, n);
 	return(error);
+    }
+}
-int spkrclose(dev_t dev, int flags, int mode,
+int
-    struct lwp *l)
+spkrclose(dev_t dev, int flags, int mode, struct lwp *l)
+{
 #ifdef SPKRDEBUG
     printf("spkrclose: entering with dev = %"PRIx64"\n", dev);
 #endif /* SPKRDEBUG */
     if (minor(dev) != 0)
 	return(ENXIO);
     else
+    {
 	tone(0, 0);
 	free(spkr_inbuf, M_DEVBUF);
 	spkr_active = 0;
+    }
     return(0);
+}
-int spkrioctl(dev_t dev, u_long cmd, void *data, int	flag,
+int
-    struct lwp *l)
+spkrioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l)
+{
 #ifdef SPKRDEBUG
     printf("spkrioctl: entering with dev = %"PRIx64", cmd = %lx\n", dev, cmd);
 #endif /* SPKRDEBUG */
     if (minor(dev) != 0)
 	return(ENXIO);
     else if (cmd == SPKRTONE)
+    {
 	tone_t	*tp = (tone_t *)data;
 	if (tp->frequency == 0)
 	    rest(tp->duration);