GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2025-12-13 01:30:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

simplified find_udc()

Browse Source
This commit is contained in:
Maxim Devaev 2022-03-31 03:37:04 +03:00
parent ed93f1f4d3
commit 94dca7d7c6
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
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) _check_config(config)
udc = usb.find_udc(config.otg.udc)[0] udc = usb.find_udc(config.otg.udc)
logger.info("Using UDC %s", udc) logger.info("Using UDC %s", udc)
logger.info("Creating gadget %r ...", config.otg.gadget) logger.info("Creating gadget %r ...", config.otg.gadget)

2
kvmd/plugins/ugpio/otgbind.py
View File

@ -60,7 +60,7 @@ class Plugin(BaseUserGpioDriver):
return str return str
def prepare(self) -> None: def prepare(self) -> None:
self.__udc = usb.find_udc(self.__udc)[0] self.__udc = usb.find_udc(self.__udc)
get_logger().info("Using UDC %s", self.__udc) get_logger().info("Using UDC %s", self.__udc)
async def run(self) -> None: async def run(self) -> None:

9
kvmd/usb.py
View File

@ -22,15 +22,13 @@
import os import os
from typing import Tuple
from .logging import get_logger from .logging import get_logger
from . import env from . import env
# ===== # =====
def find_udc(udc: str) -> Tuple[str, str]: def find_udc(udc: str) -> str:
path = f"{env.SYSFS_PREFIX}/sys/class/udc" path = f"{env.SYSFS_PREFIX}/sys/class/udc"
candidates = sorted(os.listdir(path)) candidates = sorted(os.listdir(path))
if not udc: if not udc:
@ -39,8 +37,7 @@ def find_udc(udc: str) -> Tuple[str, str]:
udc = candidates[0] udc = candidates[0]
elif udc not in candidates: elif udc not in candidates:
raise RuntimeError(f"Can't find selected UDC: {udc}") raise RuntimeError(f"Can't find selected UDC: {udc}")
driver = os.path.basename(os.readlink(os.path.join(path, udc, "device/driver"))) return udc # fe980000.usb
return (udc, driver) # (fe980000.usb, dwc2)
class UsbDeviceController: class UsbDeviceController:
@ -49,7 +46,7 @@ class UsbDeviceController:
self.__state_path = "" self.__state_path = ""
def find(self) -> None: def find(self) -> None:
udc = find_udc(self.__udc)[0] udc = find_udc(self.__udc)
self.__state_path = os.path.join(f"{env.SYSFS_PREFIX}/sys/class/udc", udc, "state") self.__state_path = os.path.join(f"{env.SYSFS_PREFIX}/sys/class/udc", udc, "state")
get_logger().info("Using UDC %s", udc) get_logger().info("Using UDC %s", udc)