Clean up the type detection somewhat in preparation for adding support
for more types.

Note this also fixes the type debug printk for the new HXN type.
Signed-off-by: Johan Hovold <johan@kernel.org>