From: Chris Wedgwood <cw@f00f.org>

Seperate function, cruft removed and old_hwif
renamed to something less confusing.