Module Name: src
Committed By: dyoung
Date: Wed Apr 6 01:25:18 UTC 2011
Modified Files:
src/sys/arch/algor/algor: algor_p5064_intr.c
src/sys/arch/algor/include: pci_machdep.h
Log Message:
Fix fallout from pci_attach_args constification.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/algor/algor/algor_p5064_intr.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/algor/include/pci_machdep.h
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/algor/algor/algor_p5064_intr.c
diff -u src/sys/arch/algor/algor/algor_p5064_intr.c:1.24 src/sys/arch/algor/algor/algor_p5064_intr.c:1.25
--- src/sys/arch/algor/algor/algor_p5064_intr.c:1.24 Sun Feb 20 07:51:21 2011
+++ src/sys/arch/algor/algor/algor_p5064_intr.c Wed Apr 6 01:25:18 2011
@@ -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;
Index: src/sys/arch/algor/include/pci_machdep.h
diff -u src/sys/arch/algor/include/pci_machdep.h:1.7 src/sys/arch/algor/include/pci_machdep.h:1.8
--- src/sys/arch/algor/include/pci_machdep.h:1.7 Thu Feb 16 18:20:31 2006
+++ src/sys/arch/algor/include/pci_machdep.h Wed Apr 6 01:25:18 2011
@@ -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 *);
};
