Module Name: src Committed By: dyoung Date: Thu Mar 18 20:54:56 UTC 2010
Modified Files: src/sys/dev/cardbus: adv_cardbus.c ahc_cardbus.c com_cardbus.c siisata_cardbus.c uhci_cardbus.c Log Message: This is *always* compiled with #define rbus 1, so get rid of the conditional compilation. Simplify interrupt (dis)establishment by two source transformations: - cardbus_intr_disestablish(cc, cf, ih); + Cardbus_intr_disestablish(ct, ih); - ih = cardbus_intr_establish(cc, cf, ...); + ih = Cardbus_intr_establish(ct, ...); The identical change to a few other CardBus NICs has not caused any problems, as expected, so I'm going to commit this rather safe change and get on with the work. Testers have been enlisted. I will revisit this change if I get any negative responses. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/dev/cardbus/adv_cardbus.c cvs rdiff -u -r1.33 -r1.34 src/sys/dev/cardbus/ahc_cardbus.c cvs rdiff -u -r1.28 -r1.29 src/sys/dev/cardbus/com_cardbus.c cvs rdiff -u -r1.11 -r1.12 src/sys/dev/cardbus/siisata_cardbus.c cvs rdiff -u -r1.16 -r1.17 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.