[src/trunk]: src/sys/arch/evbmips/loongson/dev Use the PCI_MAPREG_TYPE macro....

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

details:   https://anonhg.NetBSD.org/src/rev/831fd588399f
branches:  trunk
changeset: 952784:831fd588399f
user:      skrll <skrll%NetBSD.org@localhost>
date:      Wed Feb 17 08:18:39 2021 +0000

description:
Use the PCI_MAPREG_TYPE macro.  Same binary after change.

diffstat:

 sys/arch/evbmips/loongson/dev/glx.c |  21 ++++++++-------------
 1 files changed, 8 insertions(+), 13 deletions(-)

diffs (70 lines):

diff -r 1720b9b3f42d -r 831fd588399f sys/arch/evbmips/loongson/dev/glx.c
--- a/sys/arch/evbmips/loongson/dev/glx.c       Wed Feb 17 08:15:43 2021 +0000
+++ b/sys/arch/evbmips/loongson/dev/glx.c       Wed Feb 17 08:18:39 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: glx.c,v 1.6 2018/02/08 09:05:17 dholland Exp $ */
+/*     $NetBSD: glx.c,v 1.7 2021/02/17 08:18:39 skrll Exp $    */
 /*     $OpenBSD: glx.c,v 1.6 2010/10/14 21:23:04 pirofti Exp $ */
 
 /*
@@ -22,7 +22,7 @@
  * XXX too many hardcoded numbers... need to expand glxreg.h
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: glx.c,v 1.6 2018/02/08 09:05:17 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: glx.c,v 1.7 2021/02/17 08:18:39 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -460,8 +460,7 @@
                if (data == 0xffffffff) {
                        pcib_bar_values[index] = data;
                } else if (pcib_bar_msr[index] != 0) {
-                       if ((data & PCI_MAPREG_TYPE_MASK) ==
-                           PCI_MAPREG_TYPE_IO) {
+                       if (PCI_MAPREG_TYPE(data) == PCI_MAPREG_TYPE_IO) {
                                data &= PCI_MAPREG_IO_ADDR_MASK;
                                data &= ~(pcib_bar_sizes[index] - 1);
                                wrmsr(pcib_bar_msr[index],
@@ -573,8 +572,7 @@
                if (data == 0xffffffff) {
                        pciide_bar_value = data;
                } else {
-                       if ((data & PCI_MAPREG_TYPE_MASK) ==
-                           PCI_MAPREG_TYPE_IO) {
+                       if (PCI_MAPREG_TYPE(data) == PCI_MAPREG_TYPE_IO) {
                                data &= PCI_MAPREG_IO_ADDR_MASK;
                                msr = (uint32_t)data & 0xfffffff0;
                                wrmsr(GCSC_IDE_IO_BAR, msr);
@@ -686,8 +684,7 @@
                if (data == 0xffffffff) {
                        ac97_bar_value = data;
                } else {
-                       if ((data & PCI_MAPREG_TYPE_MASK) ==
-                           PCI_MAPREG_TYPE_IO) {
+                       if (PCI_MAPREG_TYPE(data) == PCI_MAPREG_TYPE_IO) {
                                data &= PCI_MAPREG_IO_ADDR_MASK;
                                msr = rdmsr(GCSC_GLIU_IOD_BM1);
                                msr &= 0x0fffff0000000000ULL;
@@ -799,8 +796,7 @@
                if (data == 0xffffffff) {
                        ohci_bar_value = data;
                } else {
-                       if ((data & PCI_MAPREG_TYPE_MASK) ==
-                           PCI_MAPREG_TYPE_MEM) {
+                       if (PCI_MAPREG_TYPE(data) == PCI_MAPREG_TYPE_MEM) {
                                data &= PCI_MAPREG_MEM_ADDR_MASK;
                                msr = rdmsr(GCSC_GLIU_P2D_BM3);
                                msr &= 0x0fffff0000000000ULL;
@@ -925,9 +921,8 @@
                if (data == 0xffffffff) {
                        ehci_bar_value = data;
                } else {
-                       if ((data & PCI_MAPREG_TYPE_MASK) ==
-                           PCI_MAPREG_TYPE_MEM) {
-                               data &= PCI_MAPREG_MEM_ADDR_MASK;
+                       if (PCI_MAPREG_TYPE(data) == PCI_MAPREG_TYPE_MEM) {
+                               data = PCI_MAPREG_MEM_ADDR(data);
                                msr = rdmsr(GCSC_GLIU_P2D_BM4);
                                msr &= 0x0fffff0000000000ULL;
                                msr |= 2ULL << 61;      /* USB */