Module Name: src
Committed By: mrg
Date: Tue Feb 5 06:10:53 UTC 2019
Modified Files:
src/sys/arch/sparc64/dev: fdc.c psycho.c schizo.c
Log Message:
add or avoid fallthru comments.
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/sparc64/dev/fdc.c
cvs rdiff -u -r1.126 -r1.127 src/sys/arch/sparc64/dev/psycho.c
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/sparc64/dev/schizo.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/arch/sparc64/dev/fdc.c
diff -u src/sys/arch/sparc64/dev/fdc.c:1.45 src/sys/arch/sparc64/dev/fdc.c:1.46
--- src/sys/arch/sparc64/dev/fdc.c:1.45 Mon Sep 3 16:29:27 2018
+++ src/sys/arch/sparc64/dev/fdc.c Tue Feb 5 06:10:53 2019
@@ -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 @@ loop:
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) {
Index: src/sys/arch/sparc64/dev/psycho.c
diff -u src/sys/arch/sparc64/dev/psycho.c:1.126 src/sys/arch/sparc64/dev/psycho.c:1.127
--- src/sys/arch/sparc64/dev/psycho.c:1.126 Sun Mar 26 12:51:42 2017
+++ src/sys/arch/sparc64/dev/psycho.c Tue Feb 5 06:10:53 2019
@@ -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 @@ psycho_iommu_init(struct psycho_softc *s
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
}
Index: src/sys/arch/sparc64/dev/schizo.c
diff -u src/sys/arch/sparc64/dev/schizo.c:1.39 src/sys/arch/sparc64/dev/schizo.c:1.40
--- src/sys/arch/sparc64/dev/schizo.c:1.39 Sat Jun 3 21:32:43 2017
+++ src/sys/arch/sparc64/dev/schizo.c Tue Feb 5 06:10:53 2019
@@ -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 @@ schizo_init_iommu(struct schizo_softc *s
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));
