Module Name: src
Committed By: mrg
Date: Sun Mar 4 21:41:48 UTC 2018
Modified Files:
src/sys/arch/emips/ebus: dz_ebus.c flash_ebus.c icap_ebus.c
src/sys/arch/macppc/dev: obio.c
Log Message:
avoid indentation issues. re-do previous in obio.c to avoid the
does-nothing change, by fixing the intended indentation.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/emips/ebus/dz_ebus.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/emips/ebus/flash_ebus.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/emips/ebus/icap_ebus.c
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/macppc/dev/obio.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/emips/ebus/dz_ebus.c
diff -u src/sys/arch/emips/ebus/dz_ebus.c:1.8 src/sys/arch/emips/ebus/dz_ebus.c:1.9
--- src/sys/arch/emips/ebus/dz_ebus.c:1.8 Fri Jul 25 08:10:32 2014
+++ src/sys/arch/emips/ebus/dz_ebus.c Sun Mar 4 21:41:48 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: dz_ebus.c,v 1.8 2014/07/25 08:10:32 dholland Exp $ */
+/* $NetBSD: dz_ebus.c,v 1.9 2018/03/04 21:41:48 mrg Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dz_ebus.c,v 1.8 2014/07/25 08:10:32 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dz_ebus.c,v 1.9 2018/03/04 21:41:48 mrg Exp $");
#include "opt_ddb.h"
@@ -167,15 +167,15 @@ dzopen(dev_t dev, int flag, int mode, st
/* we have no modem control but..*/
if (dzmctl(sc, line, TIOCM_DTR, DMBIS) & TIOCM_CD)
tp->t_state |= TS_CARR_ON;
- s = spltty();
- while (!(flag & O_NONBLOCK) && !(tp->t_cflag & CLOCAL) &&
- !(tp->t_state & TS_CARR_ON)) {
- tp->t_wopen++;
- error = ttysleep(tp, &tp->t_rawcv, true, 0);
- tp->t_wopen--;
- if (error)
- break;
- }
+ s = spltty();
+ while (!(flag & O_NONBLOCK) && !(tp->t_cflag & CLOCAL) &&
+ !(tp->t_state & TS_CARR_ON)) {
+ tp->t_wopen++;
+ error = ttysleep(tp, &tp->t_rawcv, true, 0);
+ tp->t_wopen--;
+ if (error)
+ break;
+ }
(void)splx(s);
if (error)
return error;
Index: src/sys/arch/emips/ebus/flash_ebus.c
diff -u src/sys/arch/emips/ebus/flash_ebus.c:1.19 src/sys/arch/emips/ebus/flash_ebus.c:1.20
--- src/sys/arch/emips/ebus/flash_ebus.c:1.19 Sun Nov 20 02:34:27 2016
+++ src/sys/arch/emips/ebus/flash_ebus.c Sun Mar 4 21:41:48 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: flash_ebus.c,v 1.19 2016/11/20 02:34:27 pgoyette Exp $ */
+/* $NetBSD: flash_ebus.c,v 1.20 2018/03/04 21:41:48 mrg Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: flash_ebus.c,v 1.19 2016/11/20 02:34:27 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: flash_ebus.c,v 1.20 2018/03/04 21:41:48 mrg Exp $");
/* Driver for the Intel 28F320/640/128 (J3A150) StrataFlash memory device
* Extended to include the Intel JS28F256P30T95.
@@ -2075,8 +2075,8 @@ eflashperror(const struct eflash_softc *
if (Status == 0)
printf("error not notified");
- else
- printf("status=x%x", Status);
+ else
+ printf("status=x%x", Status);
printf(")\n");
}
Index: src/sys/arch/emips/ebus/icap_ebus.c
diff -u src/sys/arch/emips/ebus/icap_ebus.c:1.6 src/sys/arch/emips/ebus/icap_ebus.c:1.7
--- src/sys/arch/emips/ebus/icap_ebus.c:1.6 Fri Jul 25 08:10:32 2014
+++ src/sys/arch/emips/ebus/icap_ebus.c Sun Mar 4 21:41:48 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: icap_ebus.c,v 1.6 2014/07/25 08:10:32 dholland Exp $ */
+/* $NetBSD: icap_ebus.c,v 1.7 2018/03/04 21:41:48 mrg Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: icap_ebus.c,v 1.6 2014/07/25 08:10:32 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icap_ebus.c,v 1.7 2018/03/04 21:41:48 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -410,7 +410,7 @@ icap_ebus_intr(void *cookie, void *f)
if (saf)
icapstart(sc);
- return (1);
+ return (1);
}
/*
Index: src/sys/arch/macppc/dev/obio.c
diff -u src/sys/arch/macppc/dev/obio.c:1.42 src/sys/arch/macppc/dev/obio.c:1.43
--- src/sys/arch/macppc/dev/obio.c:1.42 Sun Mar 4 15:25:15 2018
+++ src/sys/arch/macppc/dev/obio.c Sun Mar 4 21:41:48 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: obio.c,v 1.42 2018/03/04 15:25:15 christos Exp $ */
+/* $NetBSD: obio.c,v 1.43 2018/03/04 21:41:48 mrg Exp $ */
/*-
* Copyright (C) 1998 Internet Research Institute, Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.42 2018/03/04 15:25:15 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.43 2018/03/04 21:41:48 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -154,11 +154,10 @@ obio_attach(device_t parent, device_t se
case PCI_PRODUCT_APPLE_PANGEA_MACIO:
case PCI_PRODUCT_APPLE_INTREPID:
node = pcidev_to_ofdev(pa->pa_pc, pa->pa_tag);
- if (node == -1) {
+ if (node == -1)
node = OF_finddevice("mac-io");
- if (node == -1)
- node = OF_finddevice("/pci/mac-io");
- }
+ if (node == -1)
+ node = OF_finddevice("/pci/mac-io");
break;
case PCI_PRODUCT_APPLE_K2:
case PCI_PRODUCT_APPLE_SHASTA:
