MdeModulePkg/UefiBootManager: Remove serial number from description

This commit is contained in:
Tim Crawford
2020-02-12 10:11:41 -07:00
parent 67c4655bea
commit 71ce340b44

View File

@ -179,15 +179,15 @@ BmGetDescriptionFromDiskInfo (
} }
Length = Index; Length = Index;
Description[Length++] = L' '; //Description[Length++] = L' ';
for (Index = 0; Index + 1 < SerialNumberLength; Index += 2) { //for (Index = 0; Index + 1 < SerialNumberLength; Index += 2) {
Description[Length + Index] = (CHAR16) IdentifyData.SerialNo[Index + 1]; // Description[Length + Index] = (CHAR16) IdentifyData.SerialNo[Index + 1];
Description[Length + Index + 1] = (CHAR16) IdentifyData.SerialNo[Index]; // Description[Length + Index + 1] = (CHAR16) IdentifyData.SerialNo[Index];
} //}
Length += Index; //Length += Index;
Description[Length++] = L'\0'; Description[Length++] = L'\0';
ASSERT (Length == ModelNameLength + SerialNumberLength + 2); //ASSERT (Length == ModelNameLength + SerialNumberLength + 2);
BmEliminateExtraSpaces (Description); BmEliminateExtraSpaces (Description);
} }
@ -309,15 +309,16 @@ BmGetUsbDescription (
Product = &NullChar; Product = &NullChar;
} }
Status = UsbIo->UsbGetStringDescriptor ( //Status = UsbIo->UsbGetStringDescriptor (
UsbIo, // UsbIo,
mBmUsbLangId, // mBmUsbLangId,
DevDesc.StrSerialNumber, // DevDesc.StrSerialNumber,
&SerialNumber // &SerialNumber
); // );
if (EFI_ERROR (Status)) { //if (EFI_ERROR (Status)) {
SerialNumber = &NullChar; // SerialNumber = &NullChar;
} //}
SerialNumber = &NullChar;
if ((Manufacturer == &NullChar) && if ((Manufacturer == &NullChar) &&
(Product == &NullChar) && (Product == &NullChar) &&
@ -630,15 +631,15 @@ BmGetNvmeDescription (
for (Index = 0; Index < ARRAY_SIZE (ControllerData.Mn); Index++) { for (Index = 0; Index < ARRAY_SIZE (ControllerData.Mn); Index++) {
*(Char++) = (CHAR16) ControllerData.Mn[Index]; *(Char++) = (CHAR16) ControllerData.Mn[Index];
} }
*(Char++) = L' '; //*(Char++) = L' ';
for (Index = 0; Index < ARRAY_SIZE (ControllerData.Sn); Index++) { //for (Index = 0; Index < ARRAY_SIZE (ControllerData.Sn); Index++) {
*(Char++) = (CHAR16) ControllerData.Sn[Index]; // *(Char++) = (CHAR16) ControllerData.Sn[Index];
} //}
*(Char++) = L' '; //*(Char++) = L' ';
UnicodeValueToStringS ( //UnicodeValueToStringS (
Char, sizeof (CHAR16) * (MAXIMUM_VALUE_CHARACTERS + 1), // Char, sizeof (CHAR16) * (MAXIMUM_VALUE_CHARACTERS + 1),
0, DevicePath.NvmeNamespace->NamespaceId, 0 // 0, DevicePath.NvmeNamespace->NamespaceId, 0
); // );
BmEliminateExtraSpaces (Description); BmEliminateExtraSpaces (Description);
} }