Module Name: src
Committed By: dyoung
Date: Thu Apr 7 04:01:41 UTC 2011
Modified Files:
src/sys/arch/algor/algor: algor_p4032_intr.c algor_p6032_intr.c
Log Message:
Fix more const pci_attach_args fallout.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/algor/algor/algor_p4032_intr.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/algor/algor/algor_p6032_intr.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/algor/algor/algor_p4032_intr.c
diff -u src/sys/arch/algor/algor/algor_p4032_intr.c:1.21 src/sys/arch/algor/algor/algor_p4032_intr.c:1.22
--- src/sys/arch/algor/algor/algor_p4032_intr.c:1.21 Sun Feb 20 07:51:21 2011
+++ src/sys/arch/algor/algor/algor_p4032_intr.c Thu Apr 7 04:01:40 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: algor_p4032_intr.c,v 1.21 2011/02/20 07:51:21 matt Exp $ */
+/* $NetBSD: algor_p4032_intr.c,v 1.22 2011/04/07 04:01:40 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: algor_p4032_intr.c,v 1.21 2011/02/20 07:51:21 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: algor_p4032_intr.c,v 1.22 2011/04/07 04:01:40 dyoung Exp $");
#include "opt_ddb.h"
#define __INTR_PRIVATE
@@ -219,7 +219,8 @@
void *algor_p4032_intr_establish(int, int (*)(void *), void *);
void algor_p4032_intr_disestablish(void *);
-int algor_p4032_pci_intr_map(struct pci_attach_args *, pci_intr_handle_t *);
+int algor_p4032_pci_intr_map(const struct pci_attach_args *,
+ pci_intr_handle_t *);
const char *algor_p4032_pci_intr_string(void *, pci_intr_handle_t);
const struct evcnt *algor_p4032_pci_intr_evcnt(void *, pci_intr_handle_t);
void *algor_p4032_pci_intr_establish(void *, pci_intr_handle_t, int,
@@ -485,7 +486,7 @@
*****************************************************************************/
int
-algor_p4032_pci_intr_map(struct pci_attach_args *pa,
+algor_p4032_pci_intr_map(const struct pci_attach_args *pa,
pci_intr_handle_t *ihp)
{
static const int pciirqmap[6/*device*/][4/*pin*/] = {
Index: src/sys/arch/algor/algor/algor_p6032_intr.c
diff -u src/sys/arch/algor/algor/algor_p6032_intr.c:1.18 src/sys/arch/algor/algor/algor_p6032_intr.c:1.19
--- src/sys/arch/algor/algor/algor_p6032_intr.c:1.18 Sat Mar 5 14:04:02 2011
+++ src/sys/arch/algor/algor/algor_p6032_intr.c Thu Apr 7 04:01:40 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: algor_p6032_intr.c,v 1.18 2011/03/05 14:04:02 matt Exp $ */
+/* $NetBSD: algor_p6032_intr.c,v 1.19 2011/04/07 04:01:40 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: algor_p6032_intr.c,v 1.18 2011/03/05 14:04:02 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: algor_p6032_intr.c,v 1.19 2011/04/07 04:01:40 dyoung Exp $");
#include "opt_ddb.h"
#define __INTR_PRIVATE
@@ -175,7 +175,8 @@
void *algor_p6032_intr_establish(int, int (*)(void *), void *);
void algor_p6032_intr_disestablish(void *);
-int algor_p6032_pci_intr_map(struct pci_attach_args *, pci_intr_handle_t *);
+int algor_p6032_pci_intr_map(const struct pci_attach_args *,
+ pci_intr_handle_t *);
const char *algor_p6032_pci_intr_string(void *, pci_intr_handle_t);
const struct evcnt *algor_p6032_pci_intr_evcnt(void *, pci_intr_handle_t);
void *algor_p6032_pci_intr_establish(void *, pci_intr_handle_t, int,
@@ -419,7 +420,7 @@
*****************************************************************************/
int
-algor_p6032_pci_intr_map(struct pci_attach_args *pa,
+algor_p6032_pci_intr_map(const struct pci_attach_args *pa,
pci_intr_handle_t *ihp)
{
static const int pciirqmap[6/*device*/][4/*pin*/] = {