[src/trunk]: src/sys/arch/sparc/sparc Catch up with MI pci changes.

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

details:   https://anonhg.NetBSD.org/src/rev/74382916d450
branches:  trunk
changeset: 449295:74382916d450
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Mar 02 14:21:19 2019 +0000

description:
Catch up with MI pci changes.

diffstat:

 sys/arch/sparc/sparc/pci_fixup.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (31 lines):

diff -r 6976a6e2564e -r 74382916d450 sys/arch/sparc/sparc/pci_fixup.c
--- a/sys/arch/sparc/sparc/pci_fixup.c  Sat Mar 02 13:21:08 2019 +0000
+++ b/sys/arch/sparc/sparc/pci_fixup.c  Sat Mar 02 14:21:19 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pci_fixup.c,v 1.2 2019/03/01 09:25:59 msaitoh Exp $    */
+/*     $NetBSD: pci_fixup.c,v 1.3 2019/03/02 14:21:19 christos Exp $   */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -323,8 +323,8 @@
 
        /* Secondary bus = startbus, subordinate bus = 0xff */
        pci_conf_write(NULL, starttag, PCI_BRIDGE_BUS_REG,
-           ((startbus & 0xff) << PCI_BRIDGE_BUS_SECONDARY_SHIFT) |
-           (0xff << PCI_BRIDGE_BUS_SUBORDINATE_SHIFT));
+           __SHIFTIN(startbus & 0xff,  PCI_BRIDGE_BUS_SECONDARY) |
+           __SHIFTIN(0xff, PCI_BRIDGE_BUS_SUBORDINATE));
 
        /*
         * Fix up bus numbering, bus addresses, device addresses,
@@ -441,8 +441,8 @@
 
        /* Secondary bus = startbus, subordinate bus = maxbus */
        pci_conf_write(NULL, starttag, PCI_BRIDGE_BUS_REG,
-           ((startbus & 0xff) << PCI_BRIDGE_BUS_SECONDARY_SHIFT) |
-           ((*maxbus & 0xff) << PCI_BRIDGE_BUS_SUBORDINATE_SHIFT));
+           __SHIFTIN(startbus & 0xff,  PCI_BRIDGE_BUS_SECONDARY) |
+           __SHIFTIN(*maxbus & 0xff, PCI_BRIDGE_BUS_SUBORDINATE));
 
        /* 16-bit I/O range */
        val = ((startio & 0xf000) >> 8) | ((*(io) - 1) & 0xf000);