otg: renamed product, removed configuration name

This commit is contained in:
Maxim Devaev 2025-02-22 19:33:56 +02:00
parent 876ff22bd8
commit 182aa0e374
2 changed files with 5 additions and 4 deletions

View File

@ -561,15 +561,15 @@ def _get_config_scheme() -> dict:
"vendor_id": Option(0x1D6B, type=valid_otg_id), # Linux Foundation "vendor_id": Option(0x1D6B, type=valid_otg_id), # Linux Foundation
"product_id": Option(0x0104, type=valid_otg_id), # Multifunction Composite Gadget "product_id": Option(0x0104, type=valid_otg_id), # Multifunction Composite Gadget
"manufacturer": Option("PiKVM", type=valid_stripped_string), "manufacturer": Option("PiKVM", type=valid_stripped_string),
"product": Option("Composite KVM Device", type=valid_stripped_string), "product": Option("PiKVM Composite Device", type=valid_stripped_string),
"serial": Option("CAFEBABE", type=valid_stripped_string, if_none=None), "serial": Option("CAFEBABE", type=valid_stripped_string, if_none=None),
"config": Option("", type=valid_stripped_string),
"device_version": Option(-1, type=functools.partial(valid_number, min=-1, max=0xFFFF)), "device_version": Option(-1, type=functools.partial(valid_number, min=-1, max=0xFFFF)),
"usb_version": Option(0x0200, type=valid_otg_id), "usb_version": Option(0x0200, type=valid_otg_id),
"max_power": Option(250, type=functools.partial(valid_number, min=50, max=500)), "max_power": Option(250, type=functools.partial(valid_number, min=50, max=500)),
"remote_wakeup": Option(True, type=valid_bool), "remote_wakeup": Option(True, type=valid_bool),
"gadget": Option("kvmd", type=valid_otg_gadget), "gadget": Option("kvmd", type=valid_otg_gadget),
"config": Option("PiKVM device", type=valid_stripped_string_not_empty),
"udc": Option("", type=valid_stripped_string), "udc": Option("", type=valid_stripped_string),
"endpoints": Option(9, type=valid_int_f0), "endpoints": Option(9, type=valid_int_f0),
"init_delay": Option(3.0, type=valid_float_f01), "init_delay": Option(3.0, type=valid_float_f01),

View File

@ -285,8 +285,9 @@ def _cmd_start(config: Section) -> None: # pylint: disable=too-many-statements,
profile_path = join(gadget_path, usb.G_PROFILE) profile_path = join(gadget_path, usb.G_PROFILE)
_mkdir(profile_path) _mkdir(profile_path)
if config.otg.config:
_mkdir(join(profile_path, "strings/0x409")) _mkdir(join(profile_path, "strings/0x409"))
_write(join(profile_path, "strings/0x409/configuration"), f"Config 1: {config.otg.config}") _write(join(profile_path, "strings/0x409/configuration"), config.otg.config)
_write(join(profile_path, "MaxPower"), config.otg.max_power) _write(join(profile_path, "MaxPower"), config.otg.max_power)
if config.otg.remote_wakeup: if config.otg.remote_wakeup:
# XXX: Should we use MaxPower=100 with Remote Wakeup? # XXX: Should we use MaxPower=100 with Remote Wakeup?