Module Name: src
Committed By: dyoung
Date: Wed Feb 24 19:52:52 UTC 2010
Modified Files:
src/sys/dev/cardbus: adv_cardbus.c ahc_cardbus.c cardbus_exrom.c
cardbus_map.c com_cardbus.c ehci_cardbus.c fwohci_cardbus.c
if_ath_cardbus.c if_ex_cardbus.c if_ral_cardbus.c if_re_cardbus.c
if_rtk_cardbus.c if_tlp_cardbus.c njata_cardbus.c njs_cardbus.c
ohci_cardbus.c rbus_ppb.c siisata_cardbus.c uhci_cardbus.c
Log Message:
Start to tuck Cardbus under the PCI abstraction. Step #1, textual
substitution: for all practical purposes, pcitag_t and cardbustag_t
are interchangeable, so just use pcitag_t. Ditto pcireg_t and
cardbusreg_t.
While I'm here, don't make a copy (sc_intrline) of
cardbus_attach_args.ca_intrline unless we use it, later.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/cardbus/adv_cardbus.c
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/cardbus/ahc_cardbus.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/cardbus/cardbus_exrom.c \
src/sys/dev/cardbus/njs_cardbus.c
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/cardbus/cardbus_map.c \
src/sys/dev/cardbus/rbus_ppb.c
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/cardbus/com_cardbus.c
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/cardbus/ehci_cardbus.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/cardbus/fwohci_cardbus.c
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/cardbus/if_ath_cardbus.c
cvs rdiff -u -r1.46 -r1.47 src/sys/dev/cardbus/if_ex_cardbus.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/cardbus/if_ral_cardbus.c
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/cardbus/if_re_cardbus.c
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/cardbus/if_rtk_cardbus.c
cvs rdiff -u -r1.62 -r1.63 src/sys/dev/cardbus/if_tlp_cardbus.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/cardbus/njata_cardbus.c
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/cardbus/ohci_cardbus.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/cardbus/siisata_cardbus.c
cvs rdiff -u -r1.13 -r1.14 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.22 src/sys/dev/cardbus/adv_cardbus.c:1.23
--- src/sys/dev/cardbus/adv_cardbus.c:1.22 Tue May 12 14:17:31 2009
+++ src/sys/dev/cardbus/adv_cardbus.c Wed Feb 24 19:52:51 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: adv_cardbus.c,v 1.22 2009/05/12 14:17:31 cegger Exp $ */
+/* $NetBSD: adv_cardbus.c,v 1.23 2010/02/24 19:52:51 dyoung 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.22 2009/05/12 14:17:31 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adv_cardbus.c,v 1.23 2010/02/24 19:52:51 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -74,8 +74,7 @@
/* CardBus-specific goo. */
cardbus_devfunc_t sc_ct; /* our CardBus devfuncs */
- cardbus_intr_line_t sc_intrline; /* our interrupt line */
- cardbustag_t sc_tag;
+ pcitag_t sc_tag;
int sc_cbenable; /* what CardBus access type to enable */
int sc_csr; /* CSR bits */
@@ -151,7 +150,6 @@
csc->sc_ct = ct;
csc->sc_tag = ca->ca_tag;
- csc->sc_intrline = ca->ca_intrline;
csc->sc_cbenable = 0;
/*
Index: src/sys/dev/cardbus/ahc_cardbus.c
diff -u src/sys/dev/cardbus/ahc_cardbus.c:1.29 src/sys/dev/cardbus/ahc_cardbus.c:1.30
--- src/sys/dev/cardbus/ahc_cardbus.c:1.29 Thu Nov 12 19:21:03 2009
+++ src/sys/dev/cardbus/ahc_cardbus.c Wed Feb 24 19:52:51 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ahc_cardbus.c,v 1.29 2009/11/12 19:21:03 dyoung Exp $ */
+/* $NetBSD: ahc_cardbus.c,v 1.30 2010/02/24 19:52:51 dyoung Exp $ */
/*-
* Copyright (c) 2000, 2005 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahc_cardbus.c,v 1.29 2009/11/12 19:21:03 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahc_cardbus.c,v 1.30 2010/02/24 19:52:51 dyoung Exp $");
#include "opt_ahc_cardbus.h"
@@ -77,8 +77,7 @@
/* CardBus-specific goo. */
cardbus_devfunc_t sc_ct; /* our CardBus devfuncs */
- cardbus_intr_line_t sc_intrline; /* our interrupt line */
- cardbustag_t sc_tag;
+ pcitag_t sc_tag;
int sc_cbenable; /* what CardBus access type to enable */
int sc_csr; /* CSR bits */
@@ -123,7 +122,6 @@
ahc->sc_dev = self;
csc->sc_ct = ct;
csc->sc_tag = ca->ca_tag;
- csc->sc_intrline = ca->ca_intrline;
printf(": Adaptec ADP-1480 SCSI\n");
Index: src/sys/dev/cardbus/cardbus_exrom.c
diff -u src/sys/dev/cardbus/cardbus_exrom.c:1.11 src/sys/dev/cardbus/cardbus_exrom.c:1.12
--- src/sys/dev/cardbus/cardbus_exrom.c:1.11 Tue Apr 29 06:53:02 2008
+++ src/sys/dev/cardbus/cardbus_exrom.c Wed Feb 24 19:52:51 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cardbus_exrom.c,v 1.11 2008/04/29 06:53:02 martin Exp $ */
+/* $NetBSD: cardbus_exrom.c,v 1.12 2010/02/24 19:52:51 dyoung Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cardbus_exrom.c,v 1.11 2008/04/29 06:53:02 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cardbus_exrom.c,v 1.12 2010/02/24 19:52:51 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -147,10 +147,10 @@
#if 0
struct cardbus_exrom_data_structure {
char signature[4];
- cardbusreg_t id; /* vendor & device id */
+ pcireg_t id; /* vendor & device id */
u_int16_t structure_length;
u_int8_t structure_revision;
- cardbusreg_t class; /* class code in upper 24 bits */
+ pcireg_t class; /* class code in upper 24 bits */
u_int16_t image_length;
u_int16_t data_revision;
u_int8_t code_type;
Index: src/sys/dev/cardbus/njs_cardbus.c
diff -u src/sys/dev/cardbus/njs_cardbus.c:1.11 src/sys/dev/cardbus/njs_cardbus.c:1.12
--- src/sys/dev/cardbus/njs_cardbus.c:1.11 Tue May 12 14:17:31 2009
+++ src/sys/dev/cardbus/njs_cardbus.c Wed Feb 24 19:52:52 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: njs_cardbus.c,v 1.11 2009/05/12 14:17:31 cegger Exp $ */
+/* $NetBSD: njs_cardbus.c,v 1.12 2010/02/24 19:52:52 dyoung Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: njs_cardbus.c,v 1.11 2009/05/12 14:17:31 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: njs_cardbus.c,v 1.12 2010/02/24 19:52:52 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -58,8 +58,7 @@
/* CardBus-specific goo */
cardbus_devfunc_t sc_ct; /* our CardBus devfuncs */
- cardbus_intr_line_t sc_intrline; /* our interrupt line */
- cardbustag_t sc_tag;
+ pcitag_t sc_tag;
bus_space_handle_t sc_regmaph;
bus_size_t sc_regmap_size;
@@ -141,7 +140,6 @@
csc->sc_ct = ct;
csc->sc_tag = ca->ca_tag;
- csc->sc_intrline = ca->ca_intrline;
/*
* Map the device.
Index: src/sys/dev/cardbus/cardbus_map.c
diff -u src/sys/dev/cardbus/cardbus_map.c:1.31 src/sys/dev/cardbus/cardbus_map.c:1.32
--- src/sys/dev/cardbus/cardbus_map.c:1.31 Tue Dec 15 22:17:12 2009
+++ src/sys/dev/cardbus/cardbus_map.c Wed Feb 24 19:52:51 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cardbus_map.c,v 1.31 2009/12/15 22:17:12 snj Exp $ */
+/* $NetBSD: cardbus_map.c,v 1.32 2010/02/24 19:52:51 dyoung Exp $ */
/*
* Copyright (c) 1999 and 2000
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cardbus_map.c,v 1.31 2009/12/15 22:17:12 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cardbus_map.c,v 1.32 2010/02/24 19:52:51 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -53,16 +53,16 @@
static int cardbus_io_find(cardbus_chipset_tag_t, cardbus_function_tag_t,
- cardbustag_t, int, cardbusreg_t,
+ pcitag_t, int, pcireg_t,
bus_addr_t *, bus_size_t *, int *);
static int cardbus_mem_find(cardbus_chipset_tag_t, cardbus_function_tag_t,
- cardbustag_t, int, cardbusreg_t,
+ pcitag_t, int, pcireg_t,
bus_addr_t *, bus_size_t *, int *);
/*
* static int cardbus_io_find(cardbus_chipset_tag_t cc,
- * cardbus_function_tag_t cf, cardbustag_t tag,
- * int reg, cardbusreg_t type, bus_addr_t *basep,
+ * cardbus_function_tag_t cf, pcitag_t tag,
+ * int reg, pcireg_t type, bus_addr_t *basep,
* bus_size_t *sizep, int *flagsp)
* This code is stolen from sys/dev/pci_map.c.
*/
@@ -70,14 +70,14 @@
cardbus_io_find(
cardbus_chipset_tag_t cc,
cardbus_function_tag_t cf,
- cardbustag_t tag,
+ pcitag_t tag,
int reg,
- cardbusreg_t type,
+ pcireg_t type,
bus_addr_t *basep,
bus_size_t *sizep,
int *flagsp)
{
- cardbusreg_t address, mask;
+ pcireg_t address, mask;
int s;
/* EXT ROM is able to map on memory space ONLY. */
@@ -133,15 +133,15 @@
/*
* static int cardbus_mem_find(cardbus_chipset_tag_t cc,
- * cardbus_function_tag_t cf, cardbustag_t tag,
- * int reg, cardbusreg_t type, bus_addr_t *basep,
+ * cardbus_function_tag_t cf, pcitag_t tag,
+ * int reg, pcireg_t type, bus_addr_t *basep,
* bus_size_t *sizep, int *flagsp)
* This code is stolen from sys/dev/pci_map.c.
*/
static int
-cardbus_mem_find(cardbus_chipset_tag_t cc, cardbus_function_tag_t cf, cardbustag_t tag, int reg, cardbusreg_t type, bus_addr_t *basep, bus_size_t *sizep, int *flagsp)
+cardbus_mem_find(cardbus_chipset_tag_t cc, cardbus_function_tag_t cf, pcitag_t tag, int reg, pcireg_t type, bus_addr_t *basep, bus_size_t *sizep, int *flagsp)
{
- cardbusreg_t address, mask;
+ pcireg_t address, mask;
int s;
if (reg != CARDBUS_ROM_REG &&
@@ -216,7 +216,7 @@
/*
- * int cardbus_mapreg_map(struct cardbus_softc *, int, int, cardbusreg_t,
+ * int cardbus_mapreg_map(struct cardbus_softc *, int, int, pcireg_t,
* int bus_space_tag_t *, bus_space_handle_t *,
* bus_addr_t *, bus_size_t *)
* This function maps bus-space on the value of Base Address
@@ -226,7 +226,7 @@
* written on the BAR.
*/
int
-cardbus_mapreg_map(struct cardbus_softc *sc, int func, int reg, cardbusreg_t type, int busflags, bus_space_tag_t *tagp, bus_space_handle_t *handlep, bus_addr_t *basep, bus_size_t *sizep)
+cardbus_mapreg_map(struct cardbus_softc *sc, int func, int reg, pcireg_t type, int busflags, bus_space_tag_t *tagp, bus_space_handle_t *handlep, bus_addr_t *basep, bus_size_t *sizep)
{
cardbus_chipset_tag_t cc = sc->sc_cc;
cardbus_function_tag_t cf = sc->sc_cf;
@@ -239,7 +239,7 @@
bus_size_t size;
int flags;
int status = 0;
- cardbustag_t tag;
+ pcitag_t tag;
size = 0; /* XXX gcc */
flags = 0; /* XXX gcc */
@@ -332,7 +332,7 @@
cardbus_chipset_tag_t cc = sc->sc_cc;
cardbus_function_tag_t cf = sc->sc_cf;
int st = 1;
- cardbustag_t cardbustag;
+ pcitag_t cardbustag;
#if rbus
rbus_tag_t rbustag;
@@ -374,7 +374,7 @@
*/
int cardbus_save_bar(cardbus_devfunc_t ct)
{
- cardbustag_t tag = Cardbus_make_tag(ct);
+ pcitag_t tag = Cardbus_make_tag(ct);
cardbus_chipset_tag_t cc = ct->ct_cc;
cardbus_function_tag_t cf = ct->ct_cf;
@@ -402,7 +402,7 @@
*/
int cardbus_restore_bar(cardbus_devfunc_t ct)
{
- cardbustag_t tag = Cardbus_make_tag(ct);
+ pcitag_t tag = Cardbus_make_tag(ct);
cardbus_chipset_tag_t cc = ct->ct_cc;
cardbus_function_tag_t cf = ct->ct_cf;
Index: src/sys/dev/cardbus/rbus_ppb.c
diff -u src/sys/dev/cardbus/rbus_ppb.c:1.31 src/sys/dev/cardbus/rbus_ppb.c:1.32
--- src/sys/dev/cardbus/rbus_ppb.c:1.31 Tue May 12 14:17:31 2009
+++ src/sys/dev/cardbus/rbus_ppb.c Wed Feb 24 19:52:52 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rbus_ppb.c,v 1.31 2009/05/12 14:17:31 cegger Exp $ */
+/* $NetBSD: rbus_ppb.c,v 1.32 2010/02/24 19:52:52 dyoung 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.31 2009/05/12 14:17:31 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rbus_ppb.c,v 1.32 2010/02/24 19:52:52 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -649,7 +649,7 @@
pci_devinfo(ca->ca_id, ca->ca_class, 0, devinfo, sizeof(devinfo));
printf(": %s (rev. 0x%02x)\n", devinfo, PCI_REVISION(ca->ca_class));
- csc->sc_tag = ca->ca_tag; /* XXX cardbustag_t == pcitag_t */
+ csc->sc_tag = ca->ca_tag;
busdata = cardbus_conf_read(cc, cf, ca->ca_tag, PPB_REG_BUSINFO);
minbus = pcibios_max_bus;
@@ -744,7 +744,7 @@
printf("ppb_cardbus_setup called\n");
#if 0
/* not sure what to do here */
- cardbustag_t tag = cardbus_make_tag(cc, cf, csc->ct->ct_bus,
+ pcitag_t tag = cardbus_make_tag(cc, cf, csc->ct->ct_bus,
csc->ct->ct_dev, csc->ct->ct_func);
command = Cardbus_conf_read(csc->ct, tag, CARDBUS_COMMAND_STATUS_REG);
Index: src/sys/dev/cardbus/com_cardbus.c
diff -u src/sys/dev/cardbus/com_cardbus.c:1.23 src/sys/dev/cardbus/com_cardbus.c:1.24
--- src/sys/dev/cardbus/com_cardbus.c:1.23 Thu Nov 12 20:30:29 2009
+++ src/sys/dev/cardbus/com_cardbus.c Wed Feb 24 19:52:51 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: com_cardbus.c,v 1.23 2009/11/12 20:30:29 dyoung Exp $ */
+/* $NetBSD: com_cardbus.c,v 1.24 2010/02/24 19:52:51 dyoung Exp $ */
/*
* Copyright (c) 2000 Johan Danielsson
@@ -40,7 +40,7 @@
updated below. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_cardbus.c,v 1.23 2009/11/12 20:30:29 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_cardbus.c,v 1.24 2010/02/24 19:52:51 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -60,12 +60,12 @@
void *cc_ih;
cardbus_devfunc_t cc_ct;
bus_addr_t cc_addr;
- cardbusreg_t cc_base;
+ pcireg_t cc_base;
bus_size_t cc_size;
- cardbusreg_t cc_csr;
+ pcireg_t cc_csr;
int cc_cben;
- cardbustag_t cc_tag;
- cardbusreg_t cc_reg;
+ pcitag_t cc_tag;
+ pcireg_t cc_reg;
int cc_type;
};
@@ -85,7 +85,7 @@
static struct csdev {
int vendor;
int product;
- cardbusreg_t reg;
+ pcireg_t reg;
int type;
} csdevs[] = {
{ PCI_VENDOR_XIRCOM, PCI_PRODUCT_XIRCOM_MODEM56,
@@ -138,7 +138,7 @@
gofigure(struct cardbus_attach_args *ca, struct com_cardbus_softc *csc)
{
int i, index = -1;
- cardbusreg_t cis_ptr;
+ pcireg_t cis_ptr;
struct csdev *cp;
/* If this device is listed above, use the known values, */
@@ -267,7 +267,7 @@
cardbus_devfunc_t ct = csc->cc_ct;
cardbus_chipset_tag_t cc = ct->ct_cc;
cardbus_function_tag_t cf = ct->ct_cf;
- cardbusreg_t reg;
+ pcireg_t reg;
Cardbus_conf_write(ct, csc->cc_tag, csc->cc_reg, csc->cc_base);
Index: src/sys/dev/cardbus/ehci_cardbus.c
diff -u src/sys/dev/cardbus/ehci_cardbus.c:1.24 src/sys/dev/cardbus/ehci_cardbus.c:1.25
--- src/sys/dev/cardbus/ehci_cardbus.c:1.24 Fri Jan 8 19:47:42 2010
+++ src/sys/dev/cardbus/ehci_cardbus.c Wed Feb 24 19:52:51 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci_cardbus.c,v 1.24 2010/01/08 19:47:42 dyoung Exp $ */
+/* $NetBSD: ehci_cardbus.c,v 1.25 2010/02/24 19:52:51 dyoung 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.24 2010/01/08 19:47:42 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci_cardbus.c,v 1.25 2010/02/24 19:52:51 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -102,7 +102,7 @@
}
static bool
-ehci_cardbus_suspend(device_t dv, pmf_qual_t qual)
+ehci_cardbus_suspend(device_t dv, const pmf_qual_t *qual)
{
ehci_suspend(dv, qual);
#if 0
@@ -114,7 +114,7 @@
}
static bool
-ehci_cardbus_resume(device_t dv, pmf_qual_t qual)
+ehci_cardbus_resume(device_t dv, const pmf_qual_t *qual)
{
#if 0
struct ehci_cardbus_softc *sc = device_private(dv);
@@ -131,7 +131,7 @@
cardbus_devfunc_t ct = ca->ca_ct;
cardbus_chipset_tag_t cc = ct->ct_cc;
cardbus_function_tag_t cf = ct->ct_cf;
- cardbusreg_t csr;
+ pcireg_t csr;
char devinfo[256];
usbd_status r;
const char *vendor;
Index: src/sys/dev/cardbus/fwohci_cardbus.c
diff -u src/sys/dev/cardbus/fwohci_cardbus.c:1.27 src/sys/dev/cardbus/fwohci_cardbus.c:1.28
--- src/sys/dev/cardbus/fwohci_cardbus.c:1.27 Tue May 12 12:11:17 2009
+++ src/sys/dev/cardbus/fwohci_cardbus.c Wed Feb 24 19:52:51 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: fwohci_cardbus.c,v 1.27 2009/05/12 12:11:17 cegger Exp $ */
+/* $NetBSD: fwohci_cardbus.c,v 1.28 2010/02/24 19:52:51 dyoung 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.27 2009/05/12 12:11:17 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fwohci_cardbus.c,v 1.28 2010/02/24 19:52:51 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -96,7 +96,7 @@
cardbus_devfunc_t ct = ca->ca_ct;
cardbus_chipset_tag_t cc = ct->ct_cc;
cardbus_function_tag_t cf = ct->ct_cf;
- cardbusreg_t csr;
+ pcireg_t csr;
char devinfo[256];
cardbus_devinfo(ca->ca_id, ca->ca_class, 0, devinfo, sizeof(devinfo));
Index: src/sys/dev/cardbus/if_ath_cardbus.c
diff -u src/sys/dev/cardbus/if_ath_cardbus.c:1.38 src/sys/dev/cardbus/if_ath_cardbus.c:1.39
--- src/sys/dev/cardbus/if_ath_cardbus.c:1.38 Mon Jan 18 18:52:35 2010
+++ src/sys/dev/cardbus/if_ath_cardbus.c Wed Feb 24 19:52:51 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ath_cardbus.c,v 1.38 2010/01/18 18:52:35 pooka Exp $ */
+/* $NetBSD: if_ath_cardbus.c,v 1.39 2010/02/24 19:52:51 dyoung Exp $ */
/*
* Copyright (c) 2003
* Ichiro FUKUHARA <[email protected]>.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ath_cardbus.c,v 1.38 2010/01/18 18:52:35 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ath_cardbus.c,v 1.39 2010/02/24 19:52:51 dyoung Exp $");
#include "opt_inet.h"
@@ -89,7 +89,7 @@
/* CardBus-specific goo. */
void *sc_ih; /* interrupt handle */
cardbus_devfunc_t sc_ct; /* our CardBus devfuncs */
- cardbustag_t sc_tag; /* our CardBus tag */
+ pcitag_t sc_tag; /* our CardBus tag */
bus_size_t sc_mapsize; /* the size of mapped bus space region */
pcireg_t sc_bar_val; /* value of the BAR */
@@ -109,7 +109,7 @@
void ath_cardbus_setup(struct ath_cardbus_softc *);
static bool
-ath_cardbus_suspend(device_t self, pmf_qual_t qual)
+ath_cardbus_suspend(device_t self, const pmf_qual_t *qual)
{
struct ath_cardbus_softc *csc = device_private(self);
@@ -123,7 +123,7 @@
}
static bool
-ath_cardbus_resume(device_t self, pmf_qual_t qual)
+ath_cardbus_resume(device_t self, const pmf_qual_t *qual)
{
struct ath_cardbus_softc *csc = device_private(self);
Index: src/sys/dev/cardbus/if_ex_cardbus.c
diff -u src/sys/dev/cardbus/if_ex_cardbus.c:1.46 src/sys/dev/cardbus/if_ex_cardbus.c:1.47
--- src/sys/dev/cardbus/if_ex_cardbus.c:1.46 Tue Dec 15 22:17:12 2009
+++ src/sys/dev/cardbus/if_ex_cardbus.c Wed Feb 24 19:52:51 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ex_cardbus.c,v 1.46 2009/12/15 22:17:12 snj Exp $ */
+/* $NetBSD: if_ex_cardbus.c,v 1.47 2010/02/24 19:52:51 dyoung Exp $ */
/*
* Copyright (c) 1998 and 1999
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ex_cardbus.c,v 1.46 2009/12/15 22:17:12 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ex_cardbus.c,v 1.47 2010/02/24 19:52:51 dyoung Exp $");
/* #define EX_DEBUG 4 */ /* define to report information for debugging */
@@ -104,7 +104,7 @@
bus_size_t sc_mapsize; /* the size of mapped bus space region */
- cardbustag_t sc_tag;
+ pcitag_t sc_tag;
int sc_csr; /* CSR bits */
int sc_bar_reg; /* which BAR to use */
@@ -380,7 +380,7 @@
cardbus_devfunc_t ct = csc->sc_ct;
cardbus_chipset_tag_t cc = ct->ct_cc;
cardbus_function_tag_t cf = ct->ct_cf;
- cardbusreg_t reg;
+ pcireg_t reg;
(void)cardbus_set_powerstate(ct, csc->sc_tag, PCI_PWR_D0);
Index: src/sys/dev/cardbus/if_ral_cardbus.c
diff -u src/sys/dev/cardbus/if_ral_cardbus.c:1.17 src/sys/dev/cardbus/if_ral_cardbus.c:1.18
--- src/sys/dev/cardbus/if_ral_cardbus.c:1.17 Mon Jan 18 18:52:35 2010
+++ src/sys/dev/cardbus/if_ral_cardbus.c Wed Feb 24 19:52:51 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ral_cardbus.c,v 1.17 2010/01/18 18:52:35 pooka Exp $ */
+/* $NetBSD: if_ral_cardbus.c,v 1.18 2010/02/24 19:52:51 dyoung 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.17 2010/01/18 18:52:35 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ral_cardbus.c,v 1.18 2010/02/24 19:52:51 dyoung Exp $");
#include <sys/param.h>
@@ -85,7 +85,7 @@
/* cardbus specific goo */
struct ral_opns *sc_opns;
cardbus_devfunc_t sc_ct;
- cardbustag_t sc_tag;
+ pcitag_t sc_tag;
void *sc_ih;
bus_size_t sc_mapsize;
pcireg_t sc_bar_val;
Index: src/sys/dev/cardbus/if_re_cardbus.c
diff -u src/sys/dev/cardbus/if_re_cardbus.c:1.20 src/sys/dev/cardbus/if_re_cardbus.c:1.21
--- src/sys/dev/cardbus/if_re_cardbus.c:1.20 Wed Sep 2 15:11:13 2009
+++ src/sys/dev/cardbus/if_re_cardbus.c Wed Feb 24 19:52:51 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_re_cardbus.c,v 1.20 2009/09/02 15:11:13 tsutsui Exp $ */
+/* $NetBSD: if_re_cardbus.c,v 1.21 2010/02/24 19:52:51 dyoung Exp $ */
/*
* Copyright (c) 2004 Jonathan Stone
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_re_cardbus.c,v 1.20 2009/09/02 15:11:13 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_re_cardbus.c,v 1.21 2010/02/24 19:52:51 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -91,7 +91,7 @@
/* CardBus-specific goo. */
void *sc_ih;
cardbus_devfunc_t sc_ct;
- cardbustag_t sc_tag;
+ pcitag_t sc_tag;
int sc_csr;
int sc_cben;
int sc_bar_reg;
Index: src/sys/dev/cardbus/if_rtk_cardbus.c
diff -u src/sys/dev/cardbus/if_rtk_cardbus.c:1.39 src/sys/dev/cardbus/if_rtk_cardbus.c:1.40
--- src/sys/dev/cardbus/if_rtk_cardbus.c:1.39 Mon Jan 18 18:52:35 2010
+++ src/sys/dev/cardbus/if_rtk_cardbus.c Wed Feb 24 19:52:51 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_rtk_cardbus.c,v 1.39 2010/01/18 18:52:35 pooka Exp $ */
+/* $NetBSD: if_rtk_cardbus.c,v 1.40 2010/02/24 19:52:51 dyoung Exp $ */
/*
* Copyright (c) 2000 Masanori Kanaoka
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rtk_cardbus.c,v 1.39 2010/01/18 18:52:35 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rtk_cardbus.c,v 1.40 2010/02/24 19:52:51 dyoung Exp $");
#include "opt_inet.h"
#include "rnd.h"
@@ -126,7 +126,7 @@
/* CardBus-specific goo. */
void *sc_ih;
cardbus_devfunc_t sc_ct;
- cardbustag_t sc_tag;
+ pcitag_t sc_tag;
int sc_csr;
int sc_cben;
int sc_bar_reg;
Index: src/sys/dev/cardbus/if_tlp_cardbus.c
diff -u src/sys/dev/cardbus/if_tlp_cardbus.c:1.62 src/sys/dev/cardbus/if_tlp_cardbus.c:1.63
--- src/sys/dev/cardbus/if_tlp_cardbus.c:1.62 Mon Jan 18 18:52:35 2010
+++ src/sys/dev/cardbus/if_tlp_cardbus.c Wed Feb 24 19:52:51 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tlp_cardbus.c,v 1.62 2010/01/18 18:52:35 pooka Exp $ */
+/* $NetBSD: if_tlp_cardbus.c,v 1.63 2010/02/24 19:52:51 dyoung Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tlp_cardbus.c,v 1.62 2010/01/18 18:52:35 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tlp_cardbus.c,v 1.63 2010/02/24 19:52:51 dyoung Exp $");
#include "opt_inet.h"
@@ -95,7 +95,7 @@
/* CardBus-specific goo. */
void *sc_ih; /* interrupt handle */
cardbus_devfunc_t sc_ct; /* our CardBus devfuncs */
- cardbustag_t sc_tag; /* our CardBus tag */
+ pcitag_t sc_tag; /* our CardBus tag */
int sc_csr; /* CSR bits */
bus_size_t sc_mapsize; /* the size of mapped bus space
region */
Index: src/sys/dev/cardbus/njata_cardbus.c
diff -u src/sys/dev/cardbus/njata_cardbus.c:1.8 src/sys/dev/cardbus/njata_cardbus.c:1.9
--- src/sys/dev/cardbus/njata_cardbus.c:1.8 Tue May 12 14:17:31 2009
+++ src/sys/dev/cardbus/njata_cardbus.c Wed Feb 24 19:52:52 2010
@@ -1,4 +1,4 @@
-/* $Id: njata_cardbus.c,v 1.8 2009/05/12 14:17:31 cegger Exp $ */
+/* $Id: njata_cardbus.c,v 1.9 2010/02/24 19:52:52 dyoung Exp $ */
/*
* Copyright (c) 2006 ITOH Yasufumi <[email protected]>.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: njata_cardbus.c,v 1.8 2009/05/12 14:17:31 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: njata_cardbus.c,v 1.9 2010/02/24 19:52:52 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -55,8 +55,7 @@
/* CardBus-specific goo */
cardbus_devfunc_t sc_ct; /* our CardBus devfuncs */
- cardbus_intr_line_t sc_intrline; /* our interrupt line */
- cardbustag_t sc_tag;
+ pcitag_t sc_tag;
bus_space_handle_t sc_regmaph;
bus_size_t sc_regmap_size;
@@ -142,7 +141,6 @@
csc->sc_ct = ct;
csc->sc_tag = ca->ca_tag;
- csc->sc_intrline = ca->ca_intrline;
/*
* Map the device.
Index: src/sys/dev/cardbus/ohci_cardbus.c
diff -u src/sys/dev/cardbus/ohci_cardbus.c:1.32 src/sys/dev/cardbus/ohci_cardbus.c:1.33
--- src/sys/dev/cardbus/ohci_cardbus.c:1.32 Tue May 12 12:11:17 2009
+++ src/sys/dev/cardbus/ohci_cardbus.c Wed Feb 24 19:52:52 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci_cardbus.c,v 1.32 2009/05/12 12:11:17 cegger Exp $ */
+/* $NetBSD: ohci_cardbus.c,v 1.33 2010/02/24 19:52:52 dyoung 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.32 2009/05/12 12:11:17 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci_cardbus.c,v 1.33 2010/02/24 19:52:52 dyoung Exp $");
#include "ehci_cardbus.h"
@@ -111,7 +111,7 @@
cardbus_devfunc_t ct = ca->ca_ct;
cardbus_chipset_tag_t cc = ct->ct_cc;
cardbus_function_tag_t cf = ct->ct_cf;
- cardbusreg_t csr;
+ pcireg_t csr;
char devinfo[256];
usbd_status r;
const char *vendor;
Index: src/sys/dev/cardbus/siisata_cardbus.c
diff -u src/sys/dev/cardbus/siisata_cardbus.c:1.4 src/sys/dev/cardbus/siisata_cardbus.c:1.5
--- src/sys/dev/cardbus/siisata_cardbus.c:1.4 Sat Jan 30 16:16:35 2010
+++ src/sys/dev/cardbus/siisata_cardbus.c Wed Feb 24 19:52:52 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: siisata_cardbus.c,v 1.4 2010/01/30 16:16:35 jakllsch Exp $ */
+/* $NetBSD: siisata_cardbus.c,v 1.5 2010/02/24 19:52:52 dyoung Exp $ */
/* Id: siisata_pci.c,v 1.11 2008/05/21 16:20:11 jakllsch Exp */
/*
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: siisata_cardbus.c,v 1.4 2010/01/30 16:16:35 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siisata_cardbus.c,v 1.5 2010/02/24 19:52:52 dyoung Exp $");
#include <sys/types.h>
#include <sys/malloc.h>
@@ -82,7 +82,7 @@
static int siisata_cardbus_match(device_t, cfdata_t, void *);
static void siisata_cardbus_attach(device_t, device_t, void *);
static int siisata_cardbus_detach(device_t, int);
-static bool siisata_cardbus_resume(device_t, pmf_qual_t);
+static bool siisata_cardbus_resume(device_t, const pmf_qual_t *);
static const struct siisata_cardbus_product {
cardbus_vendor_id_t scp_vendor;
@@ -139,7 +139,7 @@
cardbus_devfunc_t ct = ca->ca_ct;
cardbus_chipset_tag_t cc = ct->ct_cc;
cardbus_function_tag_t cf = ct->ct_cf;
- cardbusreg_t csr;
+ pcireg_t csr;
const struct siisata_cardbus_product *scp;
bus_space_tag_t memt;
bus_space_handle_t memh;
@@ -269,7 +269,7 @@
struct cardbus_devfunc *ct = csc->sc_ct;
cardbus_chipset_tag_t cc = ct->ct_cc;
cardbus_function_tag_t cf = ct->ct_cf;
- cardbustag_t ctag = cardbus_make_tag(cc, cf, cbsc->sc_bus, ct->ct_func);
+ pcitag_t ctag = cardbus_make_tag(cc, cf, cbsc->sc_bus, ct->ct_func);
int rv;
rv = siisata_detach(sc, flags);
@@ -296,7 +296,7 @@
}
static bool
-siisata_cardbus_resume(device_t dv, pmf_qual_t qual)
+siisata_cardbus_resume(device_t dv, const pmf_qual_t *qual)
{
struct siisata_cardbus_softc *csc = device_private(dv);
struct siisata_softc *sc = &csc->si_sc;
Index: src/sys/dev/cardbus/uhci_cardbus.c
diff -u src/sys/dev/cardbus/uhci_cardbus.c:1.13 src/sys/dev/cardbus/uhci_cardbus.c:1.14
--- src/sys/dev/cardbus/uhci_cardbus.c:1.13 Tue May 12 12:11:17 2009
+++ src/sys/dev/cardbus/uhci_cardbus.c Wed Feb 24 19:52:52 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uhci_cardbus.c,v 1.13 2009/05/12 12:11:17 cegger Exp $ */
+/* $NetBSD: uhci_cardbus.c,v 1.14 2010/02/24 19:52:52 dyoung 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.13 2009/05/12 12:11:17 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci_cardbus.c,v 1.14 2010/02/24 19:52:52 dyoung Exp $");
#include "ehci_cardbus.h"
@@ -63,7 +63,7 @@
cardbus_chipset_tag_t sc_cc;
cardbus_function_tag_t sc_cf;
cardbus_devfunc_t sc_ct;
- cardbustag_t sc_tag;
+ pcitag_t sc_tag;
void *sc_ih; /* interrupt vectoring */
};
@@ -101,8 +101,8 @@
cardbus_devfunc_t ct = ca->ca_ct;
cardbus_chipset_tag_t cc = ct->ct_cc;
cardbus_function_tag_t cf = ct->ct_cf;
- cardbustag_t tag = ca->ca_tag;
- cardbusreg_t csr;
+ pcitag_t tag = ca->ca_tag;
+ pcireg_t csr;
const char *vendor;
const char *devname = device_xname(self);
char devinfo[256];
