Skip to content

UDEFX2: Convert g_LanguageDescriptor type to USB_STRING_DESCRIPTOR #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
forderud wants to merge 1 commit into
base: master
Choose a base branch
from
Open

UDEFX2: Convert g_LanguageDescriptor type to USB_STRING_DESCRIPTOR #38

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions UDEFX2/usbdevice.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,13 @@ DECLARE_CONST_UNICODE_STRING(g_ManufacturerStringEnUs, L"Microsoft");
DECLARE_CONST_UNICODE_STRING(g_ProductStringEnUs, L"UDE Client");


const USHORT AMERICAN_ENGLISH = 0x409;
#define AMERICAN_ENGLISH 0x0409

const UCHAR g_LanguageDescriptor[] = { 4,3,9,4 };
const USB_STRING_DESCRIPTOR g_LanguageDescriptor = {
sizeof(USB_STRING_DESCRIPTOR),// bLength
USB_STRING_DESCRIPTOR_TYPE, // bDescriptorType
AMERICAN_ENGLISH // bString[1]
};



Expand Down Expand Up @@ -116,18 +120,11 @@ UsbValidateConstants(
//
// C_ASSERT doesn't treat these expressions as constant, so use NT_ASSERT
//
NT_ASSERT(((PUSB_STRING_DESCRIPTOR)g_LanguageDescriptor)->bString[0] == AMERICAN_ENGLISH);
//NT_ASSERT(((PUSB_STRING_DESCRIPTOR)g_LanguageDescriptor)->bString[1] == PRC_CHINESE);

NT_ASSERT(((PUSB_CONFIGURATION_DESCRIPTOR)g_UsbConfigDescriptorSet)->wTotalLength ==
sizeof(g_UsbConfigDescriptorSet));
NT_ASSERT(((PUSB_STRING_DESCRIPTOR)g_LanguageDescriptor)->bLength ==
sizeof(g_LanguageDescriptor));

NT_ASSERT(((PUSB_CONFIGURATION_DESCRIPTOR)g_UsbConfigDescriptorSet)->bDescriptorType ==
USB_CONFIGURATION_DESCRIPTOR_TYPE);
NT_ASSERT(((PUSB_STRING_DESCRIPTOR)g_LanguageDescriptor)->bDescriptorType ==
USB_STRING_DESCRIPTOR_TYPE);
}


Expand Down Expand Up @@ -197,7 +194,7 @@ Usb_Initialize(
// String descriptors
//
status = UdecxUsbDeviceInitAddDescriptorWithIndex(controllerContext->ChildDeviceInit,
(PUCHAR)g_LanguageDescriptor,
(PUCHAR)&g_LanguageDescriptor,
sizeof(g_LanguageDescriptor),
0);

Expand Down