Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev remove some bloat:
details: https://anonhg.NetBSD.org/src/rev/866fb38fd003
branches: trunk
changeset: 767843:866fb38fd003
user: drochner <drochner%NetBSD.org@localhost>
date: Mon Aug 01 11:20:26 2011 +0000
description:
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
diffstat:
sys/dev/cardbus/adv_cardbus.c | 7 +++----
sys/dev/cardbus/ahc_cardbus.c | 7 +++----
sys/dev/cardbus/cardbus.c | 17 +++++++----------
sys/dev/cardbus/cardbusreg.h | 4 +---
sys/dev/cardbus/cardbusvar.h | 17 ++++-------------
sys/dev/cardbus/com_cardbus.c | 9 +++------
sys/dev/cardbus/ehci_cardbus.c | 7 +++----
sys/dev/cardbus/fwohci_cardbus.c | 7 +++----
sys/dev/cardbus/if_ath_cardbus.c | 11 +++--------
sys/dev/cardbus/if_atw_cardbus.c | 12 +++---------
sys/dev/cardbus/if_ex_cardbus.c | 9 +++------
sys/dev/cardbus/if_fxp_cardbus.c | 9 +++------
sys/dev/cardbus/if_ral_cardbus.c | 8 +++-----
sys/dev/cardbus/if_re_cardbus.c | 9 +++------
sys/dev/cardbus/if_rtk_cardbus.c | 9 +++------
sys/dev/cardbus/if_rtw_cardbus.c | 12 +++---------
sys/dev/cardbus/if_tlp_cardbus.c | 12 +++---------
sys/dev/cardbus/njata_cardbus.c | 7 +++----
sys/dev/cardbus/njs_cardbus.c | 7 +++----
sys/dev/cardbus/ohci_cardbus.c | 7 +++----
sys/dev/cardbus/rbus_ppb.c | 11 ++++-------
sys/dev/cardbus/sdhc_cardbus.c | 7 +++----
sys/dev/cardbus/siisata_cardbus.c | 7 +++----
sys/dev/cardbus/uhci_cardbus.c | 7 +++----
sys/dev/pci/pccbb.c | 25 +++++++++++--------------
25 files changed, 87 insertions(+), 157 deletions(-)
diffs (truncated from 1015 to 300 lines):
diff -r edab282c2443 -r 866fb38fd003 sys/dev/cardbus/adv_cardbus.c
--- a/sys/dev/cardbus/adv_cardbus.c Mon Aug 01 11:08:03 2011 +0000
+++ b/sys/dev/cardbus/adv_cardbus.c Mon Aug 01 11:20:26 2011 +0000
@@ -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");
diff -r edab282c2443 -r 866fb38fd003 sys/dev/cardbus/ahc_cardbus.c
--- a/sys/dev/cardbus/ahc_cardbus.c Mon Aug 01 11:08:03 2011 +0000
+++ b/sys/dev/cardbus/ahc_cardbus.c Mon Aug 01 11:20:26 2011 +0000
@@ -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));
diff -r edab282c2443 -r 866fb38fd003 sys/dev/cardbus/cardbus.c
--- a/sys/dev/cardbus/cardbus.c Mon Aug 01 11:08:03 2011 +0000
+++ b/sys/dev/cardbus/cardbus.c Mon Aug 01 11:20:26 2011 +0000
@@ -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
diff -r edab282c2443 -r 866fb38fd003 sys/dev/cardbus/cardbusreg.h
--- a/sys/dev/cardbus/cardbusreg.h Mon Aug 01 11:08:03 2011 +0000
+++ b/sys/dev/cardbus/cardbusreg.h Mon Aug 01 11:20:26 2011 +0000
@@ -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
diff -r edab282c2443 -r 866fb38fd003 sys/dev/cardbus/cardbusvar.h
--- a/sys/dev/cardbus/cardbusvar.h Mon Aug 01 11:08:03 2011 +0000
+++ b/sys/dev/cardbus/cardbusvar.h Mon Aug 01 11:20:26 2011 +0000
@@ -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 *);
diff -r edab282c2443 -r 866fb38fd003 sys/dev/cardbus/com_cardbus.c
--- a/sys/dev/cardbus/com_cardbus.c Mon Aug 01 11:08:03 2011 +0000
+++ b/sys/dev/cardbus/com_cardbus.c Mon Aug 01 11:20:26 2011 +0000
@@ -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");
diff -r edab282c2443 -r 866fb38fd003 sys/dev/cardbus/ehci_cardbus.c
--- a/sys/dev/cardbus/ehci_cardbus.c Mon Aug 01 11:08:03 2011 +0000
+++ b/sys/dev/cardbus/ehci_cardbus.c Mon Aug 01 11:20:26 2011 +0000
@@ -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;
diff -r edab282c2443 -r 866fb38fd003 sys/dev/cardbus/fwohci_cardbus.c
--- a/sys/dev/cardbus/fwohci_cardbus.c Mon Aug 01 11:08:03 2011 +0000
+++ b/sys/dev/cardbus/fwohci_cardbus.c Mon Aug 01 11:20:26 2011 +0000
@@ -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);
Home |
Main Index |
Thread Index |
Old Index