Module Name: src Committed By: dyoung Date: Fri Feb 26 00:57:02 UTC 2010
Modified Files: src/sys/dev/cardbus: adv_cardbus.c ahc_cardbus.c cardbus.c cardbus_map.c cardbusreg.h com_cardbus.c ehci_cardbus.c fwohci_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 siisata_cardbus.c uhci_cardbus.c Log Message: Use PCI_ constants and macros instead of CARDBUS_. Use Cardbus_conf_{read,write}() instead of cardbus_conf_{read,write}(). Delete all of the CARDBUS_ constants and macros that replicate PCI_. Compile-tested, only. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sys/dev/cardbus/adv_cardbus.c cvs rdiff -u -r1.32 -r1.33 src/sys/dev/cardbus/ahc_cardbus.c cvs rdiff -u -r1.104 -r1.105 src/sys/dev/cardbus/cardbus.c cvs rdiff -u -r1.33 -r1.34 src/sys/dev/cardbus/cardbus_map.c cvs rdiff -u -r1.5 -r1.6 src/sys/dev/cardbus/cardbusreg.h cvs rdiff -u -r1.27 -r1.28 src/sys/dev/cardbus/com_cardbus.c cvs rdiff -u -r1.26 -r1.27 src/sys/dev/cardbus/ehci_cardbus.c cvs rdiff -u -r1.29 -r1.30 src/sys/dev/cardbus/fwohci_cardbus.c cvs rdiff -u -r1.49 -r1.50 src/sys/dev/cardbus/if_ex_cardbus.c cvs rdiff -u -r1.45 -r1.46 src/sys/dev/cardbus/if_fxp_cardbus.c cvs rdiff -u -r1.19 -r1.20 src/sys/dev/cardbus/if_ral_cardbus.c cvs rdiff -u -r1.23 -r1.24 src/sys/dev/cardbus/if_re_cardbus.c cvs rdiff -u -r1.42 -r1.43 src/sys/dev/cardbus/if_rtk_cardbus.c cvs rdiff -u -r1.65 -r1.66 src/sys/dev/cardbus/if_tlp_cardbus.c cvs rdiff -u -r1.11 -r1.12 src/sys/dev/cardbus/njata_cardbus.c cvs rdiff -u -r1.14 -r1.15 src/sys/dev/cardbus/njs_cardbus.c cvs rdiff -u -r1.34 -r1.35 src/sys/dev/cardbus/ohci_cardbus.c \ src/sys/dev/cardbus/rbus_ppb.c cvs rdiff -u -r1.9 -r1.10 src/sys/dev/cardbus/siisata_cardbus.c cvs rdiff -u -r1.15 -r1.16 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.