updated for latest oscam revision