Module Name: src
Committed By: dyoung
Date: Wed May 11 17:49:31 UTC 2011
Modified Files:
src/sys/arch/sgimips/gio: pci_gio.c
src/sys/arch/sgimips/include: pci_machdep.h
src/sys/arch/sgimips/mace: pci_mace.c
src/sys/arch/sgimips/pci: pci_machdep.c
Log Message:
Now that GENERIC32_IPX3x builds again, fix some pci_attach_args
constification that I'd missed.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/sgimips/gio/pci_gio.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/sgimips/include/pci_machdep.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sgimips/mace/pci_mace.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/sgimips/pci/pci_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sgimips/gio/pci_gio.c
diff -u src/sys/arch/sgimips/gio/pci_gio.c:1.6 src/sys/arch/sgimips/gio/pci_gio.c:1.7
--- src/sys/arch/sgimips/gio/pci_gio.c:1.6 Sun Feb 20 07:59:50 2011
+++ src/sys/arch/sgimips/gio/pci_gio.c Wed May 11 17:49:31 2011
@@ -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;
Index: src/sys/arch/sgimips/include/pci_machdep.h
diff -u src/sys/arch/sgimips/include/pci_machdep.h:1.9 src/sys/arch/sgimips/include/pci_machdep.h:1.10
--- src/sys/arch/sgimips/include/pci_machdep.h:1.9 Wed Aug 30 23:35:10 2006
+++ src/sys/arch/sgimips/include/pci_machdep.h Wed May 11 17:49:31 2011
@@ -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,
Index: src/sys/arch/sgimips/mace/pci_mace.c
diff -u src/sys/arch/sgimips/mace/pci_mace.c:1.10 src/sys/arch/sgimips/mace/pci_mace.c:1.11
--- src/sys/arch/sgimips/mace/pci_mace.c:1.10 Sun Feb 20 07:59:51 2011
+++ src/sys/arch/sgimips/mace/pci_mace.c Wed May 11 17:49:31 2011
@@ -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;
Index: src/sys/arch/sgimips/pci/pci_machdep.c
diff -u src/sys/arch/sgimips/pci/pci_machdep.c:1.20 src/sys/arch/sgimips/pci/pci_machdep.c:1.21
--- src/sys/arch/sgimips/pci/pci_machdep.c:1.20 Fri May 30 19:26:35 2008
+++ src/sys/arch/sgimips/pci/pci_machdep.c Wed May 11 17:49:31 2011
@@ -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);
}
