[src/trunk]: src/sys/arch/algor Fix fallout from pci_attach_args constification.

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

details:   https://anonhg.NetBSD.org/src/rev/4db565e9c9f6
branches:  trunk
changeset: 763863:4db565e9c9f6
user:      dyoung <dyoung%NetBSD.org@localhost>
date:      Wed Apr 06 01:25:18 2011 +0000

description:
Fix fallout from pci_attach_args constification.

diffstat:

 sys/arch/algor/algor/algor_p5064_intr.c |  13 +++++++------
 sys/arch/algor/include/pci_machdep.h    |   6 +++---
 2 files changed, 10 insertions(+), 9 deletions(-)

diffs (81 lines):

diff -r a46a4ec78a02 -r 4db565e9c9f6 sys/arch/algor/algor/algor_p5064_intr.c
--- a/sys/arch/algor/algor/algor_p5064_intr.c   Wed Apr 06 01:24:43 2011 +0000
+++ b/sys/arch/algor/algor/algor_p5064_intr.c   Wed Apr 06 01:25:18 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: algor_p5064_intr.c,v 1.24 2011/02/20 07:51:21 matt Exp $       */
+/*     $NetBSD: algor_p5064_intr.c,v 1.25 2011/04/06 01:25:18 dyoung Exp $     */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: algor_p5064_intr.c,v 1.24 2011/02/20 07:51:21 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: algor_p5064_intr.c,v 1.25 2011/04/06 01:25:18 dyoung Exp $");
 
 #include "opt_ddb.h"
 #define        __INTR_PRIVATE
@@ -290,14 +290,15 @@
 void   *algor_p5064_intr_establish(int, int (*)(void *), void *);
 void   algor_p5064_intr_disestablish(void *);
 
-int    algor_p5064_pci_intr_map(struct pci_attach_args *, pci_intr_handle_t *);
+int    algor_p5064_pci_intr_map(const struct pci_attach_args *,
+           pci_intr_handle_t *);
 const char *algor_p5064_pci_intr_string(void *, pci_intr_handle_t);
 const struct evcnt *algor_p5064_pci_intr_evcnt(void *, pci_intr_handle_t);
 void   *algor_p5064_pci_intr_establish(void *, pci_intr_handle_t, int,
            int (*)(void *), void *);
 void   algor_p5064_pci_intr_disestablish(void *, void *);
 void   *algor_p5064_pciide_compat_intr_establish(void *, device_t,
-           struct pci_attach_args *, int, int (*)(void *), void *);
+           const struct pci_attach_args *, int, int (*)(void *), void *);
 void   algor_p5064_pci_conf_interrupt(void *, int, int, int, int, int *);
 
 const struct evcnt *algor_p5064_isa_intr_evcnt(void *, int);
@@ -573,7 +574,7 @@
  *****************************************************************************/
 
 int
-algor_p5064_pci_intr_map(struct pci_attach_args *pa,
+algor_p5064_pci_intr_map(const struct pci_attach_args *pa,
     pci_intr_handle_t *ihp)
 {
        static const int pciirqmap[6/*device*/][4/*pin*/] = {
@@ -667,7 +668,7 @@
 
 void *
 algor_p5064_pciide_compat_intr_establish(void *v, device_t dev,
-    struct pci_attach_args *pa, int chan, int (*func)(void *), void *arg)
+    const struct pci_attach_args *pa, int chan, int (*func)(void *), void *arg)
 {
        pci_chipset_tag_t pc = pa->pa_pc; 
        void *cookie;
diff -r a46a4ec78a02 -r 4db565e9c9f6 sys/arch/algor/include/pci_machdep.h
--- a/sys/arch/algor/include/pci_machdep.h      Wed Apr 06 01:24:43 2011 +0000
+++ b/sys/arch/algor/include/pci_machdep.h      Wed Apr 06 01:25:18 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pci_machdep.h,v 1.7 2006/02/16 18:20:31 thorpej Exp $  */
+/*     $NetBSD: pci_machdep.h,v 1.8 2011/04/06 01:25:18 dyoung Exp $   */
 
 /*
  * Copyright (c) 1996 Carnegie-Mellon University.
@@ -60,7 +60,7 @@
        void            (*pc_conf_write)(void *, pcitag_t, int, pcireg_t);
 
        void            *pc_intr_v;
-       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)(void *, pci_intr_handle_t);
        const struct evcnt *(*pc_intr_evcnt)(void *, pci_intr_handle_t);
@@ -73,7 +73,7 @@
 
        /* algor-specific */
        void            *(*pc_pciide_compat_intr_establish)(void *,
-                           struct device *, struct pci_attach_args *, int,
+                           device_t, const struct pci_attach_args *, int,
                            int (*)(void *), void *);
 };