[src/trunk]: src/sys/dev/cardbus Catch up with MI pci changes to fix compile ...

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

details:   https://anonhg.NetBSD.org/src/rev/bd7368acc59a
branches:  trunk
changeset: 449395:bd7368acc59a
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Tue Mar 05 08:16:53 2019 +0000

description:
Catch up with MI pci changes to fix compile error.

diffstat:

 sys/dev/cardbus/rbus_ppb.c |  15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diffs (41 lines):

diff -r 5f59fdec40b6 -r bd7368acc59a sys/dev/cardbus/rbus_ppb.c
--- a/sys/dev/cardbus/rbus_ppb.c        Tue Mar 05 03:49:06 2019 +0000
+++ b/sys/dev/cardbus/rbus_ppb.c        Tue Mar 05 08:16:53 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rbus_ppb.c,v 1.46 2019/03/01 09:26:00 msaitoh Exp $    */
+/*     $NetBSD: rbus_ppb.c,v 1.47 2019/03/05 08:16:53 msaitoh Exp $    */
 
 /*
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rbus_ppb.c,v 1.46 2019/03/01 09:26:00 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rbus_ppb.c,v 1.47 2019/03/05 08:16:53 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -415,16 +415,17 @@
            pci_conf_write(pc, pci_bus_tag[busnum], PCI_BRIDGE_MEMORY_REG,
                __SHIFTIN((start >> 16) & PCI_BRIDGE_MEMORY_ADDR,
                    PCI_BRIDGE_MEMORY_BASE) |
-               __SHIFTIN(((start + rct.bussize_memreqs[busnum] + PPB_MEM_MIN
-                           - 1) >> 16) & PCI_BRIDGE_MEMORY_ADDR,
-                   PCI_BRIDGE_MEMORY_LIMIT));
+               __SHIFTIN(((start + rct.bussize_memreqs[busnum]
+                           + PCI_BRIDGE_MEM_MIN - 1) >> 16)
+                   & PCI_BRIDGE_MEMORY_ADDR, PCI_BRIDGE_MEMORY_LIMIT));
 
            /* and set the prefetchable limits as well */
            pci_conf_write(pc, pci_bus_tag[busnum], PCI_BRIDGE_PREFETCHMEM_REG,
                __SHIFTIN((start >> 16) & PCI_BRIDGE_PREFETCHMEM_ADDR,
                    PCI_BRIDGE_PREFETCHMEM_BASE) |
-               __SHIFTIN(((start + rct.bussize_memreqs[busnum] + PPB_MEM_MIN
-                           - 1) >> 16) & PCI_BRIDGE_PREFETCHMEM_ADDR,
+               __SHIFTIN(((start + rct.bussize_memreqs[busnum]
+                           + PCI_BRIDGE_MEM_MIN - 1) >> 16)
+                   & PCI_BRIDGE_PREFETCHMEM_ADDR,
                    PCI_BRIDGE_PREFETCHMEM_LIMIT));
 
            /* pci_conf_print(pc, pci_bus_tag[busnum], NULL); */