Module Name: src
Committed By: drochner
Date: Mon Aug 1 11:20:28 UTC 2011
Modified Files:
src/sys/dev/cardbus: adv_cardbus.c ahc_cardbus.c cardbus.c cardbusreg.h
cardbusvar.h com_cardbus.c ehci_cardbus.c fwohci_cardbus.c
if_ath_cardbus.c if_atw_cardbus.c if_ex_cardbus.c if_fxp_cardbus.c
if_ral_cardbus.c if_re_cardbus.c if_rtk_cardbus.c if_rtw_cardbus.c
if_tlp_cardbus.c njata_cardbus.c njs_cardbus.c ohci_cardbus.c
rbus_ppb.c sdhc_cardbus.c siisata_cardbus.c uhci_cardbus.c
src/sys/dev/pci: pccbb.c
Log Message:
remove some bloat:
-cardbus doesn't use multiple interrupt lines like PCI, and it doesn't
use machanisms like interrupt line register and swizzling -- no need
to carry around dummy information, this is all dealt with by the
bridge
(I'm asking myself how "rbus_ppb" can work -- a bridge attached to
cardbus just can't work like a normal PCI bridge as far as interrupts
are concerned. I thing that should be a hardware specific driver
because behavior is not covered by a standard.)
-cardbus always uses 3.3V -- no need for a variable to keep track
of the voltage
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/cardbus/adv_cardbus.c
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/cardbus/ahc_cardbus.c
cvs rdiff -u -r1.107 -r1.108 src/sys/dev/cardbus/cardbus.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/cardbus/cardbusreg.h
cvs rdiff -u -r1.54 -r1.55 src/sys/dev/cardbus/cardbusvar.h \
src/sys/dev/cardbus/if_ex_cardbus.c
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/cardbus/com_cardbus.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/cardbus/ehci_cardbus.c
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/cardbus/fwohci_cardbus.c
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/cardbus/if_ath_cardbus.c
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/cardbus/if_atw_cardbus.c
cvs rdiff -u -r1.47 -r1.48 src/sys/dev/cardbus/if_fxp_cardbus.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/cardbus/if_ral_cardbus.c
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/cardbus/if_re_cardbus.c
cvs rdiff -u -r1.45 -r1.46 src/sys/dev/cardbus/if_rtk_cardbus.c
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/cardbus/if_rtw_cardbus.c
cvs rdiff -u -r1.69 -r1.70 src/sys/dev/cardbus/if_tlp_cardbus.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/cardbus/njata_cardbus.c \
src/sys/dev/cardbus/siisata_cardbus.c
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/cardbus/njs_cardbus.c
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/cardbus/ohci_cardbus.c
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/cardbus/rbus_ppb.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/cardbus/sdhc_cardbus.c
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/cardbus/uhci_cardbus.c
cvs rdiff -u -r1.202 -r1.203 src/sys/dev/pci/pccbb.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.27 src/sys/dev/cardbus/adv_cardbus.c:1.28
--- src/sys/dev/cardbus/adv_cardbus.c:1.27 Thu Mar 18 20:54:56 2010
+++ src/sys/dev/cardbus/adv_cardbus.c Mon Aug 1 11:20:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: adv_cardbus.c,v 1.27 2010/03/18 20:54:56 dyoung Exp $ */
+/* $NetBSD: adv_cardbus.c,v 1.28 2011/08/01 11:20:27 drochner 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.27 2010/03/18 20:54:56 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adv_cardbus.c,v 1.28 2011/08/01 11:20:27 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -216,8 +216,7 @@
/*
* Establish the interrupt.
*/
- sc->sc_ih = Cardbus_intr_establish(ct, ca->ca_intrline, IPL_BIO,
- adv_intr, sc);
+ sc->sc_ih = Cardbus_intr_establish(ct, IPL_BIO, adv_intr, sc);
if (sc->sc_ih == NULL) {
aprint_error_dev(&sc->sc_dev,
"unable to establish interrupt\n");
Index: src/sys/dev/cardbus/ahc_cardbus.c
diff -u src/sys/dev/cardbus/ahc_cardbus.c:1.34 src/sys/dev/cardbus/ahc_cardbus.c:1.35
--- src/sys/dev/cardbus/ahc_cardbus.c:1.34 Thu Mar 18 20:54:56 2010
+++ src/sys/dev/cardbus/ahc_cardbus.c Mon Aug 1 11:20:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ahc_cardbus.c,v 1.34 2010/03/18 20:54:56 dyoung Exp $ */
+/* $NetBSD: ahc_cardbus.c,v 1.35 2011/08/01 11:20:27 drochner 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.34 2010/03/18 20:54:56 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahc_cardbus.c,v 1.35 2011/08/01 11:20:27 drochner Exp $");
#include "opt_ahc_cardbus.h"
@@ -192,8 +192,7 @@
/*
* Establish the interrupt.
*/
- ahc->ih = Cardbus_intr_establish(ct, ca->ca_intrline, IPL_BIO,
- ahc_intr, ahc);
+ ahc->ih = Cardbus_intr_establish(ct, IPL_BIO, ahc_intr, ahc);
if (ahc->ih == NULL) {
printf("%s: unable to establish interrupt\n",
ahc_name(ahc));
Index: src/sys/dev/cardbus/cardbus.c
diff -u src/sys/dev/cardbus/cardbus.c:1.107 src/sys/dev/cardbus/cardbus.c:1.108
--- src/sys/dev/cardbus/cardbus.c:1.107 Thu Mar 4 22:37:38 2010
+++ src/sys/dev/cardbus/cardbus.c Mon Aug 1 11:20:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cardbus.c,v 1.107 2010/03/04 22:37:38 dyoung Exp $ */
+/* $NetBSD: cardbus.c,v 1.108 2011/08/01 11:20:27 drochner Exp $ */
/*
* Copyright (c) 1997, 1998, 1999 and 2000
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cardbus.c,v 1.107 2010/03/04 22:37:38 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cardbus.c,v 1.108 2011/08/01 11:20:27 drochner Exp $");
#include "opt_cardbus.h"
@@ -112,7 +112,6 @@
sc->sc_dev = self;
sc->sc_bus = cba->cba_bus;
- sc->sc_intrline = cba->cba_intrline;
sc->sc_cacheline = cba->cba_cacheline;
sc->sc_max_lattimer = MIN(0xf8, cba->cba_max_lattimer);
@@ -588,8 +587,6 @@
ca.ca_id = id;
ca.ca_class = class;
- ca.ca_intrline = sc->sc_intrline;
-
if (cis_ptr != 0) {
#define TUPLESIZE 2048
u_int8_t *tuple = malloc(TUPLESIZE, M_DEVBUF, M_WAITOK);
@@ -708,9 +705,9 @@
void *
Cardbus_intr_establish(cardbus_devfunc_t ct,
- cardbus_intr_line_t irq, int level, int (*func)(void *), void *arg)
+ int level, int (*func)(void *), void *arg)
{
- return cardbus_intr_establish(ct->ct_cc, ct->ct_cf, irq, level, func,
+ return cardbus_intr_establish(ct->ct_cc, ct->ct_cf, level, func,
arg);
}
@@ -723,11 +720,11 @@
*/
void *
cardbus_intr_establish(cardbus_chipset_tag_t cc, cardbus_function_tag_t cf,
- cardbus_intr_line_t irq, int level, int (*func)(void *), void *arg)
+ int level, int (*func)(void *), void *arg)
{
- DPRINTF(("- cardbus_intr_establish: irq %d\n", irq));
- return ((*cf->cardbus_intr_establish)(cc, irq, level, func, arg));
+ DPRINTF(("- cardbus_intr_establish\n"));
+ return ((*cf->cardbus_intr_establish)(cc, level, func, arg));
}
void
Index: src/sys/dev/cardbus/cardbusreg.h
diff -u src/sys/dev/cardbus/cardbusreg.h:1.6 src/sys/dev/cardbus/cardbusreg.h:1.7
--- src/sys/dev/cardbus/cardbusreg.h:1.6 Fri Feb 26 00:57:01 2010
+++ src/sys/dev/cardbus/cardbusreg.h Mon Aug 1 11:20:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cardbusreg.h,v 1.6 2010/02/26 00:57:01 dyoung Exp $ */
+/* $NetBSD: cardbusreg.h,v 1.7 2011/08/01 11:20:27 drochner Exp $ */
/*
* Copyright (c) 2001
@@ -31,8 +31,6 @@
#include <dev/pci/pcivar.h> /* for pcitag_t */
-typedef int cardbus_intr_line_t;
-
/* Base Resisters */
#define CARDBUS_CIS_REG 0x28
#define CARDBUS_ROM_REG 0x30
Index: src/sys/dev/cardbus/cardbusvar.h
diff -u src/sys/dev/cardbus/cardbusvar.h:1.54 src/sys/dev/cardbus/cardbusvar.h:1.55
--- src/sys/dev/cardbus/cardbusvar.h:1.54 Mon Mar 15 19:50:50 2010
+++ src/sys/dev/cardbus/cardbusvar.h Mon Aug 1 11:20:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cardbusvar.h,v 1.54 2010/03/15 19:50:50 dyoung Exp $ */
+/* $NetBSD: cardbusvar.h,v 1.55 2011/08/01 11:20:27 drochner Exp $ */
/*
* Copyright (c) 1998, 1999 and 2000
@@ -79,7 +79,7 @@
int (*cardbus_space_free)(cardbus_chipset_tag_t, rbus_tag_t,
bus_space_handle_t, bus_size_t);
void *(*cardbus_intr_establish)(cardbus_chipset_tag_t,
- cardbus_intr_line_t, int, int (*)(void *), void *);
+ int, int (*)(void *), void *);
void (*cardbus_intr_disestablish)(cardbus_chipset_tag_t, void *);
int (*cardbus_ctrl)(cardbus_chipset_tag_t, int);
int (*cardbus_power)(cardbus_chipset_tag_t, int);
@@ -103,7 +103,6 @@
cardbus_chipset_tag_t cba_cc; /* cardbus chipset */
cardbus_function_tag_t cba_cf; /* cardbus functions */
- cardbus_intr_line_t cba_intrline; /* interrupt line */
rbus_tag_t cba_rbus_iot; /* CardBus i/o rbus tag */
rbus_tag_t cba_rbus_memt; /* CardBus mem rbus tag */
@@ -132,7 +131,6 @@
device_t sc_dev; /* fundamental device structure */
int sc_bus; /* cardbus bus number */
- cardbus_intr_line_t sc_intrline; /* CardBus intrline */
bus_space_tag_t sc_iot; /* CardBus I/O space tag */
bus_space_tag_t sc_memt; /* CardBus MEM space tag */
@@ -151,10 +149,6 @@
* the primary bus (PCI bus) sets
* the maximum.
*/
- int sc_volt; /* applied Vcc voltage */
-#define PCCARD_33V 0x02
-#define PCCARD_XXV 0x04
-#define PCCARD_YYV 0x08
int sc_poweron_func;
struct cardbus_devfunc *sc_funcs[8]; /* list of cardbus device functions */
};
@@ -223,9 +217,6 @@
pcireg_t ca_id;
pcireg_t ca_class;
- /* interrupt information */
- cardbus_intr_line_t ca_intrline;
-
rbus_tag_t ca_rbus_iot; /* CardBus i/o rbus tag */
rbus_tag_t ca_rbus_memt; /* CardBus mem rbus tag */
@@ -266,10 +257,10 @@
int cardbus_attach_card(struct cardbus_softc *);
void cardbus_detach_card(struct cardbus_softc *);
void *Cardbus_intr_establish(cardbus_devfunc_t,
- cardbus_intr_line_t, int, int (*)(void *), void *);
+ int, int (*)(void *), void *);
void Cardbus_intr_disestablish(cardbus_devfunc_t, void *);
void *cardbus_intr_establish(cardbus_chipset_tag_t, cardbus_function_tag_t,
- cardbus_intr_line_t, int, int (*) (void *), void *arg);
+ int, int (*) (void *), void *arg);
void cardbus_intr_disestablish(cardbus_chipset_tag_t, cardbus_function_tag_t,
void *);
Index: src/sys/dev/cardbus/if_ex_cardbus.c
diff -u src/sys/dev/cardbus/if_ex_cardbus.c:1.54 src/sys/dev/cardbus/if_ex_cardbus.c:1.55
--- src/sys/dev/cardbus/if_ex_cardbus.c:1.54 Mon Mar 22 23:03:30 2010
+++ src/sys/dev/cardbus/if_ex_cardbus.c Mon Aug 1 11:20:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ex_cardbus.c,v 1.54 2010/03/22 23:03:30 dyoung Exp $ */
+/* $NetBSD: if_ex_cardbus.c,v 1.55 2011/08/01 11:20:27 drochner Exp $ */
/*
* Copyright (c) 1998 and 1999
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ex_cardbus.c,v 1.54 2010/03/22 23:03:30 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ex_cardbus.c,v 1.55 2011/08/01 11:20:27 drochner Exp $");
/* #define EX_DEBUG 4 */ /* define to report information for debugging */
@@ -89,7 +89,6 @@
struct ex_softc sc_softc;
cardbus_devfunc_t sc_ct;
- cardbus_intr_line_t sc_intrline;
uint8_t sc_cardbus_flags;
#define EX_REATTACH 0x01
#define EX_ABSENT 0x02
@@ -223,7 +222,6 @@
sc->sc_dmat = ca->ca_dmat;
csc->sc_ct = ca->ca_ct;
- csc->sc_intrline = ca->ca_intrline;
csc->sc_tag = ca->ca_tag;
ecp = ex_cardbus_lookup(ca);
@@ -340,8 +338,7 @@
Cardbus_function_enable(csc->sc_ct);
ex_cardbus_setup(csc);
- sc->sc_ih = Cardbus_intr_establish(csc->sc_ct, csc->sc_intrline,
- IPL_NET, ex_intr, sc);
+ sc->sc_ih = Cardbus_intr_establish(csc->sc_ct, IPL_NET, ex_intr, sc);
if (NULL == sc->sc_ih) {
aprint_error_dev(sc->sc_dev, "couldn't establish interrupt\n");
return (1);
Index: src/sys/dev/cardbus/com_cardbus.c
diff -u src/sys/dev/cardbus/com_cardbus.c:1.29 src/sys/dev/cardbus/com_cardbus.c:1.30
--- src/sys/dev/cardbus/com_cardbus.c:1.29 Thu Mar 18 20:54:56 2010
+++ src/sys/dev/cardbus/com_cardbus.c Mon Aug 1 11:20:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: com_cardbus.c,v 1.29 2010/03/18 20:54:56 dyoung Exp $ */
+/* $NetBSD: com_cardbus.c,v 1.30 2011/08/01 11:20:27 drochner 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.29 2010/03/18 20:54:56 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_cardbus.c,v 1.30 2011/08/01 11:20:27 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -57,7 +57,6 @@
struct com_cardbus_softc {
struct com_softc cc_com;
- cardbus_intr_line_t cc_intrline;
void *cc_ih;
cardbus_devfunc_t cc_ct;
bus_addr_t cc_addr;
@@ -211,7 +210,6 @@
bus_space_tag_t iot;
sc->sc_dev = self;
- csc->cc_intrline = ca->ca_intrline;
csc->cc_ct = ca->ca_ct;
csc->cc_tag = ca->ca_tag;
@@ -297,8 +295,7 @@
com_cardbus_setup(csc);
/* establish the interrupt. */
- csc->cc_ih = Cardbus_intr_establish(ct, csc->cc_intrline,
- IPL_SERIAL, comintr, sc);
+ csc->cc_ih = Cardbus_intr_establish(ct, IPL_SERIAL, comintr, sc);
if (csc->cc_ih == NULL) {
aprint_error_dev(DEVICET(csc),
"couldn't establish interrupt\n");
Index: src/sys/dev/cardbus/ehci_cardbus.c
diff -u src/sys/dev/cardbus/ehci_cardbus.c:1.30 src/sys/dev/cardbus/ehci_cardbus.c:1.31
--- src/sys/dev/cardbus/ehci_cardbus.c:1.30 Tue May 25 08:37:10 2010
+++ src/sys/dev/cardbus/ehci_cardbus.c Mon Aug 1 11:20:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci_cardbus.c,v 1.30 2010/05/25 08:37:10 pgoyette Exp $ */
+/* $NetBSD: ehci_cardbus.c,v 1.31 2011/08/01 11:20:27 drochner 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.30 2010/05/25 08:37:10 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci_cardbus.c,v 1.31 2011/08/01 11:20:27 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -164,8 +164,7 @@
DPRINTF(("%s: offs=%d\n", devname, sc->sc.sc_offs));
EOWRITE2(&sc->sc, EHCI_USBINTR, 0);
- sc->sc_ih = Cardbus_intr_establish(ct, ca->ca_intrline,
- IPL_USB, ehci_intr, sc);
+ sc->sc_ih = Cardbus_intr_establish(ct, IPL_USB, ehci_intr, sc);
if (sc->sc_ih == NULL) {
printf("%s: couldn't establish interrupt\n", devname);
return;
Index: src/sys/dev/cardbus/fwohci_cardbus.c
diff -u src/sys/dev/cardbus/fwohci_cardbus.c:1.33 src/sys/dev/cardbus/fwohci_cardbus.c:1.34
--- src/sys/dev/cardbus/fwohci_cardbus.c:1.33 Mon Apr 19 07:05:15 2010
+++ src/sys/dev/cardbus/fwohci_cardbus.c Mon Aug 1 11:20:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: fwohci_cardbus.c,v 1.33 2010/04/19 07:05:15 kiyohara Exp $ */
+/* $NetBSD: fwohci_cardbus.c,v 1.34 2011/08/01 11:20:27 drochner 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.33 2010/04/19 07:05:15 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fwohci_cardbus.c,v 1.34 2011/08/01 11:20:27 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -121,8 +121,7 @@
Cardbus_conf_write(ct, ca->ca_tag, PCI_COMMAND_STATUS_REG,
csr | PCI_COMMAND_MASTER_ENABLE | PCI_COMMAND_MEM_ENABLE);
- sc->sc_ih = Cardbus_intr_establish(ct, ca->ca_intrline,
- IPL_BIO, fwohci_intr, sc);
+ sc->sc_ih = Cardbus_intr_establish(ct, IPL_BIO, fwohci_intr, sc);
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "couldn't establish interrupt\n");
return;
Index: src/sys/dev/cardbus/if_ath_cardbus.c
diff -u src/sys/dev/cardbus/if_ath_cardbus.c:1.43 src/sys/dev/cardbus/if_ath_cardbus.c:1.44
--- src/sys/dev/cardbus/if_ath_cardbus.c:1.43 Tue Jul 26 20:51:23 2011
+++ src/sys/dev/cardbus/if_ath_cardbus.c Mon Aug 1 11:20:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ath_cardbus.c,v 1.43 2011/07/26 20:51:23 dyoung Exp $ */
+/* $NetBSD: if_ath_cardbus.c,v 1.44 2011/08/01 11:20:27 drochner Exp $ */
/*
* Copyright (c) 2003
* Ichiro FUKUHARA <ich...@ichiro.org>.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ath_cardbus.c,v 1.43 2011/07/26 20:51:23 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ath_cardbus.c,v 1.44 2011/08/01 11:20:27 drochner Exp $");
#include "opt_inet.h"
@@ -94,7 +94,6 @@
pcireg_t sc_bar_val; /* value of the BAR */
- cardbus_intr_line_t sc_intrline; /* interrupt line */
bus_space_tag_t sc_iot;
bus_space_handle_t sc_ioh;
};
@@ -127,8 +126,7 @@
struct ath_cardbus_softc *csc = device_private(self);
csc->sc_ih = Cardbus_intr_establish(csc->sc_ct,
- csc->sc_intrline, IPL_NET, ath_intr,
- &csc->sc_ath);
+ IPL_NET, ath_intr, &csc->sc_ath);
if (csc->sc_ih == NULL) {
aprint_error_dev(self,
@@ -188,9 +186,6 @@
*/
ath_cardbus_setup(csc);
- /* Remember which interrupt line. */
- csc->sc_intrline = ca->ca_intrline;
-
ATH_LOCK_INIT(sc);
/*
Index: src/sys/dev/cardbus/if_atw_cardbus.c
diff -u src/sys/dev/cardbus/if_atw_cardbus.c:1.35 src/sys/dev/cardbus/if_atw_cardbus.c:1.36
--- src/sys/dev/cardbus/if_atw_cardbus.c:1.35 Tue Jul 26 20:51:23 2011
+++ src/sys/dev/cardbus/if_atw_cardbus.c Mon Aug 1 11:20:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_atw_cardbus.c,v 1.35 2011/07/26 20:51:23 dyoung Exp $ */
+/* $NetBSD: if_atw_cardbus.c,v 1.36 2011/08/01 11:20:27 drochner Exp $ */
/*-
* Copyright (c) 1999, 2000, 2003 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_atw_cardbus.c,v 1.35 2011/07/26 20:51:23 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_atw_cardbus.c,v 1.36 2011/08/01 11:20:27 drochner Exp $");
#include "opt_inet.h"
@@ -102,8 +102,6 @@
int sc_bar_reg; /* which BAR to use */
pcireg_t sc_bar_val; /* value of the BAR */
-
- cardbus_intr_line_t sc_intrline; /* interrupt line */
};
static int atw_cardbus_match(device_t, cfdata_t, void *);
@@ -239,9 +237,6 @@
*/
atw_cardbus_setup(csc);
- /* Remember which interrupt line. */
- csc->sc_intrline = ca->ca_intrline;
-
#if 0
/*
* The CardBus cards will make it to store-and-forward mode as
@@ -322,8 +317,7 @@
/*
* Map and establish the interrupt.
*/
- csc->sc_ih = Cardbus_intr_establish(ct, csc->sc_intrline, IPL_NET,
- atw_intr, sc);
+ csc->sc_ih = Cardbus_intr_establish(ct, IPL_NET, atw_intr, sc);
if (csc->sc_ih == NULL) {
aprint_error_dev(sc->sc_dev, "unable to establish interrupt\n");
return false;
Index: src/sys/dev/cardbus/if_fxp_cardbus.c
diff -u src/sys/dev/cardbus/if_fxp_cardbus.c:1.47 src/sys/dev/cardbus/if_fxp_cardbus.c:1.48
--- src/sys/dev/cardbus/if_fxp_cardbus.c:1.47 Thu Mar 18 20:52:43 2010
+++ src/sys/dev/cardbus/if_fxp_cardbus.c Mon Aug 1 11:20:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fxp_cardbus.c,v 1.47 2010/03/18 20:52:43 dyoung Exp $ */
+/* $NetBSD: if_fxp_cardbus.c,v 1.48 2011/08/01 11:20:27 drochner 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.47 2010/03/18 20:52:43 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fxp_cardbus.c,v 1.48 2011/08/01 11:20:27 drochner Exp $");
#include "opt_inet.h"
#include "rnd.h"
@@ -91,7 +91,6 @@
struct fxp_cardbus_softc {
struct fxp_softc sc;
cardbus_devfunc_t ct;
- cardbus_intr_line_t intrline;
pcitag_t tag;
pcireg_t base0_reg;
pcireg_t base1_reg;
@@ -133,7 +132,6 @@
bus_addr_t adr;
sc->sc_dev = self;
- csc->intrline = ca->ca_intrline;
csc->ct = ca->ca_ct;
csc->tag = ca->ca_tag;
@@ -220,8 +218,7 @@
/* Map and establish the interrupt. */
- sc->sc_ih = Cardbus_intr_establish(ct, csc->intrline, IPL_NET,
- fxp_intr, sc);
+ sc->sc_ih = Cardbus_intr_establish(ct, IPL_NET, fxp_intr, sc);
if (NULL == sc->sc_ih) {
aprint_error_dev(sc->sc_dev, "couldn't establish interrupt\n");
return 1;
Index: src/sys/dev/cardbus/if_ral_cardbus.c
diff -u src/sys/dev/cardbus/if_ral_cardbus.c:1.21 src/sys/dev/cardbus/if_ral_cardbus.c:1.22
--- src/sys/dev/cardbus/if_ral_cardbus.c:1.21 Thu Mar 18 20:51:42 2010
+++ src/sys/dev/cardbus/if_ral_cardbus.c Mon Aug 1 11:20:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ral_cardbus.c,v 1.21 2010/03/18 20:51:42 dyoung Exp $ */
+/* $NetBSD: if_ral_cardbus.c,v 1.22 2011/08/01 11:20:27 drochner 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.21 2010/03/18 20:51:42 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ral_cardbus.c,v 1.22 2011/08/01 11:20:27 drochner Exp $");
#include <sys/param.h>
@@ -89,7 +89,6 @@
void *sc_ih;
bus_size_t sc_mapsize;
pcireg_t sc_bar_val;
- cardbus_intr_line_t sc_intrline;
};
int ral_cardbus_match(device_t, cfdata_t, void *);
@@ -148,7 +147,6 @@
sc->sc_dmat = ca->ca_dmat;
csc->sc_ct = ct;
csc->sc_tag = ca->ca_tag;
- csc->sc_intrline = ca->ca_intrline;
/* power management hooks */
sc->sc_enable = ral_cardbus_enable;
@@ -211,7 +209,7 @@
ral_cardbus_setup(csc);
/* map and establish the interrupt handler */
- csc->sc_ih = Cardbus_intr_establish(ct, csc->sc_intrline, IPL_NET,
+ csc->sc_ih = Cardbus_intr_establish(ct, IPL_NET,
csc->sc_opns->intr, sc);
if (csc->sc_ih == NULL) {
aprint_error_dev(&sc->sc_dev,
Index: src/sys/dev/cardbus/if_re_cardbus.c
diff -u src/sys/dev/cardbus/if_re_cardbus.c:1.26 src/sys/dev/cardbus/if_re_cardbus.c:1.27
--- src/sys/dev/cardbus/if_re_cardbus.c:1.26 Tue Jul 27 21:02:00 2010
+++ src/sys/dev/cardbus/if_re_cardbus.c Mon Aug 1 11:20:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_re_cardbus.c,v 1.26 2010/07/27 21:02:00 jakllsch Exp $ */
+/* $NetBSD: if_re_cardbus.c,v 1.27 2011/08/01 11:20:27 drochner Exp $ */
/*
* Copyright (c) 2004 Jonathan Stone
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_re_cardbus.c,v 1.26 2010/07/27 21:02:00 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_re_cardbus.c,v 1.27 2011/08/01 11:20:27 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -95,7 +95,6 @@
pcireg_t sc_csr;
int sc_bar_reg;
pcireg_t sc_bar_val;
- cardbus_intr_line_t sc_intrline;
};
CFATTACH_DECL_NEW(re_cardbus, sizeof(struct re_cardbus_softc),
@@ -148,7 +147,6 @@
sc->sc_dmat = ca->ca_dmat;
csc->sc_ct = ct;
csc->sc_tag = ca->ca_tag;
- csc->sc_intrline = ca->ca_intrline;
t = re_cardbus_lookup(ca);
if (t == NULL) {
@@ -321,8 +319,7 @@
/*
* Map and establish the interrupt.
*/
- csc->sc_ih = Cardbus_intr_establish(ct, csc->sc_intrline,
- IPL_NET, re_intr, sc);
+ csc->sc_ih = Cardbus_intr_establish(ct, IPL_NET, re_intr, sc);
if (csc->sc_ih == NULL) {
aprint_error_dev(sc->sc_dev,
"unable to establish interrupt\n");
Index: src/sys/dev/cardbus/if_rtk_cardbus.c
diff -u src/sys/dev/cardbus/if_rtk_cardbus.c:1.45 src/sys/dev/cardbus/if_rtk_cardbus.c:1.46
--- src/sys/dev/cardbus/if_rtk_cardbus.c:1.45 Tue Jul 27 21:05:04 2010
+++ src/sys/dev/cardbus/if_rtk_cardbus.c Mon Aug 1 11:20:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_rtk_cardbus.c,v 1.45 2010/07/27 21:05:04 jakllsch Exp $ */
+/* $NetBSD: if_rtk_cardbus.c,v 1.46 2011/08/01 11:20:27 drochner Exp $ */
/*
* Copyright (c) 2000 Masanori Kanaoka
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rtk_cardbus.c,v 1.45 2010/07/27 21:05:04 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rtk_cardbus.c,v 1.46 2011/08/01 11:20:27 drochner Exp $");
#include "opt_inet.h"
#include "rnd.h"
@@ -130,7 +130,6 @@
pcireg_t sc_csr;
int sc_bar_reg;
pcireg_t sc_bar_val;
- cardbus_intr_line_t sc_intrline;
};
CFATTACH_DECL_NEW(rtk_cardbus, sizeof(struct rtk_cardbus_softc),
@@ -184,7 +183,6 @@
sc->sc_dmat = ca->ca_dmat;
csc->sc_ct = ct;
csc->sc_tag = ca->ca_tag;
- csc->sc_intrline = ca->ca_intrline;
t = rtk_cardbus_lookup(ca);
if (t == NULL) {
@@ -358,8 +356,7 @@
/*
* Map and establish the interrupt.
*/
- csc->sc_ih = Cardbus_intr_establish(ct, csc->sc_intrline,
- IPL_NET, rtk_intr, sc);
+ csc->sc_ih = Cardbus_intr_establish(ct, IPL_NET, rtk_intr, sc);
if (csc->sc_ih == NULL) {
aprint_error_dev(sc->sc_dev,
"unable to establish interrupt\n");
Index: src/sys/dev/cardbus/if_rtw_cardbus.c
diff -u src/sys/dev/cardbus/if_rtw_cardbus.c:1.41 src/sys/dev/cardbus/if_rtw_cardbus.c:1.42
--- src/sys/dev/cardbus/if_rtw_cardbus.c:1.41 Tue Jul 26 20:51:23 2011
+++ src/sys/dev/cardbus/if_rtw_cardbus.c Mon Aug 1 11:20:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_rtw_cardbus.c,v 1.41 2011/07/26 20:51:23 dyoung Exp $ */
+/* $NetBSD: if_rtw_cardbus.c,v 1.42 2011/08/01 11:20:27 drochner Exp $ */
/*-
* Copyright (c) 2004, 2005 David Young. All rights reserved.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rtw_cardbus.c,v 1.41 2011/07/26 20:51:23 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rtw_cardbus.c,v 1.42 2011/08/01 11:20:27 drochner Exp $");
#include "opt_inet.h"
@@ -121,8 +121,6 @@
*/
int sc_bar; /* which BAR to use */
-
- cardbus_intr_line_t sc_intrline; /* interrupt line */
};
int rtw_cardbus_match(device_t, cfdata_t, void *);
@@ -259,9 +257,6 @@
*/
rtw_cardbus_setup(csc);
- /* Remember which interrupt line. */
- csc->sc_intrline = ca->ca_intrline;
-
/*
* Finish off the attach.
*/
@@ -326,8 +321,7 @@
/*
* Map and establish the interrupt.
*/
- csc->sc_ih = Cardbus_intr_establish(ct, csc->sc_intrline, IPL_NET,
- rtw_intr, sc);
+ csc->sc_ih = Cardbus_intr_establish(ct, IPL_NET, rtw_intr, sc);
if (csc->sc_ih == NULL) {
aprint_error_dev(sc->sc_dev,
"unable to establish interrupt\n");
Index: src/sys/dev/cardbus/if_tlp_cardbus.c
diff -u src/sys/dev/cardbus/if_tlp_cardbus.c:1.69 src/sys/dev/cardbus/if_tlp_cardbus.c:1.70
--- src/sys/dev/cardbus/if_tlp_cardbus.c:1.69 Tue Jul 26 20:51:23 2011
+++ src/sys/dev/cardbus/if_tlp_cardbus.c Mon Aug 1 11:20:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tlp_cardbus.c,v 1.69 2011/07/26 20:51:23 dyoung Exp $ */
+/* $NetBSD: if_tlp_cardbus.c,v 1.70 2011/08/01 11:20:27 drochner 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.69 2011/07/26 20:51:23 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tlp_cardbus.c,v 1.70 2011/08/01 11:20:27 drochner Exp $");
#include "opt_inet.h"
@@ -102,8 +102,6 @@
int sc_bar_reg; /* which BAR to use */
pcireg_t sc_bar_val; /* value of the BAR */
-
- cardbus_intr_line_t sc_intrline; /* interrupt line */
};
int tlp_cardbus_match(device_t, cfdata_t, void *);
@@ -428,9 +426,6 @@
return;
}
- /* Remember which interrupt line. */
- csc->sc_intrline = ca->ca_intrline;
-
/*
* Finish off the attach.
*/
@@ -494,8 +489,7 @@
/*
* Map and establish the interrupt.
*/
- csc->sc_ih = Cardbus_intr_establish(ct, csc->sc_intrline, IPL_NET,
- tlp_intr, sc);
+ csc->sc_ih = Cardbus_intr_establish(ct, IPL_NET, tlp_intr, sc);
if (csc->sc_ih == NULL) {
aprint_error_dev(sc->sc_dev,
"unable to establish interrupt\n");
Index: src/sys/dev/cardbus/njata_cardbus.c
diff -u src/sys/dev/cardbus/njata_cardbus.c:1.14 src/sys/dev/cardbus/njata_cardbus.c:1.15
--- src/sys/dev/cardbus/njata_cardbus.c:1.14 Mon Feb 21 02:31:59 2011
+++ src/sys/dev/cardbus/njata_cardbus.c Mon Aug 1 11:20:28 2011
@@ -1,4 +1,4 @@
-/* $Id: njata_cardbus.c,v 1.14 2011/02/21 02:31:59 itohy Exp $ */
+/* $Id: njata_cardbus.c,v 1.15 2011/08/01 11:20:28 drochner Exp $ */
/*
* Copyright (c) 2006 ITOH Yasufumi.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: njata_cardbus.c,v 1.14 2011/02/21 02:31:59 itohy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: njata_cardbus.c,v 1.15 2011/08/01 11:20:28 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -209,8 +209,7 @@
/*
* Establish the interrupt.
*/
- sc->sc_ih = Cardbus_intr_establish(ct, ca->ca_intrline, IPL_BIO,
- njata32_intr, sc);
+ sc->sc_ih = Cardbus_intr_establish(ct, IPL_BIO, njata32_intr, sc);
if (sc->sc_ih == NULL) {
aprint_error("%s: unable to establish interrupt\n",
NJATA32NAME(sc));
Index: src/sys/dev/cardbus/siisata_cardbus.c
diff -u src/sys/dev/cardbus/siisata_cardbus.c:1.14 src/sys/dev/cardbus/siisata_cardbus.c:1.15
--- src/sys/dev/cardbus/siisata_cardbus.c:1.14 Sat Nov 13 13:51:58 2010
+++ src/sys/dev/cardbus/siisata_cardbus.c Mon Aug 1 11:20:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: siisata_cardbus.c,v 1.14 2010/11/13 13:51:58 uebayasi Exp $ */
+/* $NetBSD: siisata_cardbus.c,v 1.15 2011/08/01 11:20:28 drochner 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.14 2010/11/13 13:51:58 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siisata_cardbus.c,v 1.15 2011/08/01 11:20:28 drochner Exp $");
#include <sys/types.h>
#include <sys/malloc.h>
@@ -215,8 +215,7 @@
sc->sc_dmat = ca->ca_dmat;
/* map interrupt */
- csc->sc_ih = Cardbus_intr_establish(ct, ca->ca_intrline, IPL_BIO,
- siisata_intr, sc);
+ csc->sc_ih = Cardbus_intr_establish(ct, IPL_BIO, siisata_intr, sc);
if (csc->sc_ih == NULL) {
Cardbus_conf_write(ct, ca->ca_tag, SIISATA_CARDBUS_BAR0, 0);
(*cf->cardbus_space_free)(cc, csc->sc_rbus_memt, sc->sc_grh,
Index: src/sys/dev/cardbus/njs_cardbus.c
diff -u src/sys/dev/cardbus/njs_cardbus.c:1.16 src/sys/dev/cardbus/njs_cardbus.c:1.17
--- src/sys/dev/cardbus/njs_cardbus.c:1.16 Thu Mar 11 17:27:40 2010
+++ src/sys/dev/cardbus/njs_cardbus.c Mon Aug 1 11:20:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: njs_cardbus.c,v 1.16 2010/03/11 17:27:40 dyoung Exp $ */
+/* $NetBSD: njs_cardbus.c,v 1.17 2011/08/01 11:20:28 drochner 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.16 2010/03/11 17:27:40 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: njs_cardbus.c,v 1.17 2011/08/01 11:20:28 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -201,8 +201,7 @@
/*
* Establish the interrupt.
*/
- sc->sc_ih = Cardbus_intr_establish(ct, ca->ca_intrline, IPL_BIO,
- njsc32_intr, sc);
+ sc->sc_ih = Cardbus_intr_establish(ct, IPL_BIO, njsc32_intr, sc);
if (sc->sc_ih == NULL) {
aprint_error_dev(self,
"unable to establish interrupt\n");
Index: src/sys/dev/cardbus/ohci_cardbus.c
diff -u src/sys/dev/cardbus/ohci_cardbus.c:1.38 src/sys/dev/cardbus/ohci_cardbus.c:1.39
--- src/sys/dev/cardbus/ohci_cardbus.c:1.38 Tue May 25 08:37:10 2010
+++ src/sys/dev/cardbus/ohci_cardbus.c Mon Aug 1 11:20:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci_cardbus.c,v 1.38 2010/05/25 08:37:10 pgoyette Exp $ */
+/* $NetBSD: ohci_cardbus.c,v 1.39 2011/08/01 11:20:28 drochner 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.38 2010/05/25 08:37:10 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci_cardbus.c,v 1.39 2011/08/01 11:20:28 drochner Exp $");
#include "ehci_cardbus.h"
@@ -142,8 +142,7 @@
bus_space_write_4(sc->sc.iot, sc->sc.ioh, OHCI_INTERRUPT_DISABLE,
OHCI_ALL_INTRS);
- sc->sc_ih = Cardbus_intr_establish(ct, ca->ca_intrline,
- IPL_USB, ohci_intr, sc);
+ sc->sc_ih = Cardbus_intr_establish(ct, IPL_USB, ohci_intr, sc);
if (sc->sc_ih == NULL) {
printf("%s: couldn't establish interrupt\n", devname);
return;
Index: src/sys/dev/cardbus/rbus_ppb.c
diff -u src/sys/dev/cardbus/rbus_ppb.c:1.40 src/sys/dev/cardbus/rbus_ppb.c:1.41
--- src/sys/dev/cardbus/rbus_ppb.c:1.40 Tue May 17 17:34:53 2011
+++ src/sys/dev/cardbus/rbus_ppb.c Mon Aug 1 11:20:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rbus_ppb.c,v 1.40 2011/05/17 17:34:53 dyoung Exp $ */
+/* $NetBSD: rbus_ppb.c,v 1.41 2011/08/01 11:20:28 drochner 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.40 2011/05/17 17:34:53 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rbus_ppb.c,v 1.41 2011/08/01 11:20:28 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -63,6 +63,7 @@
#include <dev/ic/i82365reg.h>
+#include <dev/cardbus/rbus.h>
#include <dev/pci/pccbbreg.h>
#include <dev/pci/pccbbvar.h>
@@ -641,10 +642,6 @@
pciirq = 0;
rv = 0;
- /* shut up compiler */
- csc->foo = parent_sc->sc_intrline;
-
-
pci_devinfo(ca->ca_id, ca->ca_class, 0, devinfo, sizeof(devinfo));
printf(": %s (rev. 0x%02x)\n", devinfo, PCI_REVISION(ca->ca_class));
@@ -695,7 +692,7 @@
* was assigned to this slot, as they will all arrive from
* that IRQ.
*/
- rbus_intr_fixup(psc->sc_pc, minbus, maxbus, ca->ca_intrline);
+ rbus_intr_fixup(psc->sc_pc, minbus, maxbus, 0);
/*
* enable direct routing of interrupts. We do this because
Index: src/sys/dev/cardbus/sdhc_cardbus.c
diff -u src/sys/dev/cardbus/sdhc_cardbus.c:1.2 src/sys/dev/cardbus/sdhc_cardbus.c:1.3
--- src/sys/dev/cardbus/sdhc_cardbus.c:1.2 Fri Jun 4 19:27:12 2010
+++ src/sys/dev/cardbus/sdhc_cardbus.c Mon Aug 1 11:20:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhc_cardbus.c,v 1.2 2010/06/04 19:27:12 dyoung Exp $ */
+/* $NetBSD: sdhc_cardbus.c,v 1.3 2011/08/01 11:20:28 drochner Exp $ */
/*
* Copyright (c) 2010 NONAKA Kimihiro <non...@netbsd.org>
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdhc_cardbus.c,v 1.2 2010/06/04 19:27:12 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdhc_cardbus.c,v 1.3 2011/08/01 11:20:28 drochner Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -145,8 +145,7 @@
csr | PCI_COMMAND_MASTER_ENABLE | PCI_COMMAND_MEM_ENABLE);
/* Establish the interrupt. */
- sc->sc_ih = Cardbus_intr_establish(ct, ca->ca_intrline, IPL_SDMMC,
- sdhc_intr, &sc->sc);
+ sc->sc_ih = Cardbus_intr_establish(ct, IPL_SDMMC, sdhc_intr, &sc->sc);
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "couldn't establish interrupt\n");
goto err;
Index: src/sys/dev/cardbus/uhci_cardbus.c
diff -u src/sys/dev/cardbus/uhci_cardbus.c:1.19 src/sys/dev/cardbus/uhci_cardbus.c:1.20
--- src/sys/dev/cardbus/uhci_cardbus.c:1.19 Tue May 25 08:37:10 2010
+++ src/sys/dev/cardbus/uhci_cardbus.c Mon Aug 1 11:20:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: uhci_cardbus.c,v 1.19 2010/05/25 08:37:10 pgoyette Exp $ */
+/* $NetBSD: uhci_cardbus.c,v 1.20 2011/08/01 11:20:28 drochner 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.19 2010/05/25 08:37:10 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci_cardbus.c,v 1.20 2011/08/01 11:20:28 drochner Exp $");
#include "ehci_cardbus.h"
@@ -131,8 +131,7 @@
bus_space_write_2(sc->sc.iot, sc->sc.ioh, UHCI_INTR, 0);
/* Map and establish the interrupt. */
- sc->sc_ih = Cardbus_intr_establish(ct, ca->ca_intrline,
- IPL_USB, uhci_intr, sc);
+ sc->sc_ih = Cardbus_intr_establish(ct, IPL_USB, uhci_intr, sc);
if (sc->sc_ih == NULL) {
printf("%s: couldn't establish interrupt\n", devname);
return;
Index: src/sys/dev/pci/pccbb.c
diff -u src/sys/dev/pci/pccbb.c:1.202 src/sys/dev/pci/pccbb.c:1.203
--- src/sys/dev/pci/pccbb.c:1.202 Tue Jul 26 22:23:32 2011
+++ src/sys/dev/pci/pccbb.c Mon Aug 1 11:20:26 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pccbb.c,v 1.202 2011/07/26 22:23:32 dyoung Exp $ */
+/* $NetBSD: pccbb.c,v 1.203 2011/08/01 11:20:26 drochner Exp $ */
/*
* Copyright (c) 1998, 1999 and 2000
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pccbb.c,v 1.202 2011/07/26 22:23:32 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pccbb.c,v 1.203 2011/08/01 11:20:26 drochner Exp $");
/*
#define CBB_DEBUG
@@ -120,11 +120,11 @@
STATIC int pccbb_power_ct(cardbus_chipset_tag_t, int);
STATIC int pccbb_cardenable(struct pccbb_softc * sc, int function);
static void *pccbb_intr_establish(struct pccbb_softc *,
- cardbus_intr_line_t irq, int level, int (*ih) (void *), void *sc);
+ int level, int (*ih) (void *), void *sc);
static void pccbb_intr_disestablish(struct pccbb_softc *, void *ih);
static void *pccbb_cb_intr_establish(cardbus_chipset_tag_t,
- cardbus_intr_line_t irq, int level, int (*ih) (void *), void *sc);
+ int level, int (*ih) (void *), void *sc);
static void pccbb_cb_intr_disestablish(cardbus_chipset_tag_t ct, void *ih);
static pcitag_t pccbb_make_tag(cardbus_chipset_tag_t, int, int);
@@ -667,7 +667,6 @@
cba.cba_bus = (busreg >> 8) & 0x0ff;
cba.cba_cc = (void *)sc;
cba.cba_cf = &pccbb_funcs;
- cba.cba_intrline = 0; /* XXX dummy */
#if rbus
cba.cba_rbus_iot = sc->sc_rbus_iot;
@@ -1654,7 +1653,6 @@
/*
* static void *pccbb_cb_intr_establish(cardbus_chipset_tag_t ct,
- * int irq,
* int level,
* int (* func)(void *),
* void *arg)
@@ -1663,15 +1661,15 @@
* order not to call the interrupt handlers of child devices when
* a card-deletion interrupt occurs.
*
- * The arguments irq and level are not used.
+ * The argument level is not used.
*/
static void *
-pccbb_cb_intr_establish(cardbus_chipset_tag_t ct, cardbus_intr_line_t irq,
- int level, int (*func)(void *), void *arg)
+pccbb_cb_intr_establish(cardbus_chipset_tag_t ct, int level,
+ int (*func)(void *), void *arg)
{
struct pccbb_softc *sc = (struct pccbb_softc *)ct;
- return pccbb_intr_establish(sc, irq, level, func, arg);
+ return pccbb_intr_establish(sc, level, func, arg);
}
@@ -1723,11 +1721,10 @@
* order not to call the interrupt handlers of child devices when
* a card-deletion interrupt occurs.
*
- * The arguments irq is not used because pccbb selects intr vector.
*/
static void *
-pccbb_intr_establish(struct pccbb_softc *sc, cardbus_intr_line_t irq,
- int level, int (*func)(void *), void *arg)
+pccbb_intr_establish(struct pccbb_softc *sc, int level,
+ int (*func)(void *), void *arg)
{
struct pccbb_intrhand_list *pil, *newpil;
@@ -2794,7 +2791,7 @@
*/
}
- return pccbb_intr_establish(sc, 0, ipl, func, arg);
+ return pccbb_intr_establish(sc, ipl, func, arg);
}
/*
