libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1268 from uestczyh222/master 

[Components][WINUSB]Add Guid config to Kconfig Add VID PID config
This commit is contained in:
ZYH 2018-03-09 15:22:18 +08:00 committed by GitHub
parent eb78535604 55a1c11abc
commit 93387d3a30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components/drivers/Kconfig
View File

@ -181,6 +181,13 @@ menu "Using USB"
default n default n
if RT_USING_USB_DEVICE if RT_USING_USB_DEVICE
config CONFIG_USB_VENDOR_ID
hex "USB Vendor ID"
default 0x0FFE
config CONFIG_USB_PRODUCT_ID
hex "USB Product ID"
default 0x0001
config RT_USB_DEVICE_COMPOSITE config RT_USB_DEVICE_COMPOSITE
bool "Enable composite device" bool "Enable composite device"
default n default n
@ -231,6 +238,11 @@ menu "Using USB"
bool "Enable to use device as winusb device" bool "Enable to use device as winusb device"
default n default n
endif endif
if RT_USB_DEVICE_WINUSB
config RT_WINUSB_GUID
string "Guid for winusb"
default "{6860DC3C-C05F-4807-8807-1CA861CC1D66}"
endif
if RT_USB_DEVICE_MSTORAGE if RT_USB_DEVICE_MSTORAGE
config RT_USB_MSTORAGE_DISK_NAME config RT_USB_MSTORAGE_DISK_NAME
string "msc class disk name" string "msc class disk name"

2
components/drivers/usb/usbdevice/class/winusb.c
View File

@ -105,7 +105,7 @@ const static char* _ustring[] =
}; };
struct usb_os_proerty winusb_proerty[] = struct usb_os_proerty winusb_proerty[] =
{ {
USB_OS_PROERTY_DESC(USB_OS_PROERTY_TYPE_REG_SZ,"DeviceInterfaceGUID","{6860DC3C-C05F-4807-8807-1CA861CC1D66}"), USB_OS_PROERTY_DESC(USB_OS_PROERTY_TYPE_REG_SZ,"DeviceInterfaceGUID",RT_WINUSB_GUID),
}; };
struct usb_os_function_comp_id_descriptor winusb_func_comp_id_desc = struct usb_os_function_comp_id_descriptor winusb_func_comp_id_desc =