Skip to content

USB descriptors: Save flash storage for serial number #4243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tannewt merged 2 commits into from
Feb 23, 2021
Merged

USB descriptors: Save flash storage for serial number #4243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
144acfc
USB descriptors: Save flash storage for serial number
jepler Feb 22, 2021
aa1de69
fix length of generated serial number descriptor
jepler Feb 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions supervisor/shared/usb/usb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ void load_serial_number(void) {
uint8_t raw_id[COMMON_HAL_MCU_PROCESSOR_UID_LENGTH];
common_hal_mcu_processor_get_uid(raw_id);

usb_serial_number[0] = 0x300 | sizeof(usb_serial_number);
for (int i = 0; i < COMMON_HAL_MCU_PROCESSOR_UID_LENGTH; i++) {
for (int j = 0; j < 2; j++) {
uint8_t nibble = (raw_id[i] >> (j * 4)) & 0xf;
Expand Down
42 changes: 22 additions & 20 deletions tools/gen_usb_descriptor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -778,30 +778,32 @@ def make_cdc_iad(cdc_comm_interface, name):
variable_name = StringIndex.index_to_variable[idx]
if not variable_name:
variable_name = "string_descriptor{}".format(idx)
pointers_to_strings.append("{name}".format(name=variable_name))

const = "const "
if variable_name == "usb_serial_number":
const = ""
c_file.write(
"""\
{const}uint16_t {NAME}[] = {{
""".format(
const=const, NAME=variable_name
length = len(b)
c_file.write(" uint16_t {NAME}[{length}];\n".format(NAME=variable_name, length=length//2))
else:
c_file.write(
"""\
const uint16_t {NAME}[] = {{
""".format(
const=const, NAME=variable_name
)
)
)
pointers_to_strings.append("{name}".format(name=variable_name))
n = 0
while i < len(b):
length = b[i]
for j in range(length // 2):
c_file.write("0x{:04x}, ".format(b[i + 2 * j + 1] << 8 | b[i + 2 * j]))
n += 1
c_file.write("\n")
i += length
c_file.write(
"""\
};
"""
n = 0
while i < len(b):
length = b[i]
for j in range(length // 2):
c_file.write("0x{:04x}, ".format(b[i + 2 * j + 1] << 8 | b[i + 2 * j]))
n += 1
c_file.write("\n")
i += length
c_file.write(
"""\
};
"""
)

c_file.write(
Expand Down