-define "addr" differently for ISA and PCI devices - for PCI, it is (bus,device,function) now, in the format used by the PCI BIOS
give global constants more meaningful names
little hacking by me. This isn't strictly identical to his 920312 release -- I've hacked it a bit -- but since we are taking over change control it doesn't matter much.