system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-22 18:56:38 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

libefivar: Handle USBxxx device path when optional para is not specified

Browse source 
According to UEFI spec,
for the Messaging Device Path with USB Class SubType, some paras
are optional in the text device path.
Take UsbClass(VID,PID,Class,SubClass,Protocol) for example,
The VID is an integer between 0 and 65535 and is optional. The
default value is 0xFFFF.
The PID is an integer between 0 and 65535 and is optional. The
default value is 0xFFFF.
The Class is an integer between 0 and 255 and is optional. The
default value is 0xFF.
The SubClass is an integer between 0 and 255 and is optional. The
default value is 0xFF.
The Protocol is an integer between 0 and 255 and is optional. The
default value is 0xFF.
So if any the optional para is not specified in the text device,
we should set related para in the node structure to default value.

This commit is to do the enhancement for USB Class device path
when optional para is not specified.

Upstream Bug:	https://bugzilla.tianocore.org/show_bug.cgi?id=1243
Obtained from:	3874108034
Pull Request:   https://github.com/freebsd/freebsd-src/pull/581
This commit is contained in:
Jose Luis Duran 2022-02-25 14:54:51 -03:00 committed by Warner Losh
parent 4e83ac7d2e
commit 965f85271c
1 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
lib/libefivar/efivar-dp-parse.c
View file

@ -2185,22 +2185,42 @@ ConvertFromTextUsbClass (
PIDStr = GetNextParamStr (&TextDeviceNode);
if (UsbClassText->ClassExist) {
ClassStr = GetNextParamStr (&TextDeviceNode);
UsbClass->DeviceClass = (UINT8) Strtoi (ClassStr);
if (*ClassStr == '\0') {
UsbClass->DeviceClass = 0xFF;
} else {
UsbClass->DeviceClass = (UINT8) Strtoi (ClassStr);
}
} else {
UsbClass->DeviceClass = UsbClassText->Class;
}
if (UsbClassText->SubClassExist) {
SubClassStr = GetNextParamStr (&TextDeviceNode);
UsbClass->DeviceSubClass = (UINT8) Strtoi (SubClassStr);
if (*SubClassStr == '\0') {
UsbClass->DeviceSubClass = 0xFF;
} else {
UsbClass->DeviceSubClass = (UINT8) Strtoi (SubClassStr);
}
} else {
UsbClass->DeviceSubClass = UsbClassText->SubClass;
}
ProtocolStr = GetNextParamStr (&TextDeviceNode);
UsbClass->VendorId = (UINT16) Strtoi (VIDStr);
UsbClass->ProductId = (UINT16) Strtoi (PIDStr);
UsbClass->DeviceProtocol = (UINT8) Strtoi (ProtocolStr);
if (*VIDStr == '\0') {
UsbClass->VendorId = 0xFFFF;
} else {
UsbClass->VendorId = (UINT16) Strtoi (VIDStr);
}
if (*PIDStr == '\0') {
UsbClass->ProductId = 0xFFFF;
} else {
UsbClass->ProductId = (UINT16) Strtoi (PIDStr);
}
if (*ProtocolStr == '\0') {
UsbClass->DeviceProtocol = 0xFF;
} else {
UsbClass->DeviceProtocol = (UINT8) Strtoi (ProtocolStr);
}
return (EFI_DEVICE_PATH_PROTOCOL *) UsbClass;
}