DuoS/SDK_SG200x_V2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: DuoS:Develop
Branches Tags
DuoS:develop DuoS:Develop_WinUSB_WCID20 DuoS:Develop_tmp DuoS:Develop_WinUSB DuoS:Develop_WinUSB_WCID10 DuoS:Develop DuoS:Origin DuoS:Release
...
compare: DuoS:fa387c6f7207edd4a9abda2c0ebb29647ecadd3f
Branches Tags
DuoS:Develop_WinUSB_WCID20 DuoS:Develop_tmp DuoS:Develop_WinUSB DuoS:Develop_WinUSB_WCID10 DuoS:Develop DuoS:Origin DuoS:Release DuoS:develop

6 Commits
Develop ... fa387c6f72

Author SHA1 Message Date
gaoyang3513
fa387c6f72 [Mod] 优化 compile_command.json 文件过滤 2024-12-31 23:33:10 +08:00
gaoyang3513
0a3ea3f789 [Bak] Backup 241231 2024-12-31 21:00:07 +08:00
gaoyang3513
65961df77c [Mod] 新增忽略 patch 文件 2024-12-25 13:47:32 +08:00
gaoyang3513
f12d8f36a9 [Mod] 完成 BOS 返回并再请求 Vendor code 2024-12-25 13:37:35 +08:00
gaoyang3513
12dbf26ada [Mod] Linux USB Gadget 支持WinUSB免驱 
[详细说明]
1. 新增 调试宏：CONFIG_GAOYANG；
2. 开启 调试宏：DEBUG，打印USB控制器寄存器信息
 2024-12-24 22:24:15 +08:00
gaoyang3513
5721f88ac8 [Mod] 更新.gitignore 忽略文件 2024-12-24 16:45:10 +08:00
7 changed files with 132 additions and 13 deletions
Expand all files Collapse all files

21
.gitignore vendored
View File

@ -1,22 +1,25 @@
install/
out/
host-tools
host-tools/
tags
.svim
.DS_Store
compile_commands*.json
*~
*.swp
*.swo
*.bak
*.rej
.DS_Store
*.patch
tags
.tags*
cscope.*
ncscope.*
.svim
out/
install/
host-tools/
.vscode/
.cache/
__pycache__
.vscode

2
build/Makefile
View File

@ -301,6 +301,8 @@ ifeq ($(patsubst "%",%,$(CONFIG_ARCH)),arm64)
# Since we will support aarch32 user space even if the kernel is aarch64, install aarch32 headers also
${Q}$(MAKE) -j${NPROC} -C ${KERNEL_PATH} ARCH=arm headers_install INSTALL_HDR_PATH=${KERNEL_PATH}/${KERNEL_OUTPUT_FOLDER}/arm/usr
endif
${Q}mkdir -p ${KERNEL_PATH}/${KERNEL_OUTPUT_FOLDER}/tools
${Q}$(MAKE) -j${NPROC} -C ${KERNEL_PATH}/tools O=${KERNEL_PATH}/${KERNEL_OUTPUT_FOLDER}/tools usb
DTS_DEFATUL_PATHS := \
${BUILD_PATH}/boards/default/dts/${CHIP_ARCH_L} \

1
build/boards/cv181x/sg2000_milkv_duos_glibc_arm64_sd/sg2000_milkv_duos_glibc_arm64_sd_defconfig
View File

@ -27,3 +27,4 @@ CONFIG_TARGET_PACKAGE_MTD-UTILS=y
# CONFIG_TARGET_PACKAGE_RSYSLOG is not set
CONFIG_TARGET_PACKAGE_BUSYBOX_SYSLOGD_SCRIPT=y
CONFIG_TARGET_PACKAGE_NTP=y
CONFIG_USB_F_SS_LB=y

2
device/generic/br_overlay/common/etc/run_usb.sh
View File

