djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add validation

This commit is contained in:
Kamil Tomaszewski 2019-10-04 11:00:00 +02:00
parent 7aefcc449a
commit 1205d3e305
2 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
supervisor/supervisor.mk
View File

@ -94,8 +94,8 @@ ifndef USB_HID_DEVICES
USB_HID_DEVICES = "KEYBOARD,MOUSE,CONSUMER,GAMEPAD"
endif
ifndef USB_RELATIVE_EP_NUM
USB_RELATIVE_EP_NUM = 1
ifndef USB_RENUMBER_ENDPOINTS
USB_RENUMBER_ENDPOINTS = 1
endif
ifndef USB_CDC_EP_NUM_NOTIFICATION
@ -149,7 +149,7 @@ autogen_usb_descriptor.intermediate: ../../tools/gen_usb_descriptor.py Makefile
--serial_number_length $(USB_SERIAL_NUMBER_LENGTH)\
--devices $(USB_DEVICES)\
--hid_devices $(USB_HID_DEVICES)\
--relative_ep_num $(USB_RELATIVE_EP_NUM)\
--renumber_endpoints $(USB_RENUMBER_ENDPOINTS)\
--cdc_ep_num_notification $(USB_CDC_EP_NUM_NOTIFICATION)\
--cdc_ep_num_data_out $(USB_CDC_EP_NUM_DATA_OUT)\
--cdc_ep_num_data_in $(USB_CDC_EP_NUM_DATA_IN)\

33
tools/gen_usb_descriptor.py
View File

@ -32,7 +32,7 @@ parser.add_argument('--devices', type=lambda l: tuple(l.split(',')), default=DEF
help='devices to include in descriptor (AUDIO includes MIDI support)')
parser.add_argument('--hid_devices', type=lambda l: tuple(l.split(',')), default=DEFAULT_HID_DEVICES,
help='HID devices to include in HID report descriptor')
parser.add_argument('--relative_ep_num', type=int, default=1,
parser.add_argument('--renumber_endpoints', type=int, default=1,
help='use relative(1) or absolute(0) endpoint number')
parser.add_argument('--cdc_ep_num_notification', type=int, default=0,
help='endpoint number of CDC NOTIFICATION')
@ -63,6 +63,24 @@ unknown_hid_devices = list(frozenset(args.hid_devices) - ALL_HID_DEVICES_SET)
if unknown_hid_devices:
raise ValueError("Unknown HID devices(s)", unknown_hid_devices)
if not args.renumber_endpoints:
if 'CDC' in args.devices:
if (args.cdc_ep_num_notification == 0 or args.cdc_ep_num_data_out == 0 or
args.cdc_ep_num_data_in == 0):
raise ValueError("Endpoint address must not be 0")
if 'MSC' in args.devices:
if args.msc_ep_num_out == 0 or args.msc_ep_num_in == 0:
raise ValueError("Endpoint address must not be 0")
if 'HID' in args.devices:
if args.hid_ep_num_in == 0:
raise ValueError("Endpoint address must not be 0")
if 'AUDIO' in args.devices:
if args.midi_ep_num_out == 0 or args.midi_ep_num_in == 0:
raise ValueError("Endpoint address must not be 0")
class StringIndex:
"""Assign a monotonically increasing index to each unique string. Start with 0."""
string_to_index = {}
@ -323,15 +341,10 @@ if 'HID' in args.devices:
if 'AUDIO' in args.devices:
interfaces_to_join.append(audio_interfaces)
if args.relative_ep_num:
# util.join_interfaces() will renumber the endpoints to make them unique across descriptors,
# and renumber the interfaces in order. But we still need to fix up certain
# interface cross-references.
interfaces = util.join_interfaces(*interfaces_to_join)
else:
# util.renumbers_interfaces() will renumber the interfaces in order. But we still need to
# fix up certain interface cross-references.
interfaces = util.renumbers_interfaces(*interfaces_to_join)
# util.join_interfaces() will renumber the endpoints to make them unique across descriptors,
# and renumber the interfaces in order. But we still need to fix up certain
# interface cross-references.
interfaces = util.join_interfaces(interfaces_to_join, renumber_endpoints=args.renumber_endpoints)
# Now adjust the CDC interface cross-references.