[src/netbsd-9]: src/sys/dev Pull up following revision(s) (requested by msait...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fe1f94a5453c
branches:  netbsd-9
changeset: 461469:fe1f94a5453c
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Nov 27 14:03:14 2019 +0000

description:
Pull up following revision(s) (requested by msaitoh in ticket #492):

        sys/dev/pci/sv.c: revision 1.57
        sys/dev/pci/eso.c: revision 1.72
        sys/dev/ieee1394/fwohci.c: revision 1.144

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 d0237717ecd1 -r fe1f94a5453c sys/dev/ieee1394/fwohci.c
--- a/sys/dev/ieee1394/fwohci.c Wed Nov 27 13:46:44 2019 +0000
+++ b/sys/dev/ieee1394/fwohci.c Wed Nov 27 14:03:14 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fwohci.c,v 1.142 2019/05/28 08:59:34 msaitoh Exp $     */
+/*     $NetBSD: fwohci.c,v 1.142.2.1 2019/11/27 14:03:14 martin Exp $  */
 
 /*-
  * Copyright (c) 2003 Hidetoshi Shimokawa
@@ -37,7 +37,7 @@
  *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.142 2019/05/28 08:59:34 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.142.2.1 2019/11/27 14:03:14 martin 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 d0237717ecd1 -r fe1f94a5453c sys/dev/pci/eso.c
--- a/sys/dev/pci/eso.c Wed Nov 27 13:46:44 2019 +0000
+++ b/sys/dev/pci/eso.c Wed Nov 27 14:03:14 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.71.2.1 2019/11/27 14:03:14 martin 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.71.2.1 2019/11/27 14:03:14 martin 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 d0237717ecd1 -r fe1f94a5453c sys/dev/pci/sv.c
--- a/sys/dev/pci/sv.c  Wed Nov 27 13:46:44 2019 +0000
+++ b/sys/dev/pci/sv.c  Wed Nov 27 14:03:14 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.56.2.1 2019/11/27 14:03:14 martin 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.56.2.1 2019/11/27 14:03:14 martin 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",