Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/sparc64/dev add or avoid fallthru comments.



details:   https://anonhg.NetBSD.org/src/rev/e9ca9af08a5b
branches:  trunk
changeset: 448546:e9ca9af08a5b
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Feb 05 06:10:53 2019 +0000

description:
add or avoid fallthru comments.

diffstat:

 sys/arch/sparc64/dev/fdc.c    |   7 ++++---
 sys/arch/sparc64/dev/psycho.c |  15 ++++++++++-----
 sys/arch/sparc64/dev/schizo.c |  15 ++++++++++-----
 3 files changed, 24 insertions(+), 13 deletions(-)

diffs (109 lines):

diff -r 3f82f3cc017b -r e9ca9af08a5b sys/arch/sparc64/dev/fdc.c
--- a/sys/arch/sparc64/dev/fdc.c        Tue Feb 05 04:48:47 2019 +0000
+++ b/sys/arch/sparc64/dev/fdc.c        Tue Feb 05 06:10:53 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fdc.c,v 1.45 2018/09/03 16:29:27 riastradh Exp $       */
+/*     $NetBSD: fdc.c,v 1.46 2019/02/05 06:10:53 mrg Exp $     */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdc.c,v 1.45 2018/09/03 16:29:27 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdc.c,v 1.46 2019/02/05 06:10:53 mrg Exp $");
 
 #include "opt_ddb.h"
 #include "opt_md.h"
@@ -2010,12 +2010,13 @@
        case RECALWAIT:
                callout_stop(&fdc->sc_timo_ch);
                fdc->sc_state = RECALCOMPLETE;
-               if (fdc->sc_flags & FDC_NEEDHEADSETTLE) {
+               if ((fdc->sc_flags & FDC_NEEDHEADSETTLE) != 0) {
                        /* allow 1/30 second for heads to settle */
                        callout_reset(&fdc->sc_intr_ch, hz / 30,
                            fdcpseudointr, fdc);
                        return 1;               /* will return later */
                }
+               /* FALLTHROUGH */
 
        case RECALCOMPLETE:
                if (fdc->sc_nstat != 2 || (st0 & 0xf8) != 0x20 || cyl != 0) {
diff -r 3f82f3cc017b -r e9ca9af08a5b sys/arch/sparc64/dev/psycho.c
--- a/sys/arch/sparc64/dev/psycho.c     Tue Feb 05 04:48:47 2019 +0000
+++ b/sys/arch/sparc64/dev/psycho.c     Tue Feb 05 06:10:53 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: psycho.c,v 1.126 2017/03/26 12:51:42 martin Exp $      */
+/*     $NetBSD: psycho.c,v 1.127 2019/02/05 06:10:53 mrg Exp $ */
 
 /*
  * Copyright (c) 1999, 2000 Matthew R. Green
@@ -55,7 +55,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: psycho.c,v 1.126 2017/03/26 12:51:42 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: psycho.c,v 1.127 2019/02/05 06:10:53 mrg Exp $");
 
 #include "opt_ddb.h"
 
@@ -1068,11 +1068,16 @@
                iobase = vdma[0];
 #define        TSBCASE(x)      case 1<<((x)+23): tsbsize = (x); break
                switch (vdma[1]) {
-                       TSBCASE(1); TSBCASE(2); TSBCASE(3);
-                       TSBCASE(4); TSBCASE(5); TSBCASE(6);
+                       TSBCASE(1);
+                       TSBCASE(2);
+                       TSBCASE(3);
+                       TSBCASE(4);
+                       TSBCASE(5);
+                       TSBCASE(6);
+                       TSBCASE(7);
                default:
                        printf("bogus tsb size %x, using 7\n", vdma[1]);
-                       TSBCASE(7);
+                       tsbsize = 7;
                }
 #undef TSBCASE
        }
diff -r 3f82f3cc017b -r e9ca9af08a5b sys/arch/sparc64/dev/schizo.c
--- a/sys/arch/sparc64/dev/schizo.c     Tue Feb 05 04:48:47 2019 +0000
+++ b/sys/arch/sparc64/dev/schizo.c     Tue Feb 05 06:10:53 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: schizo.c,v 1.39 2017/06/03 21:32:43 mrg Exp $  */
+/*     $NetBSD: schizo.c,v 1.40 2019/02/05 06:10:53 mrg Exp $  */
 /*     $OpenBSD: schizo.c,v 1.55 2008/08/18 20:29:37 brad Exp $        */
 
 /*
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: schizo.c,v 1.39 2017/06/03 21:32:43 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: schizo.c,v 1.40 2019/02/05 06:10:53 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -490,11 +490,16 @@
                iobase = vdma[0];
 #define        TSBCASE(x)      case 1 << ((x) + 23): tsbsize = (x); break
                switch (vdma[1]) { 
-                       TSBCASE(1); TSBCASE(2); TSBCASE(3);
-                       TSBCASE(4); TSBCASE(5); TSBCASE(6);
+                       TSBCASE(1);
+                       TSBCASE(2);
+                       TSBCASE(3);
+                       TSBCASE(4);
+                       TSBCASE(5);
+                       TSBCASE(6);
+                       TSBCASE(7);
                default: 
                        printf("bogus tsb size %x, using 7\n", vdma[1]);
-                       TSBCASE(7);
+                       tsbsize = 7;
                }
 #undef TSBCASE
                DPRINTF(SDB_BUSMAP, ("schizo_init_iommu: iobase=0x%x\n", iobase));



Home | Main Index | Thread Index | Old Index