Module Name: src
Committed By: isaki
Date: Thu Apr 18 13:01:39 UTC 2019
Modified Files:
src/sys/dev: spkr.c
src/sys/dev/pci: auich.c
src/sys/dev/wscons: wsbell.c
Log Message:
White space and indent fix.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/spkr.c
cvs rdiff -u -r1.153 -r1.154 src/sys/dev/pci/auich.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/wscons/wsbell.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/spkr.c
diff -u src/sys/dev/spkr.c:1.16 src/sys/dev/spkr.c:1.17
--- src/sys/dev/spkr.c:1.16 Mon Sep 3 16:29:30 2018
+++ src/sys/dev/spkr.c Thu Apr 18 13:01:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: spkr.c,v 1.16 2018/09/03 16:29:30 riastradh Exp $ */
+/* $NetBSD: spkr.c,v 1.17 2019/04/18 13:01:38 isaki Exp $ */
/*
* Copyright (c) 1990 Eric S. Raymond ([email protected])
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.16 2018/09/03 16:29:30 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.17 2019/04/18 13:01:38 isaki Exp $");
#if defined(_KERNEL_OPT)
#include "wsmux.h"
@@ -123,8 +123,8 @@ static void playstring(struct spkr_softc
#define NUM_MULT 3 /* numerator of dot multiplier */
#define DENOM_MULT 2 /* denominator of dot multiplier */
-/* letter to half-tone: A B C D E F G */
-static const int notetab[8] = {9, 11, 0, 2, 4, 5, 7};
+/* letter to half-tone: A B C D E F G */
+static const int notetab[8] = { 9, 11, 0, 2, 4, 5, 7 };
/*
* This is the American Standard A440 Equal-Tempered scale with frequencies
@@ -211,7 +211,7 @@ playstring(struct spkr_softc *sc, const
#endif /* SPKRDEBUG */
switch (c) {
- case 'A': case 'B': case 'C': case 'D':
+ case 'A': case 'B': case 'C': case 'D':
case 'E': case 'F': case 'G':
/* compute pitch */
pitch = notetab[c - 'A'] + sc->sc_octave * OCTAVE_NOTES;
@@ -516,7 +516,7 @@ spkrioctl(dev_t dev, u_long cmd, void *d
return EINVAL;
switch (cmd) {
- case SPKRTONE:
+ case SPKRTONE:
playonetone(sc, data);
return 0;
case SPKRTUNE:
Index: src/sys/dev/pci/auich.c
diff -u src/sys/dev/pci/auich.c:1.153 src/sys/dev/pci/auich.c:1.154
--- src/sys/dev/pci/auich.c:1.153 Sat Mar 16 12:09:58 2019
+++ src/sys/dev/pci/auich.c Thu Apr 18 13:01:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: auich.c,v 1.153 2019/03/16 12:09:58 isaki Exp $ */
+/* $NetBSD: auich.c,v 1.154 2019/04/18 13:01:38 isaki Exp $ */
/*-
* Copyright (c) 2000, 2004, 2005, 2008 The NetBSD Foundation, Inc.
@@ -111,7 +111,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.153 2019/03/16 12:09:58 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.154 2019/04/18 13:01:38 isaki Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1040,7 +1040,7 @@ auich_set_params(void *v, int setmode, i
sc->sc_codectype == AC97_CODEC_TYPE_AUDIO) {
control = bus_space_read_4(sc->iot, sc->aud_ioh,
ICH_GCTRL + sc->sc_modem_offset);
- control &= ~sc->sc_pcm246_mask;
+ control &= ~sc->sc_pcm246_mask;
if (p->channels == 4) {
control |= sc->sc_pcm4;
} else if (p->channels == 6) {
Index: src/sys/dev/wscons/wsbell.c
diff -u src/sys/dev/wscons/wsbell.c:1.9 src/sys/dev/wscons/wsbell.c:1.10
--- src/sys/dev/wscons/wsbell.c:1.9 Fri Nov 3 19:49:23 2017
+++ src/sys/dev/wscons/wsbell.c Thu Apr 18 13:01:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: wsbell.c,v 1.9 2017/11/03 19:49:23 maya Exp $ */
+/* $NetBSD: wsbell.c,v 1.10 2019/04/18 13:01:38 isaki Exp $ */
/*-
* Copyright (c) 2017 Nathanial Sloss <[email protected]>
@@ -107,7 +107,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsbell.c,v 1.9 2017/11/03 19:49:23 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsbell.c,v 1.10 2019/04/18 13:01:38 isaki Exp $");
#if defined(_KERNEL_OPT)
#include "wsmux.h"
@@ -211,7 +211,7 @@ wsbell_match(device_t parent, cfdata_t m
void
wsbell_attach(device_t parent, device_t self, void *aux)
{
- struct wsbell_softc *sc = device_private(self);
+ struct wsbell_softc *sc = device_private(self);
struct wsbelldev_attach_args *ap = aux;
#if NWSMUX > 0
int mux, error;
@@ -400,7 +400,7 @@ getbell:
spkr_audio_play(sc, d->pitch, d->period, d->volume);
#undef d
return 0;
- }
+ }
return (EPASSTHROUGH);
}
@@ -413,16 +413,16 @@ bell_thread(void *arg)
struct vbell_args *vb = &sc->sc_bell_args;
tone_t tone;
u_int vol;
-
+
for (;;) {
mutex_enter(&sc->sc_bellock);
cv_wait_sig(&sc->sc_bellcv, &sc->sc_bellock);
-
+
if (sc->sc_dying == true) {
mutex_exit(&sc->sc_bellock);
kthread_exit(0);
}
-
+
tone.frequency = vb->pitch;
tone.duration = vb->period;
vol = vb->volume;
