[src/trunk]: src/sys/arch/alpha Rename alpha_pci_decompose_tag() to pci_decom...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys/arch/alpha Rename alpha_pci_decompose_tag() to pci_decom...
From: thorpej <thorpej%NetBSD.org@localhost>
Date: Fri, 24 Jan 2020 11:00:41 +0000
details:   https://anonhg.NetBSD.org/src/rev/9ead3bb8b915
branches:  trunk
changeset: 527002:9ead3bb8b915
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Wed May 15 16:57:41 2002 +0000

description:
Rename alpha_pci_decompose_tag() to pci_decompose_tag().  There *is*
some MI PCI code that uses it, and soon there will be more.  (The rationale
for not making it available previously was that it could be mis-used, but
that's true of a lot of things.)

diffstat:

 sys/arch/alpha/a12/if_ade.c          |  4 ++--
 sys/arch/alpha/include/pci_machdep.h |  6 +++---
 sys/arch/alpha/pci/apecs_pci.c       |  8 ++++----
 sys/arch/alpha/pci/cia_pci.c         |  8 ++++----
 sys/arch/alpha/pci/lca_pci.c         |  8 ++++----
 sys/arch/alpha/pci/pci_1000.c        |  6 +++---
 sys/arch/alpha/pci/pci_1000a.c       |  6 +++---
 sys/arch/alpha/pci/pci_2100_a50.c    |  6 +++---
 sys/arch/alpha/pci/pci_2100_a500.c   |  8 ++++----
 sys/arch/alpha/pci/pci_550.c         |  8 ++++----
 sys/arch/alpha/pci/pci_6600.c        |  8 ++++----
 sys/arch/alpha/pci/pci_alphabook1.c  |  6 +++---
 sys/arch/alpha/pci/pci_axppci_33.c   |  6 +++---
 sys/arch/alpha/pci/pci_eb164.c       |  8 ++++----
 sys/arch/alpha/pci/pci_eb64plus.c    |  6 +++---
 sys/arch/alpha/pci/pci_eb66.c        |  6 +++---
 sys/arch/alpha/pci/pci_kn20aa.c      |  6 +++---
 sys/arch/alpha/pci/pci_kn300.c       |  6 +++---
 sys/arch/alpha/pci/pci_kn8ae.c       |  6 +++---
 sys/arch/alpha/pci/pci_up1000.c      |  8 ++++----
 sys/arch/alpha/pci/ttwoga_pci.c      |  8 ++++----
 21 files changed, 71 insertions(+), 71 deletions(-)

diffs (truncated from 639 to 300 lines):

diff -r a52c2f7965a8 -r 9ead3bb8b915 sys/arch/alpha/a12/if_ade.c
--- a/sys/arch/alpha/a12/if_ade.c       Wed May 15 16:33:35 2002 +0000
+++ b/sys/arch/alpha/a12/if_ade.c       Wed May 15 16:57:41 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_ade.c,v 1.13 2002/05/02 16:22:43 thorpej Exp $      */
+/*     $NetBSD: if_ade.c,v 1.14 2002/05/15 16:57:41 thorpej Exp $      */
 
 /*
  * NOTE: this version of if_de was modified for bounce buffers prior
@@ -5030,7 +5030,7 @@
 #define        PCI_CONF_READ(r)        pci_conf_read(pa->pa_pc, pa->pa_tag, (r))
 #define        PCI_GETBUSDEVINFO(sc)   do { \
        int busno, devno, funcno; \
-       alpha_pci_decompose_tag(pa->pa_pc, pa->pa_tag, &busno, &devno, &funcno); \
+       pci_decompose_tag(pa->pa_pc, pa->pa_tag, &busno, &devno, &funcno); \
        (sc)->tulip_pci_busno = busno; \
        (sc)->tulip_pci_devno = devno; \
     } while (0)
diff -r a52c2f7965a8 -r 9ead3bb8b915 sys/arch/alpha/include/pci_machdep.h
--- a/sys/arch/alpha/include/pci_machdep.h      Wed May 15 16:33:35 2002 +0000
+++ b/sys/arch/alpha/include/pci_machdep.h      Wed May 15 16:57:41 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.h,v 1.7 2001/06/08 04:48:56 simonb Exp $ */
+/* $NetBSD: pci_machdep.h,v 1.8 2002/05/15 16:57:41 thorpej Exp $ */
 
 /*
  * Copyright (c) 1996 Carnegie-Mellon University.
@@ -83,6 +83,8 @@
     (*(c)->pc_bus_maxdevs)((c)->pc_conf_v, (b))
 #define        pci_make_tag(c, b, d, f)                                        \
     (*(c)->pc_make_tag)((c)->pc_conf_v, (b), (d), (f))
+#define        pci_decompose_tag(c, t, bp, dp, fp)                             \
+    (*(c)->pc_decompose_tag)((c)->pc_conf_v, (t), (bp), (dp), (fp))
 #define        pci_conf_read(c, t, r)                                          \
     (*(c)->pc_conf_read)((c)->pc_conf_v, (t), (r))
 #define        pci_conf_write(c, t, r, v)                                      \
@@ -104,8 +106,6 @@
  */
 void   pci_display_console(bus_space_tag_t, bus_space_tag_t,
            pci_chipset_tag_t, int, int, int);
-#define        alpha_pci_decompose_tag(c, t, bp, dp, fp)                       \
-    (*(c)->pc_decompose_tag)((c)->pc_conf_v, (t), (bp), (dp), (fp))
 #define        alpha_pciide_compat_intr_establish(c, d, p, ch, f, a)           \
     ((c)->pc_pciide_compat_intr_establish == NULL ? NULL :             \
      (*(c)->pc_pciide_compat_intr_establish)((c)->pc_conf_v, (d), (p), \
diff -r a52c2f7965a8 -r 9ead3bb8b915 sys/arch/alpha/pci/apecs_pci.c
--- a/sys/arch/alpha/pci/apecs_pci.c    Wed May 15 16:33:35 2002 +0000
+++ b/sys/arch/alpha/pci/apecs_pci.c    Wed May 15 16:57:41 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: apecs_pci.c,v 1.18 2000/06/29 08:58:45 mrg Exp $ */
+/* $NetBSD: apecs_pci.c,v 1.19 2002/05/15 16:57:42 thorpej Exp $ */
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: apecs_pci.c,v 1.18 2000/06/29 08:58:45 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: apecs_pci.c,v 1.19 2002/05/15 16:57:42 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -122,7 +122,7 @@
        old_haxr2 = 0;                          /* XXX gcc -Wuninitialized */
 
        /* secondary if bus # != 0 */
-       alpha_pci_decompose_tag(&acp->ac_pc, tag, &secondary, 0, 0);
+       pci_decompose_tag(&acp->ac_pc, tag, &secondary, 0, 0);
        if (secondary) {
                s = splhigh();
                old_haxr2 = REGVAL(EPIC_HAXR2);
@@ -171,7 +171,7 @@
        old_haxr2 = 0;                          /* XXX gcc -Wuninitialized */
 
        /* secondary if bus # != 0 */
-       alpha_pci_decompose_tag(&acp->ac_pc, tag, &secondary, 0, 0);
+       pci_decompose_tag(&acp->ac_pc, tag, &secondary, 0, 0);
        if (secondary) {
                s = splhigh();
                old_haxr2 = REGVAL(EPIC_HAXR2);
diff -r a52c2f7965a8 -r 9ead3bb8b915 sys/arch/alpha/pci/cia_pci.c
--- a/sys/arch/alpha/pci/cia_pci.c      Wed May 15 16:33:35 2002 +0000
+++ b/sys/arch/alpha/pci/cia_pci.c      Wed May 15 16:57:41 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cia_pci.c,v 1.25 2000/06/29 08:58:46 mrg Exp $ */
+/* $NetBSD: cia_pci.c,v 1.26 2002/05/15 16:57:42 thorpej Exp $ */
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: cia_pci.c,v 1.25 2000/06/29 08:58:46 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cia_pci.c,v 1.26 2002/05/15 16:57:42 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -139,7 +139,7 @@
        alpha_pal_draina();     
 
        /* secondary if bus # != 0 */
-       alpha_pci_decompose_tag(&ccp->cc_pc, tag, &secondary, 0, 0);
+       pci_decompose_tag(&ccp->cc_pc, tag, &secondary, 0, 0);
        if (secondary) {
                s = splhigh();
                old_cfg = REGVAL(CIA_CSR_CFG);
@@ -223,7 +223,7 @@
 #endif
 
        /* secondary if bus # != 0 */
-       alpha_pci_decompose_tag(&ccp->cc_pc, tag, &secondary, 0, 0);
+       pci_decompose_tag(&ccp->cc_pc, tag, &secondary, 0, 0);
        if (secondary) {
                s = splhigh();
                old_cfg = REGVAL(CIA_CSR_CFG);
diff -r a52c2f7965a8 -r 9ead3bb8b915 sys/arch/alpha/pci/lca_pci.c
--- a/sys/arch/alpha/pci/lca_pci.c      Wed May 15 16:33:35 2002 +0000
+++ b/sys/arch/alpha/pci/lca_pci.c      Wed May 15 16:57:41 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lca_pci.c,v 1.14 2000/06/29 08:58:47 mrg Exp $ */
+/* $NetBSD: lca_pci.c,v 1.15 2002/05/15 16:57:42 thorpej Exp $ */
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: lca_pci.c,v 1.14 2000/06/29 08:58:47 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lca_pci.c,v 1.15 2002/05/15 16:57:42 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -123,7 +123,7 @@
        s = 0;                                  /* XXX gcc -Wuninitialized */
 
        /* secondary if bus # != 0 */
-       alpha_pci_decompose_tag(&lcp->lc_pc, tag, &secondary, &device, 0);
+       pci_decompose_tag(&lcp->lc_pc, tag, &secondary, &device, 0);
        if (secondary) {
                s = splhigh();
                alpha_mb();
@@ -177,7 +177,7 @@
        s = 0;                                  /* XXX gcc -Wuninitialized */
 
        /* secondary if bus # != 0 */
-       alpha_pci_decompose_tag(&lcp->lc_pc, tag, &secondary, &device, 0);
+       pci_decompose_tag(&lcp->lc_pc, tag, &secondary, &device, 0);
        if (secondary) {
                s = splhigh();
                alpha_mb();
diff -r a52c2f7965a8 -r 9ead3bb8b915 sys/arch/alpha/pci/pci_1000.c
--- a/sys/arch/alpha/pci/pci_1000.c     Wed May 15 16:33:35 2002 +0000
+++ b/sys/arch/alpha/pci/pci_1000.c     Wed May 15 16:57:41 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_1000.c,v 1.12 2001/07/27 00:25:20 thorpej Exp $ */
+/* $NetBSD: pci_1000.c,v 1.13 2002/05/15 16:57:42 thorpej Exp $ */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: pci_1000.c,v 1.12 2001/07/27 00:25:20 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_1000.c,v 1.13 2002/05/15 16:57:42 thorpej Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -170,7 +170,7 @@
        if (!(1 <= buspin && buspin <= 4))
                goto bad;
 
-       alpha_pci_decompose_tag(pc, bustag, NULL, &device, NULL);
+       pci_decompose_tag(pc, bustag, NULL, &device, NULL);
 
        switch(device) {
        case 6:
diff -r a52c2f7965a8 -r 9ead3bb8b915 sys/arch/alpha/pci/pci_1000a.c
--- a/sys/arch/alpha/pci/pci_1000a.c    Wed May 15 16:33:35 2002 +0000
+++ b/sys/arch/alpha/pci/pci_1000a.c    Wed May 15 16:57:41 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_1000a.c,v 1.14 2001/07/27 00:25:20 thorpej Exp $ */
+/* $NetBSD: pci_1000a.c,v 1.15 2002/05/15 16:57:42 thorpej Exp $ */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: pci_1000a.c,v 1.14 2001/07/27 00:25:20 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_1000a.c,v 1.15 2002/05/15 16:57:42 thorpej Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -195,7 +195,7 @@
                return 1;
        if (!(1 <= buspin && buspin <= 4))
                goto bad;
-       alpha_pci_decompose_tag(pc, bustag, NULL, &device, NULL);
+       pci_decompose_tag(pc, bustag, NULL, &device, NULL);
        if (0 <= device && device < sizeof imrmap / sizeof imrmap[0]) {
                if (device == 0)
                        printf("dec_1000a_intr_map: ?! UNEXPECTED DEV 0\n");
diff -r a52c2f7965a8 -r 9ead3bb8b915 sys/arch/alpha/pci/pci_2100_a50.c
--- a/sys/arch/alpha/pci/pci_2100_a50.c Wed May 15 16:33:35 2002 +0000
+++ b/sys/arch/alpha/pci/pci_2100_a50.c Wed May 15 16:57:41 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_2100_a50.c,v 1.30 2001/07/27 00:25:20 thorpej Exp $ */
+/* $NetBSD: pci_2100_a50.c,v 1.31 2002/05/15 16:57:42 thorpej Exp $ */
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: pci_2100_a50.c,v 1.30 2001/07/27 00:25:20 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_2100_a50.c,v 1.31 2002/05/15 16:57:42 thorpej Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -124,7 +124,7 @@
                return 1;
        }
 
-       alpha_pci_decompose_tag(pc, bustag, NULL, &device, NULL);
+       pci_decompose_tag(pc, bustag, NULL, &device, NULL);
 
        switch (device) {
        case 6:                                 /* NCR SCSI */
diff -r a52c2f7965a8 -r 9ead3bb8b915 sys/arch/alpha/pci/pci_2100_a500.c
--- a/sys/arch/alpha/pci/pci_2100_a500.c        Wed May 15 16:33:35 2002 +0000
+++ b/sys/arch/alpha/pci/pci_2100_a500.c        Wed May 15 16:57:41 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_2100_a500.c,v 1.3 2001/07/27 00:25:20 thorpej Exp $ */
+/* $NetBSD: pci_2100_a500.c,v 1.4 2002/05/15 16:57:42 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: pci_2100_a500.c,v 1.3 2001/07/27 00:25:20 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_2100_a500.c,v 1.4 2002/05/15 16:57:42 thorpej Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -357,7 +357,7 @@
                return (1);
        }
 
-       alpha_pci_decompose_tag(pc, bustag, NULL, &device, NULL);
+       pci_decompose_tag(pc, bustag, NULL, &device, NULL);
        if (device > 8) {
                printf("dec_2100_a500_pic_intr_map: bad device %d\n",
                    device);
@@ -393,7 +393,7 @@
                return (1);
        }
 
-       alpha_pci_decompose_tag(pc, bustag, NULL, &device, NULL);
+       pci_decompose_tag(pc, bustag, NULL, &device, NULL);
        switch (device) {
        case 0:         /* on-board Ethernet */
                irq = 24;
diff -r a52c2f7965a8 -r 9ead3bb8b915 sys/arch/alpha/pci/pci_550.c
--- a/sys/arch/alpha/pci/pci_550.c      Wed May 15 16:33:35 2002 +0000
+++ b/sys/arch/alpha/pci/pci_550.c      Wed May 15 16:57:41 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_550.c,v 1.22 2001/07/27 00:25:20 thorpej Exp $ */
+/* $NetBSD: pci_550.c,v 1.23 2002/05/15 16:57:42 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: pci_550.c,v 1.22 2001/07/27 00:25:20 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_550.c,v 1.23 2002/05/15 16:57:42 thorpej Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -196,7 +196,7 @@
                return 1;
        }
 
-       alpha_pci_decompose_tag(pc, bustag, &bus, &device, &function);
+       pci_decompose_tag(pc, bustag, &bus, &device, &function);
 
        /*
         * There are two main variants of Miata: Miata 1 (Intel SIO)
@@ -382,7 +382,7 @@
        void *cookie = NULL;
        int bus, irq;
Prev by Date: [src/trunk]: src/sys/arch/dreamcast Implement pci_decompose_tag().
Next by Date: [src/trunk]: src/bin/sh implement noclobber. From Ben Harris, with minor twea...
Previous by Thread: [src/trunk]: src/sys/arch/dreamcast Implement pci_decompose_tag().
Next by Thread: [src/trunk]: src/bin/sh implement noclobber. From Ben Harris, with minor twea...
Indexes:
Home | Main Index | Thread Index | Old Index