Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys Neither pci_dma64_available(), pci_probe_device(), pci_m...
details: https://anonhg.NetBSD.org/src/rev/0c558b485c4a
branches: trunk
changeset: 763825:0c558b485c4a
user: dyoung <dyoung%NetBSD.org@localhost>
date: Mon Apr 04 20:37:49 2011 +0000
description:
Neither pci_dma64_available(), pci_probe_device(), pci_mapreg_map(9),
pci_find_rom(), pci_intr_map(9), pci_enumerate_bus(), nor the match
predicate passed to pciide_compat_intr_establish() should ever modify
their pci_attach_args argument, so make their pci_attach_args arguments
const and deal with the fallout throughout the kernel.
For the most part, these changes add a 'const' where there was no
'const' before, however, some drivers and MD code used to modify
pci_attach_args. Now those drivers either copy their pci_attach_args
and modify the copy, or refrain from modifying pci_attach_args:
Xen: according to Manuel Bouyer, writing to pci_attach_args in
pci_intr_map() was a leftover from Xen 2. Probably a bug. I
stopped writing it. I have not tested this change.
siside(4): sis_hostbr_match() needlessly wrote to pci_attach_args.
Probably a bug. I use a temporary variable. I have not tested this
change.
slide(4): sl82c105_chip_map() overwrote the caller's pci_attach_args.
Probably a bug. Use a local pci_attach_args. I have not tested
this change.
viaide(4): via_sata_chip_map() and via_sata_chip_map_new() overwrote the
caller's pci_attach_args. Probably a bug. Make a local copy of the
caller's pci_attach_args and modify the copy. I have not tested
this change.
While I'm here, make pci_mapreg_submap() static.
With these changes in place, I have tested the compilation of these
kernels:
alpha GENERIC
amd64 GENERIC XEN3_DOM0
arc GENERIC
atari HADES MILAN-PCIIDE
bebox GENERIC
cats GENERIC
cobalt GENERIC
evbarm-eb NSLU2
evbarm-el ADI_BRH ARMADILLO9 CP3100 GEMINI GEMINI_MASTER GEMINI_SLAVE GUMSTIX
HDL_G IMX31LITE INTEGRATOR IQ31244 IQ80310 IQ80321 IXDP425 IXM1200
KUROBOX_PRO LUBBOCK MARVELL_NAS NAPPI SHEEVAPLUG SMDK2800 TEAMASA_NPWR
TEAMASA_NPWR_FC TS7200 TWINTAIL ZAO425
evbmips-el AP30 DBAU1500 DBAU1550 MALTA MERAKI MTX-1 OMSAL400 RB153 WGT624V3
evbmips64-el XLSATX
evbppc EV64260 MPC8536DS MPC8548CDS OPENBLOCKS200 OPENBLOCKS266
OPENBLOCKS266_OPT P2020RDB PMPPC RB800 WALNUT
hp700 GENERIC
i386 ALL XEN3_DOM0 XEN3_DOMU
ibmnws GENERIC
macppc GENERIC
mvmeppc GENERIC
netwinder GENERIC
ofppc GENERIC
prep GENERIC
sandpoint GENERIC
sgimips GENERIC32_IP2x
sparc GENERIC_SUN4U KRUPS
sparc64 GENERIC
As of Sun Apr 3 15:26:26 CDT 2011, I could not compile these kernels
with or without my patches in place:
### evbmips-el GDIUM
nbmake: nbmake: don't know how to make /home/dyoung/pristine-nbsd/src/sys/arch/mips/mips/softintr.c. Stop
### evbarm-el MPCSA_GENERIC
src/sys/arch/evbarm/conf/MPCSA_GENERIC:318: ds1672rtc*: unknown device `ds1672rtc'
### ia64 GENERIC
/tmp/genassym.28085/assym.c: In function 'f111':
/tmp/genassym.28085/assym.c:67: error: invalid application of 'sizeof' to incomplete type 'struct pcb'
/tmp/genassym.28085/assym.c:76: error: dereferencing pointer to incomplete type
### sgimips GENERIC32_IP3x
crmfb.o: In function `crmfb_attach':
crmfb.c:(.text+0x2304): undefined reference to `ddc_read_edid'
crmfb.c:(.text+0x2304): relocation truncated to fit: R_MIPS_26 against `ddc_read_edid'
crmfb.c:(.text+0x234c): undefined reference to `edid_parse'
crmfb.c:(.text+0x234c): relocation truncated to fit: R_MIPS_26 against `edid_parse'
crmfb.c:(.text+0x2354): undefined reference to `edid_print'
crmfb.c:(.text+0x2354): relocation truncated to fit: R_MIPS_26 against `edid_print'
diffstat:
sys/arch/evbarm/npwr_fc/npwr_fc_pci.c | 9 +++--
sys/arch/evbarm/nslu2/nslu2_pci.c | 6 +-
sys/arch/evbmips/alchemy/board.h | 4 +-
sys/arch/evbmips/alchemy/dbau1500.c | 8 ++--
sys/arch/evbmips/alchemy/dbau1550.c | 10 +++---
sys/arch/evbmips/alchemy/machdep.c | 6 +-
sys/arch/evbmips/alchemy/mtx-1.c | 8 ++--
sys/arch/evbmips/alchemy/omsal400.c | 8 ++--
sys/arch/evbmips/alchemy/pciide_machdep.c | 8 ++--
sys/arch/evbmips/malta/malta_intr.c | 14 ++++---
sys/arch/evbmips/malta/pci/pciide_machdep.c | 8 ++--
sys/arch/evbppc/include/pmppc_pci_machdep.h | 4 +-
sys/arch/evbppc/obs405/obs200_machdep.c | 6 +-
sys/arch/evbppc/obs405/obs266_machdep.c | 6 +-
sys/arch/evbppc/pmppc/pci/pci_machdep.c | 6 +-
sys/arch/evbppc/walnut/machdep.c | 6 +-
sys/arch/hp700/dev/apic.c | 4 +-
sys/arch/hp700/dev/dino.c | 8 ++--
sys/arch/hp700/dev/elroyvar.h | 4 +-
sys/arch/hp700/include/pci_machdep.h | 2 +-
sys/arch/i386/pci/gcscide.c | 8 ++--
sys/arch/i386/pci/piixpcib.c | 8 ++--
sys/arch/mips/adm5120/dev/admpci.c | 8 ++--
sys/arch/mips/alchemy/dev/aupcivar.h | 4 +-
sys/arch/mips/include/pci_machdep.h | 6 +-
sys/arch/mips/rmi/rmixl_pcie.c | 8 ++--
sys/arch/mips/rmi/rmixl_pcix.c | 8 ++--
sys/arch/netwinder/pci/pciide_machdep.c | 7 ++-
sys/arch/powerpc/booke/pci/pq3pci.c | 9 +++--
sys/arch/powerpc/include/ibm4xx/pci_machdep.h | 5 +-
sys/arch/powerpc/include/pci_machdep.h | 9 +++--
sys/arch/powerpc/pci/pci_machdep_common.c | 6 +-
sys/arch/powerpc/pci/pci_machdep_ofw.c | 6 +-
sys/arch/prep/include/pci_machdep.h | 4 +-
sys/arch/prep/pci/pci_machdep.c | 6 +-
sys/arch/sandpoint/include/pci_machdep.h | 5 +-
sys/arch/sandpoint/pci/pci_machdep.c | 6 +-
sys/arch/sandpoint/pci/pciide_machdep.c | 7 ++-
sys/arch/sparc/include/pci_machdep.h | 5 +-
sys/arch/sparc/sparc/pci_machdep.c | 6 +-
sys/arch/sparc64/dev/pci_machdep.c | 8 ++--
sys/arch/sparc64/dev/psycho.c | 8 ++--
sys/arch/sparc64/dev/pyro.c | 6 +-
sys/arch/sparc64/dev/schizo.c | 7 ++-
sys/arch/sparc64/include/pci_machdep.h | 11 +++---
sys/arch/x86/acpi/acpi_cpu_md.c | 8 ++--
sys/arch/x86/include/pci_machdep_common.h | 5 +-
sys/arch/x86/pci/ichlpcib.c | 6 +-
sys/arch/x86/pci/pci_intr_machdep.c | 6 +-
sys/arch/x86/pci/pciide_machdep.c | 6 +-
sys/arch/xen/include/pci_machdep.h | 8 +++-
sys/arch/xen/xen/pci_intr_machdep.c | 10 ++---
sys/arch/xen/xen/pciide_machdep.c | 6 +-
sys/arch/xen/xen/xpci_xenbus.c | 6 +-
sys/dev/marvell/mvpex.c | 6 +-
sys/dev/marvell/mvpexvar.h | 4 +-
sys/dev/pci/acardide.c | 8 ++--
sys/dev/pci/aceride.c | 12 +++---
sys/dev/pci/agp.c | 20 ++++++------
sys/dev/pci/agp_i810.c | 6 +-
sys/dev/pci/agp_intel.c | 6 +-
sys/dev/pci/artsata.c | 15 ++++----
sys/dev/pci/cmdide.c | 30 +++++++++--------
sys/dev/pci/cs4280.c | 12 +++---
sys/dev/pci/cypide.c | 8 ++--
sys/dev/pci/ehci_pci.c | 8 ++--
sys/dev/pci/geodeide.c | 8 ++--
sys/dev/pci/hptide.c | 8 ++--
sys/dev/pci/iteide.c | 8 ++--
sys/dev/pci/ixpide.c | 8 ++--
sys/dev/pci/jmide.c | 12 +++---
sys/dev/pci/nside.c | 11 +++---
sys/dev/pci/optiide.c | 8 ++--
sys/dev/pci/pci.c | 15 ++++----
sys/dev/pci/pci_map.c | 16 ++++++---
sys/dev/pci/pciide_common.c | 20 ++++++------
sys/dev/pci/pciidevar.h | 23 +++++++------
sys/dev/pci/pcivar.h | 19 +++++------
sys/dev/pci/pdcide.c | 9 +++--
sys/dev/pci/pdcsata.c | 9 +++--
sys/dev/pci/piixide.c | 14 ++++---
sys/dev/pci/rccide.c | 8 ++--
sys/dev/pci/satalink.c | 19 ++++++----
sys/dev/pci/schide.c | 8 ++--
sys/dev/pci/siside.c | 45 +++++++++++++-------------
sys/dev/pci/slide.c | 15 +++++---
sys/dev/pci/stpcide.c | 9 +++--
sys/dev/pci/svwsata.c | 14 ++++---
sys/dev/pci/toshide.c | 9 +++--
sys/dev/pci/viaide.c | 43 +++++++++++++++----------
sys/external/bsd/drm/dist/bsd-core/mga_drv.c | 4 +-
91 files changed, 454 insertions(+), 410 deletions(-)
diffs (truncated from 3415 to 300 lines):
diff -r a2d44b6b43ca -r 0c558b485c4a sys/arch/evbarm/npwr_fc/npwr_fc_pci.c
--- a/sys/arch/evbarm/npwr_fc/npwr_fc_pci.c Mon Apr 04 20:37:48 2011 +0000
+++ b/sys/arch/evbarm/npwr_fc/npwr_fc_pci.c Mon Apr 04 20:37:49 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: npwr_fc_pci.c,v 1.1 2005/12/22 16:17:24 briggs Exp $ */
+/* $NetBSD: npwr_fc_pci.c,v 1.2 2011/04/04 20:37:49 dyoung 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.1 2005/12/22 16:17:24 briggs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npwr_fc_pci.c,v 1.2 2011/04/04 20:37:49 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -58,7 +58,8 @@
#include <dev/pci/pcidevs.h>
#include <dev/pci/ppbreg.h>
-int iq80321_pci_intr_map(struct pci_attach_args *, pci_intr_handle_t *);
+int iq80321_pci_intr_map(const struct pci_attach_args *,
+ pci_intr_handle_t *);
const char *iq80321_pci_intr_string(void *, pci_intr_handle_t);
const struct evcnt *iq80321_pci_intr_evcnt(void *, pci_intr_handle_t);
void *iq80321_pci_intr_establish(void *, pci_intr_handle_t,
@@ -78,7 +79,7 @@
}
int
-iq80321_pci_intr_map(struct pci_attach_args *pa, pci_intr_handle_t *ihp)
+iq80321_pci_intr_map(const struct pci_attach_args *pa, pci_intr_handle_t *ihp)
{
struct i80321_softc *sc = pa->pa_pc->pc_intr_v;
int b, d, f;
diff -r a2d44b6b43ca -r 0c558b485c4a sys/arch/evbarm/nslu2/nslu2_pci.c
--- a/sys/arch/evbarm/nslu2/nslu2_pci.c Mon Apr 04 20:37:48 2011 +0000
+++ b/sys/arch/evbarm/nslu2/nslu2_pci.c Mon Apr 04 20:37:49 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: nslu2_pci.c,v 1.3 2009/10/21 14:15:51 rmind Exp $ */
+/* $NetBSD: nslu2_pci.c,v 1.4 2011/04/04 20:37:49 dyoung Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nslu2_pci.c,v 1.3 2009/10/21 14:15:51 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nslu2_pci.c,v 1.4 2011/04/04 20:37:49 dyoung Exp $");
/*
* Linksys NSLU2 PCI support.
@@ -74,7 +74,7 @@
#include <evbarm/nslu2/nslu2reg.h>
static int
-nslu2_pci_intr_map(struct pci_attach_args *pa, pci_intr_handle_t *ihp)
+nslu2_pci_intr_map(const struct pci_attach_args *pa, pci_intr_handle_t *ihp)
{
KASSERT(pa->pa_bus == 0 && pa->pa_device == 1);
diff -r a2d44b6b43ca -r 0c558b485c4a sys/arch/evbmips/alchemy/board.h
--- a/sys/arch/evbmips/alchemy/board.h Mon Apr 04 20:37:48 2011 +0000
+++ b/sys/arch/evbmips/alchemy/board.h Mon Apr 04 20:37:49 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: board.h,v 1.4 2006/10/02 08:13:53 gdamore Exp $ */
+/* $NetBSD: board.h,v 1.5 2011/04/04 20:37:49 dyoung Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -40,7 +40,7 @@
const char *ab_name;
const struct obiodev *ab_devices;
void (*ab_init)(void);
- int (*ab_pci_intr_map)(struct pci_attach_args *,
+ int (*ab_pci_intr_map)(const struct pci_attach_args *,
pci_intr_handle_t *);
void (*ab_reboot)(void);
diff -r a2d44b6b43ca -r 0c558b485c4a sys/arch/evbmips/alchemy/dbau1500.c
--- a/sys/arch/evbmips/alchemy/dbau1500.c Mon Apr 04 20:37:48 2011 +0000
+++ b/sys/arch/evbmips/alchemy/dbau1500.c Mon Apr 04 20:37:49 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dbau1500.c,v 1.4 2011/02/20 07:48:33 matt Exp $ */
+/* $NetBSD: dbau1500.c,v 1.5 2011/04/04 20:37:49 dyoung Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dbau1500.c,v 1.4 2011/02/20 07:48:33 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbau1500.c,v 1.5 2011/04/04 20:37:49 dyoung Exp $");
#include <sys/param.h>
#include <machine/bus.h>
@@ -47,7 +47,7 @@
(*((volatile uint16_t *)MIPS_PHYS_TO_KSEG1(x)) = (v))
static void dbau1500_init(void);
-static int dbau1500_pci_intr_map(struct pci_attach_args *,
+static int dbau1500_pci_intr_map(const struct pci_attach_args *,
pci_intr_handle_t *);
static void dbau1500_reboot(void);
@@ -102,7 +102,7 @@
}
int
-dbau1500_pci_intr_map(struct pci_attach_args *pa, pci_intr_handle_t *ihp)
+dbau1500_pci_intr_map(const struct pci_attach_args *pa, pci_intr_handle_t *ihp)
{
/*
* This platform has PCI slot and IDE interrupts mapped
diff -r a2d44b6b43ca -r 0c558b485c4a sys/arch/evbmips/alchemy/dbau1550.c
--- a/sys/arch/evbmips/alchemy/dbau1550.c Mon Apr 04 20:37:48 2011 +0000
+++ b/sys/arch/evbmips/alchemy/dbau1550.c Mon Apr 04 20:37:49 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dbau1550.c,v 1.9 2011/02/20 07:48:33 matt Exp $ */
+/* $NetBSD: dbau1550.c,v 1.10 2011/04/04 20:37:49 dyoung Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dbau1550.c,v 1.9 2011/02/20 07:48:33 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbau1550.c,v 1.10 2011/04/04 20:37:49 dyoung Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -64,7 +64,7 @@
(*((volatile uint32_t *)MIPS_PHYS_TO_KSEG1(x)) = (v))
static void dbau1550_init(void);
-static int dbau1550_pci_intr_map(struct pci_attach_args *,
+static int dbau1550_pci_intr_map(const struct pci_attach_args *,
pci_intr_handle_t *);
static void dbau1550_poweroff(void);
static void dbau1550_reboot(void);
@@ -94,7 +94,7 @@
.ab_name = "AMD Alchemy DBAu1550",
.ab_devices = dbau1550_devices,
.ab_init = dbau1550_init,
- .ab_pci_intr_map =dbau1550_pci_intr_map,
+ .ab_pci_intr_map = dbau1550_pci_intr_map,
.ab_reboot = dbau1550_reboot,
.ab_poweroff = dbau1550_poweroff,
.ab_pcmcia = &dbau1550_pcmcia,
@@ -166,7 +166,7 @@
}
int
-dbau1550_pci_intr_map(struct pci_attach_args *pa, pci_intr_handle_t *ihp)
+dbau1550_pci_intr_map(const struct pci_attach_args *pa, pci_intr_handle_t *ihp)
{
/*
* This platform has one onboard PCI IDE controller, and two
diff -r a2d44b6b43ca -r 0c558b485c4a sys/arch/evbmips/alchemy/machdep.c
--- a/sys/arch/evbmips/alchemy/machdep.c Mon Apr 04 20:37:48 2011 +0000
+++ b/sys/arch/evbmips/alchemy/machdep.c Mon Apr 04 20:37:49 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.49 2011/02/20 07:48:33 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.50 2011/04/04 20:37:49 dyoung Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.49 2011/02/20 07:48:33 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.50 2011/04/04 20:37:49 dyoung Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -480,7 +480,7 @@
* Export our interrupt map function so aupci can find it.
*/
int
-aupci_intr_map(struct pci_attach_args *pa, pci_intr_handle_t *ihp)
+aupci_intr_map(const struct pci_attach_args *pa, pci_intr_handle_t *ihp)
{
const struct alchemy_board *board;
diff -r a2d44b6b43ca -r 0c558b485c4a sys/arch/evbmips/alchemy/mtx-1.c
--- a/sys/arch/evbmips/alchemy/mtx-1.c Mon Apr 04 20:37:48 2011 +0000
+++ b/sys/arch/evbmips/alchemy/mtx-1.c Mon Apr 04 20:37:49 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mtx-1.c,v 1.4 2011/02/20 07:48:33 matt Exp $ */
+/* $NetBSD: mtx-1.c,v 1.5 2011/04/04 20:37:49 dyoung Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mtx-1.c,v 1.4 2011/02/20 07:48:33 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mtx-1.c,v 1.5 2011/04/04 20:37:49 dyoung Exp $");
#include <sys/param.h>
#include <machine/bus.h>
@@ -48,7 +48,7 @@
(*((volatile uint16_t *)MIPS_PHYS_TO_KSEG1(x)) = (v))
static void mtx1_init(void);
-static int mtx1_pci_intr_map(struct pci_attach_args *,
+static int mtx1_pci_intr_map(const struct pci_attach_args *,
pci_intr_handle_t *);
static void mtx1_reboot(void);
@@ -93,7 +93,7 @@
}
int
-mtx1_pci_intr_map(struct pci_attach_args *pa, pci_intr_handle_t *ihp)
+mtx1_pci_intr_map(const struct pci_attach_args *pa, pci_intr_handle_t *ihp)
{
/*
* The board has up to 4 adapters, each with two minipci slots,
diff -r a2d44b6b43ca -r 0c558b485c4a sys/arch/evbmips/alchemy/omsal400.c
--- a/sys/arch/evbmips/alchemy/omsal400.c Mon Apr 04 20:37:48 2011 +0000
+++ b/sys/arch/evbmips/alchemy/omsal400.c Mon Apr 04 20:37:49 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: omsal400.c,v 1.6 2011/02/20 07:48:33 matt Exp $ */
+/* $NetBSD: omsal400.c,v 1.7 2011/04/04 20:37:49 dyoung Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -36,7 +36,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omsal400.c,v 1.6 2011/02/20 07:48:33 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omsal400.c,v 1.7 2011/04/04 20:37:49 dyoung Exp $");
#include <sys/param.h>
#include <machine/bus.h>
@@ -53,7 +53,7 @@
(*((volatile uint16_t *)MIPS_PHYS_TO_KSEG1(x)) = (v))
static void omsal400_init(void);
-static int omsal400_pci_intr_map(struct pci_attach_args *,
+static int omsal400_pci_intr_map(const struct pci_attach_args *,
pci_intr_handle_t *);
static void omsal400_poweroff(void);
static void omsal400_reboot(void);
@@ -124,7 +124,7 @@
}
int
-omsal400_pci_intr_map(struct pci_attach_args *pa, pci_intr_handle_t *ihp)
+omsal400_pci_intr_map(const struct pci_attach_args *pa, pci_intr_handle_t *ihp)
{
/*
* This platform has 4 PCI devices:
diff -r a2d44b6b43ca -r 0c558b485c4a sys/arch/evbmips/alchemy/pciide_machdep.c
--- a/sys/arch/evbmips/alchemy/pciide_machdep.c Mon Apr 04 20:37:48 2011 +0000
+++ b/sys/arch/evbmips/alchemy/pciide_machdep.c Mon Apr 04 20:37:49 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_machdep.c,v 1.1 2006/02/09 00:26:39 gdamore Exp $ */
+/* $NetBSD: pciide_machdep.c,v 1.2 2011/04/04 20:37:49 dyoung Exp $ */
/*
* Copyright (c) 1998 Christopher G. Demetriou. All rights reserved.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pciide_machdep.c,v 1.1 2006/02/09 00:26:39 gdamore Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciide_machdep.c,v 1.2 2011/04/04 20:37:49 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -53,8 +53,8 @@
#include <dev/pci/pciidevar.h>
void *
-pciide_machdep_compat_intr_establish(struct device *dev,
- struct pci_attach_args *pa, int chan, int (*func)(void *), void *arg)
+pciide_machdep_compat_intr_establish(device_t dev,
+ const struct pci_attach_args *pa, int chan, int (*func)(void *), void *arg)
{
pci_chipset_tag_t pc = pa->pa_pc;
diff -r a2d44b6b43ca -r 0c558b485c4a sys/arch/evbmips/malta/malta_intr.c
--- a/sys/arch/evbmips/malta/malta_intr.c Mon Apr 04 20:37:48 2011 +0000
+++ b/sys/arch/evbmips/malta/malta_intr.c Mon Apr 04 20:37:49 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: malta_intr.c,v 1.20 2011/02/20 07:48:34 matt Exp $ */
+/* $NetBSD: malta_intr.c,v 1.21 2011/04/04 20:37:49 dyoung Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
Home |
Main Index |
Thread Index |
Old Index