Module Name: src
Committed By: knakahara
Date: Fri Oct 23 08:40:08 UTC 2015
Modified Files:
src/sys/arch/dreamcast/dev/g2: gapspci_pci.c
src/sys/arch/dreamcast/include: pci_machdep.h
Log Message:
fix build failure on dreamcast.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/dreamcast/dev/g2/gapspci_pci.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/dreamcast/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/dreamcast/dev/g2/gapspci_pci.c
diff -u src/sys/arch/dreamcast/dev/g2/gapspci_pci.c:1.16 src/sys/arch/dreamcast/dev/g2/gapspci_pci.c:1.17
--- src/sys/arch/dreamcast/dev/g2/gapspci_pci.c:1.16 Fri Oct 2 05:22:50 2015
+++ src/sys/arch/dreamcast/dev/g2/gapspci_pci.c Fri Oct 23 08:40:08 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: gapspci_pci.c,v 1.16 2015/10/02 05:22:50 msaitoh Exp $ */
+/* $NetBSD: gapspci_pci.c,v 1.17 2015/10/23 08:40:08 knakahara Exp $ */
/*-
* Copyright (c) 2001 Marcus Comstedt.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: gapspci_pci.c,v 1.16 2015/10/02 05:22:50 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gapspci_pci.c,v 1.17 2015/10/23 08:40:08 knakahara Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -62,7 +62,7 @@ void gaps_decompose_tag(void *, pcitag_
pcireg_t gaps_conf_read(void *, pcitag_t, int);
void gaps_conf_write(void *, pcitag_t, int, pcireg_t);
-int gaps_intr_map(struct pci_attach_args *, pci_intr_handle_t *);
+int gaps_intr_map(const struct pci_attach_args *, pci_intr_handle_t *);
const char *gaps_intr_string(void *, pci_intr_handle_t,
char *buf, size_t len);
void *gaps_intr_establish(void *, pci_intr_handle_t,
@@ -195,7 +195,7 @@ gaps_conf_write(void *v, pcitag_t tag, i
}
int
-gaps_intr_map(struct pci_attach_args *pa, pci_intr_handle_t *ihp)
+gaps_intr_map(const struct pci_attach_args *pa, pci_intr_handle_t *ihp)
{
*ihp = SYSASIC_EVENT_EXT;
Index: src/sys/arch/dreamcast/include/pci_machdep.h
diff -u src/sys/arch/dreamcast/include/pci_machdep.h:1.8 src/sys/arch/dreamcast/include/pci_machdep.h:1.9
--- src/sys/arch/dreamcast/include/pci_machdep.h:1.8 Sat Mar 29 19:28:27 2014
+++ src/sys/arch/dreamcast/include/pci_machdep.h Fri Oct 23 08:40:08 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.h,v 1.8 2014/03/29 19:28:27 christos Exp $ */
+/* $NetBSD: pci_machdep.h,v 1.9 2015/10/23 08:40:08 knakahara Exp $ */
/*-
* Copyright (c) 2001 Marcus Comstedt
@@ -65,7 +65,7 @@ struct dreamcast_pci_chipset {
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,
char *, size_t);