Module Name: src Committed By: cegger Date: Tue May 12 12:11:17 UTC 2009
Modified Files: src/sys/dev/cardbus: adv_cardbus.c cardbus.c cardslot.c ehci_cardbus.c fwohci_cardbus.c if_ath_cardbus.c if_fxp_cardbus.c if_ral_cardbus.c if_rtw_cardbus.c ohci_cardbus.c rbus_ppb.c uhci_cardbus.c Log Message: struct cfdata * -> cfdata_t, no functional changes intended. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/dev/cardbus/adv_cardbus.c cvs rdiff -u -r1.96 -r1.97 src/sys/dev/cardbus/cardbus.c cvs rdiff -u -r1.47 -r1.48 src/sys/dev/cardbus/cardslot.c cvs rdiff -u -r1.22 -r1.23 src/sys/dev/cardbus/ehci_cardbus.c cvs rdiff -u -r1.26 -r1.27 src/sys/dev/cardbus/fwohci_cardbus.c cvs rdiff -u -r1.32 -r1.33 src/sys/dev/cardbus/if_ath_cardbus.c cvs rdiff -u -r1.37 -r1.38 src/sys/dev/cardbus/if_fxp_cardbus.c cvs rdiff -u -r1.14 -r1.15 src/sys/dev/cardbus/if_ral_cardbus.c cvs rdiff -u -r1.28 -r1.29 src/sys/dev/cardbus/if_rtw_cardbus.c cvs rdiff -u -r1.31 -r1.32 src/sys/dev/cardbus/ohci_cardbus.c cvs rdiff -u -r1.29 -r1.30 src/sys/dev/cardbus/rbus_ppb.c cvs rdiff -u -r1.12 -r1.13 src/sys/dev/cardbus/uhci_cardbus.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/dev/cardbus/adv_cardbus.c diff -u src/sys/dev/cardbus/adv_cardbus.c:1.20 src/sys/dev/cardbus/adv_cardbus.c:1.21 --- src/sys/dev/cardbus/adv_cardbus.c:1.20 Sat Mar 14 15:36:16 2009 +++ src/sys/dev/cardbus/adv_cardbus.c Tue May 12 12:11:17 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: adv_cardbus.c,v 1.20 2009/03/14 15:36:16 dsl Exp $ */ +/* $NetBSD: adv_cardbus.c,v 1.21 2009/05/12 12:11:17 cegger Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: adv_cardbus.c,v 1.20 2009/03/14 15:36:16 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: adv_cardbus.c,v 1.21 2009/05/12 12:11:17 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -82,7 +82,7 @@ bus_size_t sc_size; }; -int adv_cardbus_match(struct device *, struct cfdata *, void *); +int adv_cardbus_match(struct device *, cfdata_t, void *); void adv_cardbus_attach(struct device *, struct device *, void *); int adv_cardbus_detach(struct device *, int); @@ -90,7 +90,7 @@ adv_cardbus_match, adv_cardbus_attach, adv_cardbus_detach, NULL); int -adv_cardbus_match(struct device *parent, struct cfdata *match, +adv_cardbus_match(struct device *parent, cfdata_t match, void *aux) { struct cardbus_attach_args *ca = aux; Index: src/sys/dev/cardbus/cardbus.c diff -u src/sys/dev/cardbus/cardbus.c:1.96 src/sys/dev/cardbus/cardbus.c:1.97 --- src/sys/dev/cardbus/cardbus.c:1.96 Thu Apr 2 00:09:33 2009 +++ src/sys/dev/cardbus/cardbus.c Tue May 12 12:11:17 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: cardbus.c,v 1.96 2009/04/02 00:09:33 dyoung Exp $ */ +/* $NetBSD: cardbus.c,v 1.97 2009/05/12 12:11:17 cegger Exp $ */ /* * Copyright (c) 1997, 1998, 1999 and 2000 @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cardbus.c,v 1.96 2009/04/02 00:09:33 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cardbus.c,v 1.97 2009/05/12 12:11:17 cegger Exp $"); #include "opt_cardbus.h" @@ -71,7 +71,7 @@ STATIC void cardbusattach(device_t, device_t, void *); STATIC int cardbusdetach(device_t, int); -STATIC int cardbusmatch(device_t, struct cfdata *, void *); +STATIC int cardbusmatch(device_t, cfdata_t, void *); int cardbus_rescan(device_t, const char *, const int *); void cardbus_childdetached(device_t, device_t); static int cardbusprint(void *, const char *); @@ -103,7 +103,7 @@ STATIC int -cardbusmatch(device_t parent, struct cfdata *cf, void *aux) +cardbusmatch(device_t parent, cfdata_t cf, void *aux) { return (1); Index: src/sys/dev/cardbus/cardslot.c diff -u src/sys/dev/cardbus/cardslot.c:1.47 src/sys/dev/cardbus/cardslot.c:1.48 --- src/sys/dev/cardbus/cardslot.c:1.47 Thu Apr 2 00:09:33 2009 +++ src/sys/dev/cardbus/cardslot.c Tue May 12 12:11:17 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: cardslot.c,v 1.47 2009/04/02 00:09:33 dyoung Exp $ */ +/* $NetBSD: cardslot.c,v 1.48 2009/05/12 12:11:17 cegger Exp $ */ /* * Copyright (c) 1999 and 2000 @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cardslot.c,v 1.47 2009/04/02 00:09:33 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cardslot.c,v 1.48 2009/05/12 12:11:17 cegger Exp $"); #include "opt_cardslot.h" @@ -67,12 +67,12 @@ STATIC void cardslotattach(struct device *, struct device *, void *); STATIC int cardslotdetach(device_t, int); -STATIC int cardslotmatch(struct device *, struct cfdata *, void *); +STATIC int cardslotmatch(struct device *, cfdata_t, void *); static void cardslot_event_thread(void *arg); STATIC int cardslot_cb_print(void *aux, const char *pcic); static int cardslot_16_print(void *, const char *); -static int cardslot_16_submatch(struct device *, struct cfdata *, +static int cardslot_16_submatch(struct device *, cfdata_t, const int *, void *); CFATTACH_DECL3_NEW(cardslot, sizeof(struct cardslot_softc), @@ -80,7 +80,7 @@ DVF_DETACH_SHUTDOWN); STATIC int -cardslotmatch(struct device *parent, struct cfdata *cf, +cardslotmatch(struct device *parent, cfdata_t cf, void *aux) { struct cardslot_attach_args *caa = aux; @@ -204,7 +204,7 @@ static int -cardslot_16_submatch(struct device *parent, struct cfdata *cf, +cardslot_16_submatch(struct device *parent, cfdata_t cf, const int *ldesc, void *aux) { Index: src/sys/dev/cardbus/ehci_cardbus.c diff -u src/sys/dev/cardbus/ehci_cardbus.c:1.22 src/sys/dev/cardbus/ehci_cardbus.c:1.23 --- src/sys/dev/cardbus/ehci_cardbus.c:1.22 Tue Jun 24 19:44:52 2008 +++ src/sys/dev/cardbus/ehci_cardbus.c Tue May 12 12:11:17 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: ehci_cardbus.c,v 1.22 2008/06/24 19:44:52 drochner Exp $ */ +/* $NetBSD: ehci_cardbus.c,v 1.23 2009/05/12 12:11:17 cegger Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ehci_cardbus.c,v 1.22 2008/06/24 19:44:52 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ehci_cardbus.c,v 1.23 2009/05/12 12:11:17 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -65,7 +65,7 @@ #define DPRINTF(x) #endif -int ehci_cardbus_match(device_t, struct cfdata *, void *); +int ehci_cardbus_match(device_t, cfdata_t, void *); void ehci_cardbus_attach(device_t, device_t, void *); int ehci_cardbus_detach(device_t, int); @@ -89,7 +89,7 @@ TAILQ_HEAD_INITIALIZER(ehci_cardbus_alldevs); int -ehci_cardbus_match(device_t parent, struct cfdata *match, void *aux) +ehci_cardbus_match(device_t parent, cfdata_t match, void *aux) { struct cardbus_attach_args *ca = (struct cardbus_attach_args *)aux; Index: src/sys/dev/cardbus/fwohci_cardbus.c diff -u src/sys/dev/cardbus/fwohci_cardbus.c:1.26 src/sys/dev/cardbus/fwohci_cardbus.c:1.27 --- src/sys/dev/cardbus/fwohci_cardbus.c:1.26 Fri Jul 11 17:50:45 2008 +++ src/sys/dev/cardbus/fwohci_cardbus.c Tue May 12 12:11:17 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: fwohci_cardbus.c,v 1.26 2008/07/11 17:50:45 kiyohara Exp $ */ +/* $NetBSD: fwohci_cardbus.c,v 1.27 2009/05/12 12:11:17 cegger Exp $ */ /*- * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fwohci_cardbus.c,v 1.26 2008/07/11 17:50:45 kiyohara Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fwohci_cardbus.c,v 1.27 2009/05/12 12:11:17 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -62,7 +62,7 @@ void *sc_ih; }; -static int fwohci_cardbus_match(device_t, struct cfdata *, void *); +static int fwohci_cardbus_match(device_t, cfdata_t, void *); static void fwohci_cardbus_attach(device_t, device_t, void *); static int fwohci_cardbus_detach(device_t, int); @@ -75,7 +75,7 @@ #define cardbus_devinfo pci_devinfo static int -fwohci_cardbus_match(device_t parent, struct cfdata *match, void *aux) +fwohci_cardbus_match(device_t parent, cfdata_t match, void *aux) { struct cardbus_attach_args *ca = (struct cardbus_attach_args *)aux; Index: src/sys/dev/cardbus/if_ath_cardbus.c diff -u src/sys/dev/cardbus/if_ath_cardbus.c:1.32 src/sys/dev/cardbus/if_ath_cardbus.c:1.33 --- src/sys/dev/cardbus/if_ath_cardbus.c:1.32 Thu Dec 11 05:45:29 2008 +++ src/sys/dev/cardbus/if_ath_cardbus.c Tue May 12 12:11:17 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: if_ath_cardbus.c,v 1.32 2008/12/11 05:45:29 alc Exp $ */ +/* $NetBSD: if_ath_cardbus.c,v 1.33 2009/05/12 12:11:17 cegger Exp $ */ /* * Copyright (c) 2003 * Ichiro FUKUHARA <ich...@ichiro.org>. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ath_cardbus.c,v 1.32 2008/12/11 05:45:29 alc Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ath_cardbus.c,v 1.33 2009/05/12 12:11:17 cegger Exp $"); #include "opt_inet.h" #include "bpfilter.h" @@ -152,7 +152,7 @@ } int -ath_cardbus_match(device_t parent, struct cfdata *match, void *aux) +ath_cardbus_match(device_t parent, cfdata_t match, void *aux) { struct cardbus_attach_args *ca = aux; const char *devname; Index: src/sys/dev/cardbus/if_fxp_cardbus.c diff -u src/sys/dev/cardbus/if_fxp_cardbus.c:1.37 src/sys/dev/cardbus/if_fxp_cardbus.c:1.38 --- src/sys/dev/cardbus/if_fxp_cardbus.c:1.37 Sat Mar 7 15:03:25 2009 +++ src/sys/dev/cardbus/if_fxp_cardbus.c Tue May 12 12:11:17 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: if_fxp_cardbus.c,v 1.37 2009/03/07 15:03:25 tsutsui Exp $ */ +/* $NetBSD: if_fxp_cardbus.c,v 1.38 2009/05/12 12:11:17 cegger Exp $ */ /* * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_fxp_cardbus.c,v 1.37 2009/03/07 15:03:25 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_fxp_cardbus.c,v 1.38 2009/05/12 12:11:17 cegger Exp $"); #include "opt_inet.h" #include "bpfilter.h" @@ -111,7 +111,7 @@ #endif static int -fxp_cardbus_match(struct device *parent, struct cfdata *match, +fxp_cardbus_match(struct device *parent, cfdata_t match, void *aux) { struct cardbus_attach_args *ca = aux; Index: src/sys/dev/cardbus/if_ral_cardbus.c diff -u src/sys/dev/cardbus/if_ral_cardbus.c:1.14 src/sys/dev/cardbus/if_ral_cardbus.c:1.15 --- src/sys/dev/cardbus/if_ral_cardbus.c:1.14 Sun Oct 12 02:15:02 2008 +++ src/sys/dev/cardbus/if_ral_cardbus.c Tue May 12 12:11:17 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: if_ral_cardbus.c,v 1.14 2008/10/12 02:15:02 dholland Exp $ */ +/* $NetBSD: if_ral_cardbus.c,v 1.15 2009/05/12 12:11:17 cegger Exp $ */ /* $OpenBSD: if_ral_cardbus.c,v 1.6 2006/01/09 20:03:31 damien Exp $ */ /*- @@ -22,7 +22,7 @@ * CardBus front-end for the Ralink RT2560/RT2561/RT2561S/RT2661 driver. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ral_cardbus.c,v 1.14 2008/10/12 02:15:02 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ral_cardbus.c,v 1.15 2009/05/12 12:11:17 cegger Exp $"); #include "bpfilter.h" @@ -93,7 +93,7 @@ cardbus_intr_line_t sc_intrline; }; -int ral_cardbus_match(struct device *, struct cfdata *, void *); +int ral_cardbus_match(struct device *, cfdata_t, void *); void ral_cardbus_attach(struct device *, struct device *, void *); int ral_cardbus_detach(struct device *, int); @@ -107,7 +107,7 @@ int ral_cardbus_match(struct device *parent, - struct cfdata *cfdata, void *aux) + cfdata_t cfdata, void *aux) { struct cardbus_attach_args *ca = aux; Index: src/sys/dev/cardbus/if_rtw_cardbus.c diff -u src/sys/dev/cardbus/if_rtw_cardbus.c:1.28 src/sys/dev/cardbus/if_rtw_cardbus.c:1.29 --- src/sys/dev/cardbus/if_rtw_cardbus.c:1.28 Fri Feb 6 01:55:19 2009 +++ src/sys/dev/cardbus/if_rtw_cardbus.c Tue May 12 12:11:17 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: if_rtw_cardbus.c,v 1.28 2009/02/06 01:55:19 dyoung Exp $ */ +/* $NetBSD: if_rtw_cardbus.c,v 1.29 2009/05/12 12:11:17 cegger Exp $ */ /*- * Copyright (c) 2004, 2005 David Young. All rights reserved. @@ -67,7 +67,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_rtw_cardbus.c,v 1.28 2009/02/06 01:55:19 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_rtw_cardbus.c,v 1.29 2009/05/12 12:11:17 cegger Exp $"); #include "opt_inet.h" #include "bpfilter.h" @@ -140,7 +140,7 @@ cardbus_intr_line_t sc_intrline; /* interrupt line */ }; -int rtw_cardbus_match(device_t, struct cfdata *, void *); +int rtw_cardbus_match(device_t, cfdata_t, void *); void rtw_cardbus_attach(device_t, device_t, void *); int rtw_cardbus_detach(device_t, int); @@ -186,7 +186,7 @@ } int -rtw_cardbus_match(device_t parent, struct cfdata *match, void *aux) +rtw_cardbus_match(device_t parent, cfdata_t match, void *aux) { struct cardbus_attach_args *ca = aux; Index: src/sys/dev/cardbus/ohci_cardbus.c diff -u src/sys/dev/cardbus/ohci_cardbus.c:1.31 src/sys/dev/cardbus/ohci_cardbus.c:1.32 --- src/sys/dev/cardbus/ohci_cardbus.c:1.31 Fri Jul 11 20:57:51 2008 +++ src/sys/dev/cardbus/ohci_cardbus.c Tue May 12 12:11:17 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: ohci_cardbus.c,v 1.31 2008/07/11 20:57:51 dyoung Exp $ */ +/* $NetBSD: ohci_cardbus.c,v 1.32 2009/05/12 12:11:17 cegger Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ohci_cardbus.c,v 1.31 2008/07/11 20:57:51 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ohci_cardbus.c,v 1.32 2009/05/12 12:11:17 cegger Exp $"); #include "ehci_cardbus.h" @@ -67,7 +67,7 @@ #include <dev/usb/ohcireg.h> #include <dev/usb/ohcivar.h> -int ohci_cardbus_match(device_t, struct cfdata *, void *); +int ohci_cardbus_match(device_t, cfdata_t, void *); void ohci_cardbus_attach(device_t, device_t, void *); int ohci_cardbus_detach(device_t, int); @@ -91,7 +91,7 @@ #define cardbus_devinfo pci_devinfo int -ohci_cardbus_match(device_t parent, struct cfdata *match, void *aux) +ohci_cardbus_match(device_t parent, cfdata_t match, void *aux) { struct cardbus_attach_args *ca = (struct cardbus_attach_args *)aux; Index: src/sys/dev/cardbus/rbus_ppb.c diff -u src/sys/dev/cardbus/rbus_ppb.c:1.29 src/sys/dev/cardbus/rbus_ppb.c:1.30 --- src/sys/dev/cardbus/rbus_ppb.c:1.29 Wed Mar 18 16:00:17 2009 +++ src/sys/dev/cardbus/rbus_ppb.c Tue May 12 12:11:17 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: rbus_ppb.c,v 1.29 2009/03/18 16:00:17 cegger Exp $ */ +/* $NetBSD: rbus_ppb.c,v 1.30 2009/05/12 12:11:17 cegger Exp $ */ /* * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rbus_ppb.c,v 1.29 2009/03/18 16:00:17 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rbus_ppb.c,v 1.30 2009/05/12 12:11:17 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -75,7 +75,7 @@ struct ppb_softc; -static int ppb_cardbus_match(struct device *, struct cfdata *, void *); +static int ppb_cardbus_match(struct device *, cfdata_t, void *); static void ppb_cardbus_attach(struct device *, struct device *, void *); static int ppb_cardbus_detach(struct device * self, int flags); /*static*/ void ppb_cardbus_setup(struct ppb_softc * sc); @@ -116,7 +116,7 @@ #endif static int -ppb_cardbus_match(struct device *parent, struct cfdata *match, void *aux) +ppb_cardbus_match(struct device *parent, cfdata_t match, void *aux) { struct cardbus_attach_args *ca = aux; Index: src/sys/dev/cardbus/uhci_cardbus.c diff -u src/sys/dev/cardbus/uhci_cardbus.c:1.12 src/sys/dev/cardbus/uhci_cardbus.c:1.13 --- src/sys/dev/cardbus/uhci_cardbus.c:1.12 Fri Jul 11 21:02:53 2008 +++ src/sys/dev/cardbus/uhci_cardbus.c Tue May 12 12:11:17 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: uhci_cardbus.c,v 1.12 2008/07/11 21:02:53 dyoung Exp $ */ +/* $NetBSD: uhci_cardbus.c,v 1.13 2009/05/12 12:11:17 cegger Exp $ */ /* * Copyright (c) 1998-2005 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uhci_cardbus.c,v 1.12 2008/07/11 21:02:53 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uhci_cardbus.c,v 1.13 2009/05/12 12:11:17 cegger Exp $"); #include "ehci_cardbus.h" @@ -67,7 +67,7 @@ void *sc_ih; /* interrupt vectoring */ }; -static int uhci_cardbus_match(device_t, struct cfdata *, void *); +static int uhci_cardbus_match(device_t, cfdata_t, void *); static void uhci_cardbus_attach(device_t, device_t, void *); static int uhci_cardbus_detach(device_t, int); @@ -80,7 +80,7 @@ #define cardbus_devinfo pci_devinfo static int -uhci_cardbus_match(device_t parent, struct cfdata *match, void *aux) +uhci_cardbus_match(device_t parent, cfdata_t match, void *aux) { struct cardbus_attach_args *ca = (struct cardbus_attach_args *)aux;