[src/trunk]: src/sys/dev/pci No functional change. OK'd by nonaka:

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

details:   https://anonhg.NetBSD.org/src/rev/a977780d255f
branches:  trunk
changeset: 446466:a977780d255f
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Fri Dec 07 08:52:43 2018 +0000

description:
No functional change. OK'd by nonaka:
- Use correct macro.
- Don't use magic number.

diffstat:

 sys/dev/pci/nvme_pci.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 462703d79dfd -r a977780d255f sys/dev/pci/nvme_pci.c
--- a/sys/dev/pci/nvme_pci.c    Fri Dec 07 08:28:44 2018 +0000
+++ b/sys/dev/pci/nvme_pci.c    Fri Dec 07 08:52:43 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nvme_pci.c,v 1.24 2018/12/01 13:32:55 jdolecek Exp $   */
+/*     $NetBSD: nvme_pci.c,v 1.25 2018/12/07 08:52:43 msaitoh Exp $    */
 /*     $OpenBSD: nvme_pci.c,v 1.3 2016/04/14 11:18:32 dlg Exp $ */
 
 /*
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nvme_pci.c,v 1.24 2018/12/01 13:32:55 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvme_pci.c,v 1.25 2018/12/07 08:52:43 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -173,7 +173,7 @@
                return;
        }
        sc->sc_iot = pa->pa_memt;
-       error = pci_mapreg_info(pa->pa_pc, pa->pa_tag, PCI_MAPREG_START,
+       error = pci_mapreg_info(pa->pa_pc, pa->pa_tag, NVME_PCI_BAR,
            memtype, &memaddr, &sc->sc_ios, &flags);
        if (error) {
                aprint_error_dev(self, "can't get map info\n");
@@ -190,7 +190,7 @@
                    msixoff + PCI_MSIX_TBLOFFSET);
                table_offset = msixtbl & PCI_MSIX_TBLOFFSET_MASK;
                bir = msixtbl & PCI_MSIX_PBABIR_MASK;
-               if (bir == 0) {
+               if (bir == PCI_MAPREG_NUM(NVME_PCI_BAR)) {
                        sc->sc_ios = table_offset;
                }
        }