[src/trunk]: src/sys/arch/sgimips Now that GENERIC32_IPX3x builds again, fix ...

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

details:   https://anonhg.NetBSD.org/src/rev/135517d82729
branches:  trunk
changeset: 764912:135517d82729
user:      dyoung <dyoung%NetBSD.org@localhost>
date:      Wed May 11 17:49:31 2011 +0000

description:
Now that GENERIC32_IPX3x builds again, fix some pci_attach_args
constification that I'd missed.

diffstat:

 sys/arch/sgimips/gio/pci_gio.c         |  9 +++++----
 sys/arch/sgimips/include/pci_machdep.h |  7 ++++---
 sys/arch/sgimips/mace/pci_mace.c       |  9 +++++----
 sys/arch/sgimips/pci/pci_machdep.c     |  6 +++---
 4 files changed, 17 insertions(+), 14 deletions(-)

diffs (129 lines):

diff -r c94b6b12fd4c -r 135517d82729 sys/arch/sgimips/gio/pci_gio.c
--- a/sys/arch/sgimips/gio/pci_gio.c    Wed May 11 16:23:40 2011 +0000
+++ b/sys/arch/sgimips/gio/pci_gio.c    Wed May 11 17:49:31 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pci_gio.c,v 1.6 2011/02/20 07:59:50 matt Exp $ */
+/*     $NetBSD: pci_gio.c,v 1.7 2011/05/11 17:49:31 dyoung Exp $       */
 
 /*
  * Copyright (c) 2006 Stephen M. Rumble
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_gio.c,v 1.6 2011/02/20 07:59:50 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_gio.c,v 1.7 2011/05/11 17:49:31 dyoung Exp $");
 
 /*
  * Glue for PCI devices that are connected to the GIO bus by various little
@@ -80,7 +80,8 @@
 static pcireg_t        giopci_conf_read(pci_chipset_tag_t, pcitag_t, int);
 static void    giopci_conf_write(pci_chipset_tag_t, pcitag_t, int, pcireg_t);
 static int     giopci_conf_hook(pci_chipset_tag_t, int, int, int, pcireg_t);
-static int     giopci_intr_map(struct pci_attach_args *, pci_intr_handle_t *);
+static int     giopci_intr_map(const struct pci_attach_args *,
+                   pci_intr_handle_t *);
 static const char *
                giopci_intr_string(pci_chipset_tag_t, pci_intr_handle_t);
 static void    *giopci_intr_establish(int, int, int (*)(void *), void *);
@@ -290,7 +291,7 @@
 }
 
 static int
-giopci_intr_map(struct pci_attach_args *pa, pci_intr_handle_t *ihp)
+giopci_intr_map(const struct pci_attach_args *pa, pci_intr_handle_t *ihp)
 {
        struct giopci_softc *sc = pa->pa_pc->cookie;
 
diff -r c94b6b12fd4c -r 135517d82729 sys/arch/sgimips/include/pci_machdep.h
--- a/sys/arch/sgimips/include/pci_machdep.h    Wed May 11 16:23:40 2011 +0000
+++ b/sys/arch/sgimips/include/pci_machdep.h    Wed May 11 17:49:31 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pci_machdep.h,v 1.9 2006/08/30 23:35:10 rumble Exp $   */
+/*     $NetBSD: pci_machdep.h,v 1.10 2011/05/11 17:49:31 dyoung Exp $  */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -60,7 +60,7 @@
                                pcireg_t);
        int             (*pc_conf_hook)(pci_chipset_tag_t, int, int, int,
                                pcireg_t);
-       int             (*pc_intr_map)(struct pci_attach_args *,
+       int             (*pc_intr_map)(const struct pci_attach_args *,
                                pci_intr_handle_t *);
        const char *    (*pc_intr_string)(pci_chipset_tag_t pc,
                                pci_intr_handle_t);
@@ -91,7 +91,8 @@
 void           pci_conf_write(pci_chipset_tag_t, pcitag_t, int,
                        pcireg_t);
 int            pci_conf_hook(pci_chipset_tag_t, int, int, int, pcireg_t);
-int            pci_intr_map(struct pci_attach_args *, pci_intr_handle_t *);
+int            pci_intr_map(const struct pci_attach_args *,
+                       pci_intr_handle_t *);
 const char     *pci_intr_string(pci_chipset_tag_t, pci_intr_handle_t);
 const struct evcnt *pci_intr_evcnt(pci_chipset_tag_t, pci_intr_handle_t);
 void           *pci_intr_establish(pci_chipset_tag_t, pci_intr_handle_t,
diff -r c94b6b12fd4c -r 135517d82729 sys/arch/sgimips/mace/pci_mace.c
--- a/sys/arch/sgimips/mace/pci_mace.c  Wed May 11 16:23:40 2011 +0000
+++ b/sys/arch/sgimips/mace/pci_mace.c  Wed May 11 17:49:31 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pci_mace.c,v 1.10 2011/02/20 07:59:51 matt Exp $       */
+/*     $NetBSD: pci_mace.c,v 1.11 2011/05/11 17:49:31 dyoung Exp $     */
 
 /*
  * Copyright (c) 2001,2003 Christopher Sekiya
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_mace.c,v 1.10 2011/02/20 07:59:51 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_mace.c,v 1.11 2011/05/11 17:49:31 dyoung Exp $");
 
 #include "opt_pci.h"
 #include "pci.h"
@@ -76,7 +76,8 @@
 static int     macepci_bus_maxdevs(pci_chipset_tag_t, int);
 static pcireg_t        macepci_conf_read(pci_chipset_tag_t, pcitag_t, int);
 static void    macepci_conf_write(pci_chipset_tag_t, pcitag_t, int, pcireg_t);
-static int     macepci_intr_map(struct pci_attach_args *, pci_intr_handle_t *);
+static int     macepci_intr_map(const struct pci_attach_args *,
+                   pci_intr_handle_t *);
 static const char *
                macepci_intr_string(pci_chipset_tag_t, pci_intr_handle_t);
 static int     macepci_intr(void *);
@@ -207,7 +208,7 @@
 }
 
 int
-macepci_intr_map(struct pci_attach_args *pa, pci_intr_handle_t *ihp)
+macepci_intr_map(const struct pci_attach_args *pa, pci_intr_handle_t *ihp)
 {
        pci_chipset_tag_t pc = pa->pa_pc;
        pcitag_t intrtag = pa->pa_intrtag;
diff -r c94b6b12fd4c -r 135517d82729 sys/arch/sgimips/pci/pci_machdep.c
--- a/sys/arch/sgimips/pci/pci_machdep.c        Wed May 11 16:23:40 2011 +0000
+++ b/sys/arch/sgimips/pci/pci_machdep.c        Wed May 11 17:49:31 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pci_machdep.c,v 1.20 2008/05/30 19:26:35 ad Exp $      */
+/*     $NetBSD: pci_machdep.c,v 1.21 2011/05/11 17:49:31 dyoung Exp $  */
 
 /*
  * Copyright (c) 2000 Soren S. Jorvang
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.20 2008/05/30 19:26:35 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.21 2011/05/11 17:49:31 dyoung Exp $");
 
 #include "opt_pci.h"
 #include "pci.h"
@@ -115,7 +115,7 @@
 }
 
 int
-pci_intr_map(struct pci_attach_args *pa, pci_intr_handle_t *ihp)
+pci_intr_map(const struct pci_attach_args *pa, pci_intr_handle_t *ihp)
 {
        return (*pa->pa_pc->pc_intr_map)(pa, ihp);
 }