diff options
author | Warner Losh <imp@FreeBSD.org> | 2004-05-27 03:49:45 +0000 |
---|---|---|
committer | Warner Losh <imp@FreeBSD.org> | 2004-05-27 03:49:45 +0000 |
commit | 2e31e339d14cb2dbcd32c3747ee7589160cd60cf (patch) | |
tree | 03c5a44a01738f0202b18c0c101b670a5d3fb47c | |
parent | 54c9d8aabc9eedb3677747ae4846b391156983ad (diff) | |
download | src-2e31e339d14cb2dbcd32c3747ee7589160cd60cf.tar.gz src-2e31e339d14cb2dbcd32c3747ee7589160cd60cf.zip |
Fix disordering of pccarddevs.h noticed by bde. Also remove a few
redundant includes and fix some of the include disordering.
Submitted by: bde
Notes
Notes:
svn path=/head/; revision=129764
-rw-r--r-- | sys/dev/aic/aic_pccard.c | 2 | ||||
-rw-r--r-- | sys/dev/an/if_an_pccard.c | 7 | ||||
-rw-r--r-- | sys/dev/ata/ata-card.c | 3 | ||||
-rw-r--r-- | sys/dev/awi/if_awi_pccard.c | 3 | ||||
-rw-r--r-- | sys/dev/cs/if_cs_pccard.c | 2 | ||||
-rw-r--r-- | sys/dev/ed/if_ed_pccard.c | 4 | ||||
-rw-r--r-- | sys/dev/ep/if_ep_pccard.c | 2 | ||||
-rw-r--r-- | sys/dev/ex/if_ex_pccard.c | 2 | ||||
-rw-r--r-- | sys/dev/fe/if_fe_pccard.c | 4 | ||||
-rw-r--r-- | sys/dev/joy/joy_pccard.c | 2 | ||||
-rw-r--r-- | sys/dev/ncv/ncr53c500_pccard.c | 17 | ||||
-rw-r--r-- | sys/dev/nsp/nsp_pccard.c | 19 | ||||
-rw-r--r-- | sys/dev/sio/sio_pccard.c | 4 | ||||
-rw-r--r-- | sys/dev/sn/if_sn_pccard.c | 13 | ||||
-rw-r--r-- | sys/dev/stg/tmc18c30_pccard.c | 15 | ||||
-rw-r--r-- | sys/dev/uart/uart_bus_pccard.c | 4 | ||||
-rw-r--r-- | sys/dev/wi/if_wi_pccard.c | 22 | ||||
-rw-r--r-- | sys/dev/xe/if_xe_pccard.c | 9 |
18 files changed, 50 insertions, 84 deletions
diff --git a/sys/dev/aic/aic_pccard.c b/sys/dev/aic/aic_pccard.c index 54d937ec67ad..55831508a966 100644 --- a/sys/dev/aic/aic_pccard.c +++ b/sys/dev/aic/aic_pccard.c @@ -39,9 +39,9 @@ __FBSDID("$FreeBSD$"); #include <dev/aic/aicvar.h> #include <dev/pccard/pccardvar.h> -#include "pccarddevs.h" #include "card_if.h" +#include "pccarddevs.h" struct aic_pccard_softc { struct aic_softc sc_aic; diff --git a/sys/dev/an/if_an_pccard.c b/sys/dev/an/if_an_pccard.c index ad9c6f4bf14d..7b22eace94ad 100644 --- a/sys/dev/an/if_an_pccard.c +++ b/sys/dev/an/if_an_pccard.c @@ -66,13 +66,14 @@ __FBSDID("$FreeBSD$"); #include <net/if_types.h> #include <net/if_media.h> +#include <dev/an/if_aironet_ieee.h> +#include <dev/an/if_anreg.h> + #include <dev/pccard/pccardvar.h> + #include "pccarddevs.h" #include "card_if.h" -#include <dev/an/if_aironet_ieee.h> -#include <dev/an/if_anreg.h> - /* * Support for PCMCIA cards. */ diff --git a/sys/dev/ata/ata-card.c b/sys/dev/ata/ata-card.c index 315b844e200e..118c8183f009 100644 --- a/sys/dev/ata/ata-card.c +++ b/sys/dev/ata/ata-card.c @@ -45,10 +45,11 @@ __FBSDID("$FreeBSD$"); #include <sys/rman.h> #include <dev/ata/ata-all.h> #include <dev/pccard/pccard_cis.h> -#include "pccarddevs.h" #include <dev/pccard/pccardreg.h> #include <dev/pccard/pccardvar.h> +#include "pccarddevs.h" + static const struct pccard_product ata_pccard_products[] = { PCMCIA_CARD(FREECOM, PCCARDIDE, 0), PCMCIA_CARD(EXP, EXPMULTIMEDIA, 0), diff --git a/sys/dev/awi/if_awi_pccard.c b/sys/dev/awi/if_awi_pccard.c index 770e3b4ef1b0..683790a5cb80 100644 --- a/sys/dev/awi/if_awi_pccard.c +++ b/sys/dev/awi/if_awi_pccard.c @@ -51,8 +51,9 @@ __FBSDID("$FreeBSD$"); #include <dev/awi/awivar.h> #include <dev/pccard/pccardvar.h> -#include "pccarddevs.h" + #include "card_if.h" +#include "pccarddevs.h" struct awi_pccard_softc { struct awi_softc sc_awi; diff --git a/sys/dev/cs/if_cs_pccard.c b/sys/dev/cs/if_cs_pccard.c index 69750e0ec59a..721a49a9de91 100644 --- a/sys/dev/cs/if_cs_pccard.c +++ b/sys/dev/cs/if_cs_pccard.c @@ -45,9 +45,9 @@ __FBSDID("$FreeBSD$"); #include <dev/cs/if_csvar.h> #include <dev/cs/if_csreg.h> #include <dev/pccard/pccardvar.h> -#include "pccarddevs.h" #include "card_if.h" +#include "pccarddevs.h" static const struct pccard_product cs_pccard_products[] = { PCMCIA_CARD(IBM, ETHERJET, 0), diff --git a/sys/dev/ed/if_ed_pccard.c b/sys/dev/ed/if_ed_pccard.c index 79e1d9758d54..3770c89a1e76 100644 --- a/sys/dev/ed/if_ed_pccard.c +++ b/sys/dev/ed/if_ed_pccard.c @@ -51,7 +51,6 @@ #include <dev/ed/if_edreg.h> #include <dev/ed/if_edvar.h> #include <dev/pccard/pccardvar.h> -#include "pccarddevs.h" #ifndef ED_NO_MIIBUS #include <dev/mii/mii.h> #include <dev/mii/miivar.h> @@ -61,7 +60,10 @@ #ifndef ED_NO_MIIBUS /* "device miibus" required. See GENERIC if you get errors here. */ #include "miibus_if.h" +#endif +#include "pccarddevs.h" +#ifndef ED_NO_MIIBUS MODULE_DEPEND(ed, miibus, 1, 1, 1); #endif MODULE_DEPEND(ed, ether, 1, 1, 1); diff --git a/sys/dev/ep/if_ep_pccard.c b/sys/dev/ep/if_ep_pccard.c index 21225488986d..021b504e1761 100644 --- a/sys/dev/ep/if_ep_pccard.c +++ b/sys/dev/ep/if_ep_pccard.c @@ -56,9 +56,9 @@ __FBSDID("$FreeBSD$"); #include <dev/ep/if_epvar.h> #include <dev/pccard/pccardvar.h> -#include "pccarddevs.h" #include "card_if.h" +#include "pccarddevs.h" static const char *ep_pccard_identify(u_short id); diff --git a/sys/dev/ex/if_ex_pccard.c b/sys/dev/ex/if_ex_pccard.c index 241a97ff81b5..eb5472f14cc2 100644 --- a/sys/dev/ex/if_ex_pccard.c +++ b/sys/dev/ex/if_ex_pccard.c @@ -44,11 +44,11 @@ __FBSDID("$FreeBSD$"); #include <net/if_arp.h> #include <net/if_media.h> - #include <dev/ex/if_exreg.h> #include <dev/ex/if_exvar.h> #include <dev/pccard/pccardvar.h> + #include "pccarddevs.h" static const struct pccard_product ex_pccard_products[] = { diff --git a/sys/dev/fe/if_fe_pccard.c b/sys/dev/fe/if_fe_pccard.c index ce5f580afd96..49266deeacea 100644 --- a/sys/dev/fe/if_fe_pccard.c +++ b/sys/dev/fe/if_fe_pccard.c @@ -47,9 +47,9 @@ __FBSDID("$FreeBSD$"); #include <dev/fe/if_fevar.h> #include <dev/pccard/pccardvar.h> -#include "pccarddevs.h" + #include "card_if.h" -#include <pccard/cardinfo.h> +#include "pccarddevs.h" /* * PC-Card (PCMCIA) specific code. diff --git a/sys/dev/joy/joy_pccard.c b/sys/dev/joy/joy_pccard.c index 40151f5a90d5..d94819a8c4c2 100644 --- a/sys/dev/joy/joy_pccard.c +++ b/sys/dev/joy/joy_pccard.c @@ -40,8 +40,8 @@ __FBSDID("$FreeBSD$"); #include <sys/rman.h> #include <dev/joy/joyvar.h> -#include <dev/pccard/pccardreg.h> #include <dev/pccard/pccardvar.h> + #include "pccarddevs.h" static int diff --git a/sys/dev/ncv/ncr53c500_pccard.c b/sys/dev/ncv/ncr53c500_pccard.c index 627f1aab89cc..1e97372aa263 100644 --- a/sys/dev/ncv/ncr53c500_pccard.c +++ b/sys/dev/ncv/ncr53c500_pccard.c @@ -40,17 +40,19 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> -#include <sys/systm.h> -#include <sys/malloc.h> #include <sys/errno.h> +#include <sys/kernel.h> +#include <sys/malloc.h> +#include <sys/systm.h> #include <machine/bus.h> #include <machine/bus_pio.h> +#include <machine/resource.h> +#include <sys/rman.h> #include <compat/netbsd/dvcfg.h> #include <sys/device_port.h> -#include "pccarddevs.h" #include <dev/pccard/pccardvar.h> #include <cam/scsi/scsi_low.h> @@ -63,13 +65,8 @@ __FBSDID("$FreeBSD$"); #define KME_KXLC004_01 0x100 #define OFFSET_KME_KXLC004_01 0x10 -#include <sys/kernel.h> -#include <sys/module.h> -#if !defined(__FreeBSD__) || __FreeBSD_version < 500014 -#include <sys/select.h> -#endif -#include <pccard/cardinfo.h> -#include <pccard/slot.h> + +#include "pccarddevs.h" static int ncvprobe(DEVPORT_PDEVICE devi); static int ncvattach(DEVPORT_PDEVICE devi); diff --git a/sys/dev/nsp/nsp_pccard.c b/sys/dev/nsp/nsp_pccard.c index 38af6f484dde..4c61b07d122d 100644 --- a/sys/dev/nsp/nsp_pccard.c +++ b/sys/dev/nsp/nsp_pccard.c @@ -38,18 +38,19 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> -#include <sys/systm.h> -#include <sys/malloc.h> +#include <sys/bus.h> #include <sys/errno.h> - -#include <vm/vm.h> +#include <sys/kernel.h> +#include <sys/malloc.h> +#include <sys/systm.h> #include <machine/bus.h> +#include <machine/resource.h> +#include <sys/rman.h> #include <compat/netbsd/dvcfg.h> #include <sys/device_port.h> -#include "pccarddevs.h" #include <dev/pccard/pccardvar.h> #include <cam/scsi/scsi_low.h> @@ -60,13 +61,7 @@ __FBSDID("$FreeBSD$"); #define NSP_HOSTID 7 -#include <sys/kernel.h> -#include <sys/module.h> -#if !defined(__FreeBSD__) || __FreeBSD_version < 500014 -#include <sys/select.h> -#endif -#include <pccard/cardinfo.h> -#include <pccard/slot.h> +#include "pccarddevs.h" #define PIO_MODE 0x100 /* pd_flags */ diff --git a/sys/dev/sio/sio_pccard.c b/sys/dev/sio/sio_pccard.c index a6660738ca46..cafb143eddd7 100644 --- a/sys/dev/sio/sio_pccard.c +++ b/sys/dev/sio/sio_pccard.c @@ -41,12 +41,12 @@ __FBSDID("$FreeBSD$"); #include <sys/timepps.h> #include <dev/pccard/pccard_cis.h> -#include "pccarddevs.h" -#include <dev/pccard/pccardreg.h> #include <dev/pccard/pccardvar.h> #include <dev/sio/siovar.h> +#include "pccarddevs.h" + static int sio_pccard_attach(device_t dev); static int sio_pccard_match(device_t self); static int sio_pccard_probe(device_t dev); diff --git a/sys/dev/sn/if_sn_pccard.c b/sys/dev/sn/if_sn_pccard.c index 0122a2d6ae2c..3b0409e25301 100644 --- a/sys/dev/sn/if_sn_pccard.c +++ b/sys/dev/sn/if_sn_pccard.c @@ -33,25 +33,20 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> -#include <sys/systm.h> +#include <sys/bus.h> #include <sys/kernel.h> #include <sys/socket.h> +#include <sys/systm.h> -#include <sys/module.h> -#include <sys/bus.h> - -#include <machine/bus.h> -#include <machine/resource.h> - #include <net/ethernet.h> #include <net/if.h> #include <net/if_arp.h> -#include <dev/sn/if_snvar.h> #include <dev/pccard/pccardvar.h> -#include "pccarddevs.h" +#include <dev/sn/if_snvar.h> #include "card_if.h" +#include "pccarddevs.h" static const struct pccard_product sn_pccard_products[] = { PCMCIA_CARD(DSPSI, XJACK, 0), diff --git a/sys/dev/stg/tmc18c30_pccard.c b/sys/dev/stg/tmc18c30_pccard.c index 984f33a5162f..0ea2df0f91b1 100644 --- a/sys/dev/stg/tmc18c30_pccard.c +++ b/sys/dev/stg/tmc18c30_pccard.c @@ -42,9 +42,11 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> -#include <sys/systm.h> -#include <sys/malloc.h> #include <sys/errno.h> +#include <sys/kernel.h> +#include <sys/malloc.h> +#include <sys/module.h> +#include <sys/systm.h> #include <machine/bus.h> #include <machine/bus_pio.h> @@ -52,7 +54,6 @@ __FBSDID("$FreeBSD$"); #include <sys/device_port.h> -#include "pccarddevs.h" #include <dev/pccard/pccardvar.h> #include <cam/scsi/scsi_low.h> @@ -62,13 +63,7 @@ __FBSDID("$FreeBSD$"); #include <dev/stg/tmc18c30var.h> #include <dev/stg/tmc18c30.h> -#include <sys/kernel.h> -#include <sys/module.h> -#if !defined(__FreeBSD__) || __FreeBSD_version < 500014 -#include <sys/select.h> -#endif -#include <pccard/cardinfo.h> -#include <pccard/slot.h> +#include "pccarddevs.h" static const struct pccard_product stg_products[] = { PCMCIA_CARD(FUTUREDOMAIN, SCSI2GO, 0), diff --git a/sys/dev/uart/uart_bus_pccard.c b/sys/dev/uart/uart_bus_pccard.c index 796b2881c7f8..5f0e02b26bab 100644 --- a/sys/dev/uart/uart_bus_pccard.c +++ b/sys/dev/uart/uart_bus_pccard.c @@ -36,13 +36,13 @@ __FBSDID("$FreeBSD$"); #include <machine/resource.h> #include <dev/pccard/pccard_cis.h> -#include "pccarddevs.h" -#include <dev/pccard/pccardreg.h> #include <dev/pccard/pccardvar.h> #include <dev/uart/uart.h> #include <dev/uart/uart_bus.h> +#include "pccarddevs.h" + static int uart_pccard_match(device_t self); static int uart_pccard_probe(device_t dev); diff --git a/sys/dev/wi/if_wi_pccard.c b/sys/dev/wi/if_wi_pccard.c index 941e76a978a0..e1f70be01d60 100644 --- a/sys/dev/wi/if_wi_pccard.c +++ b/sys/dev/wi/if_wi_pccard.c @@ -65,9 +65,6 @@ __FBSDID("$FreeBSD$"); #include <net80211/ieee80211_radiotap.h> #include <dev/pccard/pccardvar.h> -#if __FreeBSD_version >= 500000 -#include "pccarddevs.h" -#endif #include <dev/wi/if_wavelan_ieee.h> #include <dev/wi/if_wireg.h> @@ -77,22 +74,11 @@ __FBSDID("$FreeBSD$"); #endif #include "card_if.h" +#include "pccarddevs.h" static int wi_pccard_probe(device_t); static int wi_pccard_attach(device_t); -#if __FreeBSD_version < 500000 -static device_method_t wi_pccard_methods[] = { - /* Device interface */ - DEVMETHOD(device_probe, wi_pccard_probe), - DEVMETHOD(device_attach, wi_pccard_attach), - DEVMETHOD(device_detach, wi_detach), - DEVMETHOD(device_shutdown, wi_shutdown), - - { 0, 0 } -}; - -#else static int wi_pccard_match(device_t); static device_method_t wi_pccard_methods[] = { @@ -110,8 +96,6 @@ static device_method_t wi_pccard_methods[] = { { 0, 0 } }; -#endif - static driver_t wi_pccard_driver = { "wi", wi_pccard_methods, @@ -121,7 +105,6 @@ static driver_t wi_pccard_driver = { DRIVER_MODULE(wi, pccard, wi_pccard_driver, wi_devclass, 0, 0); MODULE_DEPEND(wi, wlan, 1, 1, 1); -#if __FreeBSD_version >= 500000 static const struct pccard_product wi_pccard_products[] = { PCMCIA_CARD(3COM, 3CRWE737A, 0), PCMCIA_CARD(3COM, 3CRWE777A, 0), @@ -188,7 +171,6 @@ wi_pccard_match(dev) } return (ENXIO); } -#endif static int wi_pccard_probe(dev) @@ -231,7 +213,6 @@ wi_pccard_attach(device_t dev) return (error); } -#if __FreeBSD_version > 500000 /* * The cute little Symbol LA4100-series CF cards need to have * code downloaded to them. @@ -253,7 +234,6 @@ wi_pccard_attach(device_t dev) return (ENXIO); #endif } -#endif retval = wi_attach(dev); if (retval != 0) wi_free(dev); diff --git a/sys/dev/xe/if_xe_pccard.c b/sys/dev/xe/if_xe_pccard.c index cb71f94e2631..1425bb9d6e5f 100644 --- a/sys/dev/xe/if_xe_pccard.c +++ b/sys/dev/xe/if_xe_pccard.c @@ -30,12 +30,10 @@ __FBSDID("$FreeBSD$"); /* xe pccard interface driver */ #include <sys/param.h> -#include <sys/systm.h> +#include <sys/bus.h> #include <sys/kernel.h> #include <sys/socket.h> - -#include <sys/module.h> -#include <sys/bus.h> +#include <sys/systm.h> #include <machine/bus.h> #include <machine/resource.h> @@ -52,9 +50,10 @@ __FBSDID("$FreeBSD$"); #include <dev/xe/if_xevar.h> #include <dev/pccard/pccardvar.h> -#include "pccarddevs.h" #include <dev/pccard/pccard_cis.h> + #include "card_if.h" +#include "pccarddevs.h" /* * Debug logging levels - set with hw.xe.debug sysctl |