Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

avoid indentation issues. re-do previous in obio.c to avoid the

Browse Source 
does-nothing change, by fixing the intended indentation.
This commit is contained in:
mrg 2018-03-04 21:41:48 +00:00
parent 7f4ac6d6b0
commit 3af7ad6d6d
4 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/arch/emips/ebus/dz_ebus.c
View File

@ -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, struct lwp *l)
/* 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;

8
sys/arch/emips/ebus/flash_ebus.c
View File

@ -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 *sc)
if (Status == 0)
printf("error not notified");
else
printf("status=x%x", Status);
else
printf("status=x%x", Status);
printf(")\n");
}

6
sys/arch/emips/ebus/icap_ebus.c
View File

@ -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);
}
/*

11
sys/arch/macppc/dev/obio.c
View File

@ -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 self, void *aux)
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: