This patch just fixes style, move some #defines to enums, and removes some
old cruft.
Signed-off-by: NHenrique de Moraes Holschuh <hmh@hmh.eng.br>