GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2026-03-18 17:06:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

improved otgbind

Browse Source
This commit is contained in:
Maxim Devaev
2022-03-30 23:37:10 +03:00
parent 2d4aa93f06
commit ed93f1f4d3
4 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kvmd/apps/kvmd/__init__.py
View File

@@ -86,7 +86,7 @@ def main(argv: Optional[List[str]]=None) -> None:
),
info_manager=InfoManager(global_config),
log_reader=LogReader(),
user_gpio=UserGpio(config.gpio, global_config.otg.udc),
user_gpio=UserGpio(config.gpio, global_config.otg.udc, global_config.otg.gadget),
ocr=TesseractOcr(**config.ocr._unpack()),
hid=hid,

4
kvmd/apps/kvmd/ugpio.py
View File

@@ -231,7 +231,7 @@ class _GpioOutput: # pylint: disable=too-many-instance-attributes
# =====
class UserGpio:
def __init__(self, config: Section, udc: str) -> None:
def __init__(self, config: Section, udc: str, gadget: str) -> None:
self.__view = config.view
self.__notifier = aiotools.AioNotifier()
@@ -241,7 +241,7 @@ class UserGpio:
instance_name=driver,
notifier=self.__notifier,
**drv_config._unpack(ignore=["instance_name", "notifier", "type"]),
**({"udc": udc} if drv_config.type == "otgbind" else {}), # Hack
**({"udc": udc, "gadget": gadget} if drv_config.type == "otgbind" else {}), # Hack
)
for (driver, drv_config) in tools.sorted_kvs(config.drivers)
}

10
kvmd/apps/otg/__init__.py
View File

@@ -186,7 +186,7 @@ def _cmd_start(config: Section) -> None: # pylint: disable=too-many-statements
_check_config(config)
(udc, usb_driver) = usb.find_udc(config.otg.udc)
udc = usb.find_udc(config.otg.udc)[0]
logger.info("Using UDC %s", udc)
logger.info("Creating gadget %r ...", config.otg.gadget)
@@ -258,10 +258,8 @@ def _cmd_start(config: Section) -> None: # pylint: disable=too-many-statements
_write(join(gadget_path, "UDC"), udc)
time.sleep(config.otg.init_delay)
logger.info("Setting %s bind permissions ...", usb_driver)
driver_path = f"{env.SYSFS_PREFIX}/sys/bus/platform/drivers/{usb_driver}"
_chown(join(driver_path, "bind"), config.otg.user)
_chown(join(driver_path, "unbind"), config.otg.user)
logger.info("Setting UDC permissions ...")
_chown(join(gadget_path, "UDC"), config.otg.user)
logger.info("Ready to work")
@@ -277,7 +275,7 @@ def _cmd_stop(config: Section) -> None:
gadget_path = join(f"{env.SYSFS_PREFIX}/sys/kernel/config/usb_gadget", config.otg.gadget)
logger.info("Disabling gadget %r ...", config.otg.gadget)
_write(join(gadget_path, "UDC"), "")
_write(join(gadget_path, "UDC"), "\n")
_unlink(join(gadget_path, "os_desc/c.1"), True)