Module Name: src
Committed By: joerg
Date: Mon Oct 28 18:38:43 UTC 2019
Modified Files:
src/sys/dev/ieee1394: fwohci.c
src/sys/dev/pci: eso.c sv.c
Log Message:
Fix operand priority of bit op vs ternary operator.
To generate a diff of this commit:
cvs rdiff -u -r1.143 -r1.144 src/sys/dev/ieee1394/fwohci.c
cvs rdiff -u -r1.71 -r1.72 src/sys/dev/pci/eso.c
cvs rdiff -u -r1.56 -r1.57 src/sys/dev/pci/sv.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/dev/ieee1394/fwohci.c
diff -u src/sys/dev/ieee1394/fwohci.c:1.143 src/sys/dev/ieee1394/fwohci.c:1.144
--- src/sys/dev/ieee1394/fwohci.c:1.143 Tue Oct 15 18:21:47 2019
+++ src/sys/dev/ieee1394/fwohci.c Mon Oct 28 18:38:43 2019
@@ -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 @@ fwohci_db_init(struct fwohci_softc *sc,
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");
Index: src/sys/dev/pci/eso.c
diff -u src/sys/dev/pci/eso.c:1.71 src/sys/dev/pci/eso.c:1.72
--- src/sys/dev/pci/eso.c:1.71 Sat Jun 8 08:02:38 2019
+++ src/sys/dev/pci/eso.c Mon Oct 28 18:38:43 2019
@@ -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 @@ eso_allocmem(struct eso_softc *sc, size_
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;
Index: src/sys/dev/pci/sv.c
diff -u src/sys/dev/pci/sv.c:1.56 src/sys/dev/pci/sv.c:1.57
--- src/sys/dev/pci/sv.c:1.56 Sat Jun 8 08:02:38 2019
+++ src/sys/dev/pci/sv.c Mon Oct 28 18:38:43 2019
@@ -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 @@ sv_allocmem(struct sv_softc *sc, size_t
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",
