Module Name: src
Committed By: msaitoh
Date: Wed Jan 9 07:49:23 UTC 2019
Modified Files:
src/sys/arch/evbarm/iq31244: iq31244_pci.c
src/sys/arch/evbarm/ixdp425: ixdp425_pci.c
src/sys/arch/evbarm/npwr_fc: npwr_fc_pci.c
Log Message:
Fix compile error for *_pci_intr_establish().
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/iq31244/iq31244_pci.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/ixdp425/ixdp425_pci.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/npwr_fc/npwr_fc_pci.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/evbarm/iq31244/iq31244_pci.c
diff -u src/sys/arch/evbarm/iq31244/iq31244_pci.c:1.6 src/sys/arch/evbarm/iq31244/iq31244_pci.c:1.7
--- src/sys/arch/evbarm/iq31244/iq31244_pci.c:1.6 Sat Mar 29 19:28:27 2014
+++ src/sys/arch/evbarm/iq31244/iq31244_pci.c Wed Jan 9 07:49:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: iq31244_pci.c,v 1.6 2014/03/29 19:28:27 christos Exp $ */
+/* $NetBSD: iq31244_pci.c,v 1.7 2019/01/09 07:49:22 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iq31244_pci.c,v 1.6 2014/03/29 19:28:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq31244_pci.c,v 1.7 2019/01/09 07:49:22 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -63,7 +63,7 @@ int iq80321_pci_intr_map(const struct pc
const char *iq80321_pci_intr_string(void *, pci_intr_handle_t, char *, size_t);
const struct evcnt *iq80321_pci_intr_evcnt(void *, pci_intr_handle_t);
void *iq80321_pci_intr_establish(void *, pci_intr_handle_t,
- int, int (*func)(void *), void *);
+ int, int (*func)(void *), void *, const char *);
void iq80321_pci_intr_disestablish(void *, void *);
void
@@ -146,7 +146,7 @@ iq80321_pci_intr_evcnt(void *v, pci_intr
void *
iq80321_pci_intr_establish(void *v, pci_intr_handle_t ih, int ipl,
- int (*func)(void *), void *arg)
+ int (*func)(void *), void *arg, const char *xname)
{
return (i80321_intr_establish(ih, ipl, func, arg));
Index: src/sys/arch/evbarm/ixdp425/ixdp425_pci.c
diff -u src/sys/arch/evbarm/ixdp425/ixdp425_pci.c:1.12 src/sys/arch/evbarm/ixdp425/ixdp425_pci.c:1.13
--- src/sys/arch/evbarm/ixdp425/ixdp425_pci.c:1.12 Tue Oct 23 08:38:18 2018
+++ src/sys/arch/evbarm/ixdp425/ixdp425_pci.c Wed Jan 9 07:49:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ixdp425_pci.c,v 1.12 2018/10/23 08:38:18 jmcneill Exp $ */
+/* $NetBSD: ixdp425_pci.c,v 1.13 2019/01/09 07:49:22 msaitoh Exp $ */
#define PCI_DEBUG
/*
* Copyright (c) 2003
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixdp425_pci.c,v 1.12 2018/10/23 08:38:18 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixdp425_pci.c,v 1.13 2019/01/09 07:49:22 msaitoh Exp $");
/*
* IXDP425 PCI interrupt support.
@@ -55,7 +55,7 @@ static int ixdp425_pci_intr_map(const st
static const char *ixdp425_pci_intr_string(void *, pci_intr_handle_t, char *, size_t);
static const struct evcnt *ixdp425_pci_intr_evcnt(void *, pci_intr_handle_t);
static void *ixdp425_pci_intr_establish(void *, pci_intr_handle_t, int,
- int (*func)(void *), void *);
+ int (*func)(void *), void *, const char *);
static void ixdp425_pci_intr_disestablish(void *, void *);
void
@@ -229,7 +229,7 @@ ixdp425_pci_intr_evcnt(void *v, pci_intr
static void *
ixdp425_pci_intr_establish(void *v, pci_intr_handle_t ih, int ipl,
- int (*func)(void *), void *arg)
+ int (*func)(void *), void *arg, const char *xname)
{
#ifdef PCI_DEBUG
printf("ixdp425_pci_intr_establish(v=%p, irq=%d, ipl=%d, func=%p, arg=%p)\n",
Index: src/sys/arch/evbarm/npwr_fc/npwr_fc_pci.c
diff -u src/sys/arch/evbarm/npwr_fc/npwr_fc_pci.c:1.4 src/sys/arch/evbarm/npwr_fc/npwr_fc_pci.c:1.5
--- src/sys/arch/evbarm/npwr_fc/npwr_fc_pci.c:1.4 Sat Mar 29 19:28:28 2014
+++ src/sys/arch/evbarm/npwr_fc/npwr_fc_pci.c Wed Jan 9 07:49:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: npwr_fc_pci.c,v 1.4 2014/03/29 19:28:28 christos Exp $ */
+/* $NetBSD: npwr_fc_pci.c,v 1.5 2019/01/09 07:49:22 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npwr_fc_pci.c,v 1.4 2014/03/29 19:28:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npwr_fc_pci.c,v 1.5 2019/01/09 07:49:22 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -63,7 +63,7 @@ int iq80321_pci_intr_map(const struct pc
const char *iq80321_pci_intr_string(void *, pci_intr_handle_t, char *, size_t);
const struct evcnt *iq80321_pci_intr_evcnt(void *, pci_intr_handle_t);
void *iq80321_pci_intr_establish(void *, pci_intr_handle_t,
- int, int (*func)(void *), void *);
+ int, int (*func)(void *), void *, const char *);
void iq80321_pci_intr_disestablish(void *, void *);
void
@@ -162,7 +162,7 @@ iq80321_pci_intr_evcnt(void *v, pci_intr
void *
iq80321_pci_intr_establish(void *v, pci_intr_handle_t ih, int ipl,
- int (*func)(void *), void *arg)
+ int (*func)(void *), void *arg, const char *xname)
{
return (i80321_intr_establish(ih, ipl, func, arg));
