Missed some changes needed for previous fix (adding generic_descriptor_count)
Merge branch 'master' of https://github.com/dominicgs/usb-mitm
moved descriptor generation into separate function