Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev Fix operand priority of bit op vs ternary operator.
details: https://anonhg.NetBSD.org/src/rev/a6d40a299319
branches: trunk
changeset: 464910:a6d40a299319
user: joerg <joerg%NetBSD.org@localhost>
date: Mon Oct 28 18:38:43 2019 +0000
description:
Fix operand priority of bit op vs ternary operator.
diffstat:
sys/dev/ieee1394/fwohci.c | 8 ++++----
sys/dev/pci/eso.c | 6 +++---
sys/dev/pci/sv.c | 6 +++---
3 files changed, 10 insertions(+), 10 deletions(-)
diffs (83 lines):
diff -r 02d474900cb1 -r a6d40a299319 sys/dev/ieee1394/fwohci.c
--- a/sys/dev/ieee1394/fwohci.c Mon Oct 28 18:15:25 2019 +0000
+++ b/sys/dev/ieee1394/fwohci.c Mon Oct 28 18:38:43 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fwohci.c,v 1.143 2019/10/15 18:21:47 msaitoh Exp $ */
+/* $NetBSD: fwohci.c,v 1.144 2019/10/28 18:38:43 joerg Exp $ */
/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
@@ -37,7 +37,7 @@
*
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.143 2019/10/15 18:21:47 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.144 2019/10/28 18:38:43 joerg Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -1746,8 +1746,8 @@
dbch->ndb, BUS_DMA_WAITOK);
#else /* Ooops, debugging now... */
dbch->ndb, BUS_DMA_WAITOK |
- (dbch->off == OHCI_ARQOFF || dbch->off == OHCI_ARSOFF) ?
- BUS_DMA_COHERENT : 0);
+ ((dbch->off == OHCI_ARQOFF || dbch->off == OHCI_ARSOFF) ?
+ BUS_DMA_COHERENT : 0));
#endif
if (dbch->am == NULL) {
aprint_error_dev(fc->dev, "fwdma_malloc_multiseg failed\n");
diff -r 02d474900cb1 -r a6d40a299319 sys/dev/pci/eso.c
--- a/sys/dev/pci/eso.c Mon Oct 28 18:15:25 2019 +0000
+++ b/sys/dev/pci/eso.c Mon Oct 28 18:38:43 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: eso.c,v 1.71 2019/06/08 08:02:38 isaki Exp $ */
+/* $NetBSD: eso.c,v 1.72 2019/10/28 18:38:43 joerg Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: eso.c,v 1.71 2019/06/08 08:02:38 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eso.c,v 1.72 2019/10/28 18:38:43 joerg Exp $");
#include "mpu.h"
@@ -1489,7 +1489,7 @@
error = bus_dmamap_load(ed->ed_dmat, ed->ed_map, ed->ed_kva,
ed->ed_size, NULL, BUS_DMA_WAITOK |
- (direction == AUMODE_RECORD) ? BUS_DMA_READ : BUS_DMA_WRITE);
+ ((direction == AUMODE_RECORD) ? BUS_DMA_READ : BUS_DMA_WRITE));
if (error)
goto destroy;
diff -r 02d474900cb1 -r a6d40a299319 sys/dev/pci/sv.c
--- a/sys/dev/pci/sv.c Mon Oct 28 18:15:25 2019 +0000
+++ b/sys/dev/pci/sv.c Mon Oct 28 18:38:43 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sv.c,v 1.56 2019/06/08 08:02:38 isaki Exp $ */
+/* $NetBSD: sv.c,v 1.57 2019/10/28 18:38:43 joerg Exp $ */
/* $OpenBSD: sv.c,v 1.2 1998/07/13 01:50:15 csapuntz Exp $ */
/*
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sv.c,v 1.56 2019/06/08 08:02:38 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sv.c,v 1.57 2019/10/28 18:38:43 joerg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -530,7 +530,7 @@
goto unmap;
error = bus_dmamap_load(sc->sc_dmatag, p->map, p->addr, p->size, NULL,
- BUS_DMA_WAITOK | (direction == AUMODE_RECORD) ? BUS_DMA_READ : BUS_DMA_WRITE);
+ BUS_DMA_WAITOK | ((direction == AUMODE_RECORD) ? BUS_DMA_READ : BUS_DMA_WRITE));
if (error)
goto destroy;
DPRINTF(("sv_allocmem: pa=%lx va=%lx pba=%lx\n",
Home |
Main Index |
Thread Index |
Old Index