usb: conform to new handler
wip