Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev White space and indent fix.



details:   https://anonhg.NetBSD.org/src/rev/2f129967bf19
branches:  trunk
changeset: 455932:2f129967bf19
user:      isaki <isaki%NetBSD.org@localhost>
date:      Thu Apr 18 13:01:38 2019 +0000

description:
White space and indent fix.

diffstat:

 sys/dev/pci/auich.c     |   6 +++---
 sys/dev/spkr.c          |  12 ++++++------
 sys/dev/wscons/wsbell.c |  14 +++++++-------
 3 files changed, 16 insertions(+), 16 deletions(-)

diffs (130 lines):

diff -r 34a3d468bed6 -r 2f129967bf19 sys/dev/pci/auich.c
--- a/sys/dev/pci/auich.c       Thu Apr 18 11:20:17 2019 +0000
+++ b/sys/dev/pci/auich.c       Thu Apr 18 13:01:38 2019 +0000
@@ -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 @@
                    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) {
diff -r 34a3d468bed6 -r 2f129967bf19 sys/dev/spkr.c
--- a/sys/dev/spkr.c    Thu Apr 18 11:20:17 2019 +0000
+++ b/sys/dev/spkr.c    Thu Apr 18 13:01:38 2019 +0000
@@ -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 (esr%snark.thyrsus.com@localhost)
@@ -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 @@
 #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 @@
 #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 @@
                return EINVAL;
 
        switch (cmd) {
-       case SPKRTONE:
+       case SPKRTONE:
                playonetone(sc, data);
                return 0;
        case SPKRTUNE:
diff -r 34a3d468bed6 -r 2f129967bf19 sys/dev/wscons/wsbell.c
--- a/sys/dev/wscons/wsbell.c   Thu Apr 18 11:20:17 2019 +0000
+++ b/sys/dev/wscons/wsbell.c   Thu Apr 18 13:01:38 2019 +0000
@@ -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 <nathanialsloss%yahoo.com.au@localhost>
@@ -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 @@
 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 @@
                spkr_audio_play(sc, d->pitch, d->period, d->volume);
 #undef d
                return 0;
-       }       
+       }
 
        return (EPASSTHROUGH);
 }
@@ -413,16 +413,16 @@
        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;



Home | Main Index | Thread Index | Old Index