Diag mode has become a bit more complicated, so adding support
for the new interfaces.
Signed-off-by: Philippe De Swert <philippe.deswert@jollamobile.com>