@ -256,7 +256,7 @@ start() {
mkdir /dev/usb-ffs/adb -p
mount -t functionfs adb /dev/usb-ffs/adb
if [ -f $ADBD_PATH/adbd ]; then
$ADBD_PATH/adbd &
$ADBD_PATH/adbd &
fi
else
# Start the gadget driver

2
device/generic/rootfs_overlay/duos/mnt/system/usb-ncm.sh
View File

@ -25,7 +25,7 @@ sleep 0.5
set_gpio ${usb_select} 0
sleep 0.5
/etc/uhubon.sh device >> /tmp/ncm.log 2>&1
/etc/uhubon.sh device >> /tmp/ncm.log 2>&1
/etc/run_usb.sh probe ncm >> /tmp/ncm.log 2>&1
/etc/run_usb.sh start ncm >> /tmp/ncm.log 2>&1

2
linux_5.10/drivers/usb/Makefile
View File

@ -66,3 +66,5 @@ obj-$(CONFIG_USBIP_CORE) += usbip/
obj-$(CONFIG_TYPEC) += typec/
obj-$(CONFIG_USB_ROLE_SWITCH) += roles/
subdir-ccflags-y += -DDEBUG -DCONFIG_GAOYANG

115
linux_5.10/drivers/usb/gadget/composite.c
View File

@ -20,6 +20,71 @@
#include "u_os_desc.h"
//#if defined (CONFIG_GAOYANG)
// (struct usb_descriptor_header *) &WINUSB_WCIDDescriptor,
//#endif // defined (CONFIG_GAOYANG)
#if defined (CONFIG_GAOYANG)
#define WINUSB_IF0_WCID_PROPERTIES_SIZE (142)
const uint8_t WINUSB_IF0_WCIDProperties [142] = {
///////////////////////////////////////
/// WCID property descriptor
///////////////////////////////////////
0x8e, 0x00, 0x00, 0x00, /* dwLength */
0x00, 0x01, /* bcdVersion */
0x05, 0x00, /* wIndex */
0x01, 0x00, /* wCount */
///////////////////////////////////////
/// registry propter descriptor
///////////////////////////////////////
0x84, 0x00, 0x00, 0x00, /* dwSize */
0x01, 0x00, 0x00, 0x00, /* dwPropertyDataType */
0x28, 0x00, /* wPropertyNameLength */
/* DeviceInterfaceGUID */
'D', 0x00, 'e', 0x00, 'v', 0x00, 'i', 0x00, /* wcName_20 */
'c', 0x00, 'e', 0x00, 'I', 0x00, 'n', 0x00, /* wcName_20 */
't', 0x00, 'e', 0x00, 'r', 0x00, 'f', 0x00, /* wcName_20 */
'a', 0x00, 'c', 0x00, 'e', 0x00, 'G', 0x00, /* wcName_20 */
'U', 0x00, 'I', 0x00, 'D', 0x00, 0x00, 0x00, /* wcName_20 */
0x4e, 0x00, 0x00, 0x00, /* dwPropertyDataLength */
/* {1D4B2365-4749-48EA-B38A-7C6FDDDD7E26} */
'{', 0x00, '1', 0x00, 'D', 0x00, '4', 0x00, /* wcData_39 */
'B', 0x00, '2', 0x00, '3', 0x00, '6', 0x00, /* wcData_39 */
'5', 0x00, '-', 0x00, '4', 0x00, '7', 0x00, /* wcData_39 */
'4', 0x00, '9', 0x00, '-', 0x00, '4', 0x00, /* wcData_39 */
'8', 0x00, 'E', 0x00, 'A', 0x00, '-', 0x00, /* wcData_39 */
'B', 0x00, '3', 0x00, '8', 0x00, 'A', 0x00, /* wcData_39 */
'-', 0x00, '7', 0x00, 'C', 0x00, '6', 0x00, /* wcData_39 */
'F', 0x00, 'D', 0x00, 'D', 0x00, 'D', 0x00, /* wcData_39 */
'D', 0x00, '7', 0x00, 'E', 0x00, '2', 0x00, /* wcData_39 */
'6', 0x00, '}', 0x00, 0x00, 0x00, /* wcData_39 */
};
#define WINUSB_WCID_DESCRIPTOR_SIZE (40)
const uint8_t WINUSB_WCIDDescriptor [40] = {
///////////////////////////////////////
/// WCID descriptor
///////////////////////////////////////
0x28, 0x00, 0x00, 0x00, /* dwLength */
0x00, 0x01, /* bcdVersion */
0x04, 0x00, /* wIndex */
0x01, /* bCount */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* bReserved_7 */
///////////////////////////////////////
/// WCID function descriptor
///////////////////////////////////////
0x00, /* bFirstInterfaceNumber */
0x01, /* bReserved */
/* WINUSB */
'W', 'I', 'N', 'U', 'S', 'B', 0x00, 0x00, /* cCID_8 */
/* */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* cSubCID_8 */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* bReserved_6 */
};
#endif // defined (CONFIG_GAOYANG)
/**
* struct usb_os_string - represents OS String to be reported by a gadget
* @bLength: total length of the entire descritor, always 0x12
@ -664,6 +729,35 @@ static int bos_desc(struct usb_composite_dev *cdev)
struct usb_ext_cap_descriptor *usb_ext;
struct usb_dcd_config_params dcd_config_params;
struct usb_bos_descriptor *bos = cdev->req->buf;
#if defined (CONFIG_GAOYANG)
/* WCID20 device capability descriptor */
#define USB_CAP_TYPE_WCID 5
#define USB_CAP_WCID_SIZE 0x1C
#define WINUSB20_WCID_VENDOR_CODE 0x00
#define WINUSB20_WCID_DESC_SET_SIZE 162
struct usb_cap_wcid20_descriptor {
__u8 bLength;
__u8 bDescriptorType;
__u8 bDevCapabilityType;
__u8 bReserved ;
__u8 bPlatformCapabilityUUID_16[16];
__u32 dwWindowsVersion;
__le32 wDescriptorSetTotalLength;
__u8 bVendorCode;
__u8 bAltEnumCode;
} __attribute__((packed));
char winusb20_wcidbos_uuid[] = {
0xdf, 0x60, 0xdd, 0xd8, 0x89, 0x45, 0xc7, 0x4c,
0x9c, 0xd2, 0x65, 0x9d, 0x9e, 0x64, 0x8a, 0x9f,
};
uint32_t winusb20_wcidbos_version = 0x06030000;
struct usb_cap_wcid20_descriptor *usb_cap_wcid;
#endif // defined (CONFIG_GAOYANG)
unsigned int besl = 0;
bos->bLength = USB_DT_BOS_SIZE;
@ -694,7 +788,6 @@ static int bos_desc(struct usb_composite_dev *cdev)
if (dcd_config_params.besl_deep != USB_DEFAULT_BESL_UNSPECIFIED)
besl |= USB_BESL_DEEP_VALID |
USB_SET_BESL_DEEP(dcd_config_params.besl_deep);
/*
* A SuperSpeed device shall include the USB2.0 extension descriptor
* and shall support LPM when operating in USB2.0 HS mode.
@ -708,6 +801,19 @@ static int bos_desc(struct usb_composite_dev *cdev)
usb_ext->bmAttributes = cpu_to_le32(USB_LPM_SUPPORT |
USB_BESL_SUPPORT | besl);
#if defined (CONFIG_GAOYANG)
usb_cap_wcid = cdev->req->buf + le16_to_cpu(bos->wTotalLength);
le16_add_cpu(&bos->wTotalLength, USB_CAP_WCID_SIZE);
bos->bNumDeviceCaps++;
usb_cap_wcid->bLength = USB_CAP_WCID_SIZE;
usb_cap_wcid->bDescriptorType = USB_DT_DEVICE_CAPABILITY;
usb_cap_wcid->bDevCapabilityType = USB_CAP_TYPE_WCID;
usb_cap_wcid->dwWindowsVersion = winusb20_wcidbos_version;
usb_cap_wcid->wDescriptorSetTotalLength = cpu_to_le32(WINUSB20_WCID_DESC_SET_SIZE);
usb_cap_wcid->bVendorCode = WINUSB20_WCID_VENDOR_CODE;
memcpy(usb_cap_wcid->bPlatformCapabilityUUID_16, winusb20_wcidbos_uuid, sizeof(winusb20_wcidbos_uuid));
#endif // defined (CONFIG_GAOYANG)
/*
* The Superspeed USB Capability descriptor shall be implemented by all
* SuperSpeed devices.
@ -1685,7 +1791,7 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
if (gadget->lpm_capable)
cdev->desc.bcdUSB = cpu_to_le16(0x0201);
else
cdev->desc.bcdUSB = cpu_to_le16(0x0200);
cdev->desc.bcdUSB = cpu_to_le16(0x0201);
}
value = min(w_length, (u16) sizeof cdev->desc);
@ -1716,11 +1822,16 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
value = min(w_length, (u16) value);
break;
case USB_DT_BOS:
#if !defined (CONFIG_GAOYANG)
if (gadget_is_superspeed(gadget) ||
gadget->lpm_capable) {
value = bos_desc(cdev);
value = min(w_length, (u16) value);
}
#else
value = bos_desc(cdev);
value = min(w_length, (u16) value);
#endif // defined (CONFIG_GAOYANG)
break;
case USB_DT_OTG:
if (gadget_is_otg(gadget)) {