Module Name: src Committed By: dyoung Date: Thu Feb 25 23:40:39 UTC 2010
Modified Files: src/sys/dev/cardbus: adv_cardbus.c ahc_cardbus.c 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_tlp_cardbus.c njata_cardbus.c njs_cardbus.c ohci_cardbus.c rbus_ppb.c uhci_cardbus.c src/sys/dev/ic: i82557.c i82557var.h Log Message: Make fxp at cardbus detach during shutdown. Stop calling (*cardbus_ctrl) to enable bus mastering, I/O and memory spaces on the CardBus bridge. cbb(4) always enables that stuff, anyway. In the process, avoid remembering what BAR we mapped by writing CARDBUS_{IO,MEM}_ENABLE to sc_cben or sc_cbenable, and record the BAR in use sc_bar, instead. Replace more CARDBUS_ constants with PCI_ constants. Compile-tested, only. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/dev/cardbus/adv_cardbus.c cvs rdiff -u -r1.30 -r1.31 src/sys/dev/cardbus/ahc_cardbus.c cvs rdiff -u -r1.26 -r1.27 src/sys/dev/cardbus/com_cardbus.c cvs rdiff -u -r1.25 -r1.26 src/sys/dev/cardbus/ehci_cardbus.c cvs rdiff -u -r1.28 -r1.29 src/sys/dev/cardbus/fwohci_cardbus.c cvs rdiff -u -r1.39 -r1.40 src/sys/dev/cardbus/if_ath_cardbus.c cvs rdiff -u -r1.31 -r1.32 src/sys/dev/cardbus/if_atw_cardbus.c cvs rdiff -u -r1.47 -r1.48 src/sys/dev/cardbus/if_ex_cardbus.c cvs rdiff -u -r1.44 -r1.45 src/sys/dev/cardbus/if_fxp_cardbus.c cvs rdiff -u -r1.18 -r1.19 src/sys/dev/cardbus/if_ral_cardbus.c cvs rdiff -u -r1.21 -r1.22 src/sys/dev/cardbus/if_re_cardbus.c cvs rdiff -u -r1.40 -r1.41 src/sys/dev/cardbus/if_rtk_cardbus.c cvs rdiff -u -r1.63 -r1.64 src/sys/dev/cardbus/if_tlp_cardbus.c cvs rdiff -u -r1.10 -r1.11 src/sys/dev/cardbus/njata_cardbus.c cvs rdiff -u -r1.13 -r1.14 src/sys/dev/cardbus/njs_cardbus.c cvs rdiff -u -r1.33 -r1.34 src/sys/dev/cardbus/ohci_cardbus.c \ src/sys/dev/cardbus/rbus_ppb.c cvs rdiff -u -r1.14 -r1.15 src/sys/dev/cardbus/uhci_cardbus.c cvs rdiff -u -r1.131 -r1.132 src/sys/dev/ic/i82557.c cvs rdiff -u -r1.47 -r1.48 src/sys/dev/ic/i82557var.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.