From 5754f5823bbca3e6ebefbe1ff38fe4cad8b641fe Mon Sep 17 00:00:00 2001 From: Jose Luis Duran Date: Wed, 23 Feb 2022 22:23:57 -0300 Subject: [PATCH] libefivar: Apply uncrustify changes Apply uncrustify changes to .c/.h files. Reduce the diffs with EDK2 to aid with future merges. The unconventional way we've imported this code makes using a vendor branch to manage it at the very least tricky. Update FreeBSD-update to reflect the slight shift in advise. Reviewed by: imp Upstream Bug: https://bugzilla.tianocore.org/show_bug.cgi?id=3737 Obtained from: https://github.com/tianocore/edk2/commit/2f88bd3a1296c522317f1c21377876de63de5be7 Pull Request: https://github.com/freebsd/freebsd-src/pull/581 --- lib/libefivar/FreeBSD-update | 48 +- lib/libefivar/efivar-dp-format.c | 844 ++++++------- lib/libefivar/efivar-dp-parse.c | 1885 +++++++++++++++--------------- lib/libefivar/uefi-dplib.h | 148 ++- lib/libefivar/uefi-guid.c | 18 +- 5 files changed, 1494 insertions(+), 1449 deletions(-) diff --git a/lib/libefivar/FreeBSD-update b/lib/libefivar/FreeBSD-update index 8b45dce8c3a0..375f9ceb9536 100644 --- a/lib/libefivar/FreeBSD-update +++ b/lib/libefivar/FreeBSD-update @@ -1,6 +1,5 @@ -$FreeBSD$ - -For the printing and parsing functionalit, we use the Tianocore routines directly. +For the printing and parsing functionality, we use the Tianocore routines +directly. efivar-dp-format.c is a copy of MdePkg/Library/UefiDevicePathLib/DevicePathToText.c efivar-dp-parse.c is a copy of MdePkg/Library/UefiDevicePathLib/DevicePathFromText.c @@ -9,31 +8,30 @@ These files are first mechnaically processed with sed -e "s/L'/'/;"'s/L"/"/g;s/%g/%36s/g;s/%a/%s/g;s/^VOID/static VOID/g;s/ *$//g' -for several reasons. We're moving from wide rotuines to narrow -routines. The UTC-2 this code is written for is a bad match for -wchar_t which is an int. It's a much better match for plain narrow -characters on FreeBSD. So we pretend that CHAR16 for these files is -really char * (ASCII). +for several reasons. We're moving from wide rotuines to narrow routines. The +UTC-2 this code is written for is a bad match for wchar_t which is an int. It's +a much better match for plain narrow characters on FreeBSD. So we pretend that +CHAR16 for these files is really char * (ASCII). -Next, we have have to convert the Unicode printf that this code -expects to FreeBSD's printf. %g means "Print the GUID" and %a means -"print the ASCII string." so we mechanically convert them. Once we've -done that we can compare efivar-dp-*.c to its source to see what's -changed. Because we go through this indirection, I've done that -outside of svn. To upgrade you have to do these files by hand. You -have to go through and make routines static. +Next, we have have to convert the Unicode printf that this code expects to +FreeBSD's printf. %g means "Print the GUID" and %a means "print the ASCII +string." so we mechanically convert them. Once we've done that we can compare +efivar-dp-*.c to its source to see what's changed. Because we go through this +indirection, I've done that outside of git. To upgrade you have to do these +files by hand. You have to go through and make routines static. -uefi-*.[ch] are internal routines to support this. They've been copied -from EDK2 as well, but in a more hap-hazard manner. This was a trade -off between ease of implementation / upgrade vs pulling in too much -since less than half of any file was needed. +uefi-*.[ch] are internal routines to support this. They've been copied from EDK2 +as well, but in a more hap-hazard manner. This was a trade off between ease of +implementation / upgrade vs pulling in too much since less than half of any file +was needed. efi-osdep.h shims the EDK2 types to FreeBSD's types. It's included by -ProcessorBind.h which EDK2 uses to define the CPU. We keep it separate -from uefi-dplib.h to allow better sharing. +ProcessorBind.h which EDK2 uses to define the CPU. We keep it separate from +uefi-dplib.h to allow better sharing. -uefi-dplib.h shims the EDK2 routines that are needed to FreeBSD's -routines. This is relatively easy since we map all the UCS-2 routines -to simple char * routines. +uefi-dplib.h shims the EDK2 routines that are needed to FreeBSD's routines. This +is relatively easy since we map all the UCS-2 routines to simple char * +routines. -RESIST THE URGE TO CLEAN UP THESE FILES. +RESIST THE URGE TO CLEAN UP THESE FILES. Except when such cleanups help with the +goal of keeping them in sync with EDK2. diff --git a/lib/libefivar/efivar-dp-format.c b/lib/libefivar/efivar-dp-format.c index f70a59a62c83..9003b156f7fe 100644 --- a/lib/libefivar/efivar-dp-format.c +++ b/lib/libefivar/efivar-dp-format.c @@ -89,25 +89,29 @@ SPDX-License-Identifier: BSD-2-Clause-Patent static char * EFIAPI UefiDevicePathLibCatPrint ( - IN OUT POOL_PRINT *Str, - IN const char *Fmt, + IN OUT POOL_PRINT *Str, + IN const char *Fmt, ... ) { - UINTN Count; - VA_LIST Args; + UINTN Count; + VA_LIST Args; VA_START (Args, Fmt); - Count = vsnprintf(NULL, 0, Fmt, Args); - VA_END(Args); + Count = vsnprintf (NULL, 0, Fmt, Args); + VA_END (Args); if ((Str->Count + (Count + 1)) > Str->Capacity) { Str->Capacity = (Str->Count + (Count + 1) * 2); - Str->Str = reallocf(Str->Str, Str->Capacity); + Str->Str = reallocf ( + Str->Str, + Str->Capacity + ); ASSERT (Str->Str != NULL); } + VA_START (Args, Fmt); - vsnprintf(Str->Str + Str->Count, Str->Capacity - Str->Count, Fmt, Args); + vsnprintf (Str->Str + Str->Count, Str->Capacity - Str->Count, Fmt, Args); Str->Count += Count; VA_END (Args); @@ -135,7 +139,7 @@ DevPathToTextPci ( IN BOOLEAN AllowShortcuts ) { - PCI_DEVICE_PATH *Pci; + PCI_DEVICE_PATH *Pci; Pci = DevPath; UefiDevicePathLibCatPrint (Str, "Pci(0x%x,0x%x)", Pci->Device, Pci->Function); @@ -229,94 +233,95 @@ DevPathToTextVendor ( UINT32 FlowControlMap; UINT16 Info; - Vendor = (VENDOR_DEVICE_PATH *) DevPath; + Vendor = (VENDOR_DEVICE_PATH *)DevPath; switch (DevicePathType (&Vendor->Header)) { - case HARDWARE_DEVICE_PATH: - Type = "Hw"; - break; + case HARDWARE_DEVICE_PATH: + Type = "Hw"; + break; - case MESSAGING_DEVICE_PATH: - Type = "Msg"; - if (AllowShortcuts) { - if (CompareGuid (&Vendor->Guid, &gEfiPcAnsiGuid)) { - UefiDevicePathLibCatPrint (Str, "VenPcAnsi()"); - return ; - } else if (CompareGuid (&Vendor->Guid, &gEfiVT100Guid)) { - UefiDevicePathLibCatPrint (Str, "VenVt100()"); - return ; - } else if (CompareGuid (&Vendor->Guid, &gEfiVT100PlusGuid)) { - UefiDevicePathLibCatPrint (Str, "VenVt100Plus()"); - return ; - } else if (CompareGuid (&Vendor->Guid, &gEfiVTUTF8Guid)) { - UefiDevicePathLibCatPrint (Str, "VenUtf8()"); - return ; - } else if (CompareGuid (&Vendor->Guid, &gEfiUartDevicePathGuid)) { - FlowControlMap = (((UART_FLOW_CONTROL_DEVICE_PATH *) Vendor)->FlowControlMap); - switch (FlowControlMap & 0x00000003) { - case 0: - UefiDevicePathLibCatPrint (Str, "UartFlowCtrl(%s)", "None"); - break; + case MESSAGING_DEVICE_PATH: + Type = "Msg"; + if (AllowShortcuts) { + if (CompareGuid (&Vendor->Guid, &gEfiPcAnsiGuid)) { + UefiDevicePathLibCatPrint (Str, "VenPcAnsi()"); + return; + } else if (CompareGuid (&Vendor->Guid, &gEfiVT100Guid)) { + UefiDevicePathLibCatPrint (Str, "VenVt100()"); + return; + } else if (CompareGuid (&Vendor->Guid, &gEfiVT100PlusGuid)) { + UefiDevicePathLibCatPrint (Str, "VenVt100Plus()"); + return; + } else if (CompareGuid (&Vendor->Guid, &gEfiVTUTF8Guid)) { + UefiDevicePathLibCatPrint (Str, "VenUtf8()"); + return; + } else if (CompareGuid (&Vendor->Guid, &gEfiUartDevicePathGuid)) { + FlowControlMap = (((UART_FLOW_CONTROL_DEVICE_PATH *)Vendor)->FlowControlMap); + switch (FlowControlMap & 0x00000003) { + case 0: + UefiDevicePathLibCatPrint (Str, "UartFlowCtrl(%s)", "None"); + break; - case 1: - UefiDevicePathLibCatPrint (Str, "UartFlowCtrl(%s)", "Hardware"); - break; + case 1: + UefiDevicePathLibCatPrint (Str, "UartFlowCtrl(%s)", "Hardware"); + break; - case 2: - UefiDevicePathLibCatPrint (Str, "UartFlowCtrl(%s)", "XonXoff"); - break; + case 2: + UefiDevicePathLibCatPrint (Str, "UartFlowCtrl(%s)", "XonXoff"); + break; - default: - break; - } + default: + break; + } - return ; - } else if (CompareGuid (&Vendor->Guid, &gEfiSasDevicePathGuid)) { - UefiDevicePathLibCatPrint ( - Str, - "SAS(0x%lx,0x%lx,0x%x,", - ((SAS_DEVICE_PATH *) Vendor)->SasAddress, - ((SAS_DEVICE_PATH *) Vendor)->Lun, - ((SAS_DEVICE_PATH *) Vendor)->RelativeTargetPort - ); - Info = (((SAS_DEVICE_PATH *) Vendor)->DeviceTopology); - if (((Info & 0x0f) == 0) && ((Info & BIT7) == 0)) { - UefiDevicePathLibCatPrint (Str, "NoTopology,0,0,0,"); - } else if (((Info & 0x0f) <= 2) && ((Info & BIT7) == 0)) { + return; + } else if (CompareGuid (&Vendor->Guid, &gEfiSasDevicePathGuid)) { UefiDevicePathLibCatPrint ( Str, - "%s,%s,%s,", - ((Info & BIT4) != 0) ? "SATA" : "SAS", - ((Info & BIT5) != 0) ? "External" : "Internal", - ((Info & BIT6) != 0) ? "Expanded" : "Direct" + "SAS(0x%lx,0x%lx,0x%x,", + ((SAS_DEVICE_PATH *)Vendor)->SasAddress, + ((SAS_DEVICE_PATH *)Vendor)->Lun, + ((SAS_DEVICE_PATH *)Vendor)->RelativeTargetPort ); - if ((Info & 0x0f) == 1) { - UefiDevicePathLibCatPrint (Str, "0,"); + Info = (((SAS_DEVICE_PATH *)Vendor)->DeviceTopology); + if (((Info & 0x0f) == 0) && ((Info & BIT7) == 0)) { + UefiDevicePathLibCatPrint (Str, "NoTopology,0,0,0,"); + } else if (((Info & 0x0f) <= 2) && ((Info & BIT7) == 0)) { + UefiDevicePathLibCatPrint ( + Str, + "%s,%s,%s,", + ((Info & BIT4) != 0) ? "SATA" : "SAS", + ((Info & BIT5) != 0) ? "External" : "Internal", + ((Info & BIT6) != 0) ? "Expanded" : "Direct" + ); + if ((Info & 0x0f) == 1) { + UefiDevicePathLibCatPrint (Str, "0,"); + } else { + // + // Value 0x0 thru 0xFF -> Drive 1 thru Drive 256 + // + UefiDevicePathLibCatPrint (Str, "0x%x,", ((Info >> 8) & 0xff) + 1); + } } else { - // - // Value 0x0 thru 0xFF -> Drive 1 thru Drive 256 - // - UefiDevicePathLibCatPrint (Str, "0x%x,", ((Info >> 8) & 0xff) + 1); + UefiDevicePathLibCatPrint (Str, "0x%x,0,0,0,", Info); } - } else { - UefiDevicePathLibCatPrint (Str, "0x%x,0,0,0,", Info); + + UefiDevicePathLibCatPrint (Str, "0x%x)", ((SAS_DEVICE_PATH *)Vendor)->Reserved); + return; + } else if (CompareGuid (&Vendor->Guid, &gEfiDebugPortProtocolGuid)) { + UefiDevicePathLibCatPrint (Str, "DebugPort()"); + return; } - - UefiDevicePathLibCatPrint (Str, "0x%x)", ((SAS_DEVICE_PATH *) Vendor)->Reserved); - return ; - } else if (CompareGuid (&Vendor->Guid, &gEfiDebugPortProtocolGuid)) { - UefiDevicePathLibCatPrint (Str, "DebugPort()"); - return ; } - } - break; - case MEDIA_DEVICE_PATH: - Type = "Media"; - break; + break; - default: - Type = "?"; - break; + case MEDIA_DEVICE_PATH: + Type = "Media"; + break; + + default: + Type = "?"; + break; } DataLength = DevicePathNodeLength (&Vendor->Header) - sizeof (VENDOR_DEVICE_PATH); @@ -324,7 +329,7 @@ DevPathToTextVendor ( if (DataLength != 0) { UefiDevicePathLibCatPrint (Str, ","); for (Index = 0; Index < DataLength; Index++) { - UefiDevicePathLibCatPrint (Str, "%02x", ((VENDOR_DEVICE_PATH_WITH_DATA *) Vendor)->VendorDefinedData[Index]); + UefiDevicePathLibCatPrint (Str, "%02x", ((VENDOR_DEVICE_PATH_WITH_DATA *)Vendor)->VendorDefinedData[Index]); } } @@ -383,7 +388,7 @@ DevPathToTextBmc ( IN BOOLEAN AllowShortcuts ) { - BMC_DEVICE_PATH *Bmc; + BMC_DEVICE_PATH *Bmc; Bmc = DevPath; UefiDevicePathLibCatPrint ( @@ -420,33 +425,33 @@ DevPathToTextAcpi ( Acpi = DevPath; if ((Acpi->HID & PNP_EISA_ID_MASK) == PNP_EISA_ID_CONST) { switch (EISA_ID_TO_NUM (Acpi->HID)) { - case 0x0a03: - UefiDevicePathLibCatPrint (Str, "PciRoot(0x%x)", Acpi->UID); - break; + case 0x0a03: + UefiDevicePathLibCatPrint (Str, "PciRoot(0x%x)", Acpi->UID); + break; - case 0x0a08: - UefiDevicePathLibCatPrint (Str, "PcieRoot(0x%x)", Acpi->UID); - break; + case 0x0a08: + UefiDevicePathLibCatPrint (Str, "PcieRoot(0x%x)", Acpi->UID); + break; - case 0x0604: - UefiDevicePathLibCatPrint (Str, "Floppy(0x%x)", Acpi->UID); - break; + case 0x0604: + UefiDevicePathLibCatPrint (Str, "Floppy(0x%x)", Acpi->UID); + break; - case 0x0301: - UefiDevicePathLibCatPrint (Str, "Keyboard(0x%x)", Acpi->UID); - break; + case 0x0301: + UefiDevicePathLibCatPrint (Str, "Keyboard(0x%x)", Acpi->UID); + break; - case 0x0501: - UefiDevicePathLibCatPrint (Str, "Serial(0x%x)", Acpi->UID); - break; + case 0x0501: + UefiDevicePathLibCatPrint (Str, "Serial(0x%x)", Acpi->UID); + break; - case 0x0401: - UefiDevicePathLibCatPrint (Str, "ParallelPort(0x%x)", Acpi->UID); - break; + case 0x0401: + UefiDevicePathLibCatPrint (Str, "ParallelPort(0x%x)", Acpi->UID); + break; - default: - UefiDevicePathLibCatPrint (Str, "Acpi(PNP%04x,0x%x)", EISA_ID_TO_NUM (Acpi->HID), Acpi->UID); - break; + default: + UefiDevicePathLibCatPrint (Str, "Acpi(PNP%04x,0x%x)", EISA_ID_TO_NUM (Acpi->HID), Acpi->UID); + break; } } else { UefiDevicePathLibCatPrint (Str, "Acpi(0x%08x,0x%x)", Acpi->HID, Acpi->UID); @@ -482,30 +487,33 @@ DevPathToTextAcpiEx ( char CIDText[11]; AcpiEx = DevPath; - HIDStr = (CHAR8 *) (((UINT8 *) AcpiEx) + sizeof (ACPI_EXTENDED_HID_DEVICE_PATH)); + HIDStr = (CHAR8 *)(((UINT8 *)AcpiEx) + sizeof (ACPI_EXTENDED_HID_DEVICE_PATH)); UIDStr = HIDStr + AsciiStrLen (HIDStr) + 1; CIDStr = UIDStr + AsciiStrLen (UIDStr) + 1; if (DisplayOnly) { - if ((EISA_ID_TO_NUM (AcpiEx->HID) == 0x0A03) || - (EISA_ID_TO_NUM (AcpiEx->CID) == 0x0A03 && EISA_ID_TO_NUM (AcpiEx->HID) != 0x0A08)) { - if (AcpiEx->UID == 0) { - UefiDevicePathLibCatPrint (Str, "PciRoot(%s)", UIDStr); - } else { - UefiDevicePathLibCatPrint (Str, "PciRoot(0x%x)", AcpiEx->UID); - } - return; - } + if ((EISA_ID_TO_NUM (AcpiEx->HID) == 0x0A03) || + ((EISA_ID_TO_NUM (AcpiEx->CID) == 0x0A03) && (EISA_ID_TO_NUM (AcpiEx->HID) != 0x0A08))) + { + if (AcpiEx->UID == 0) { + UefiDevicePathLibCatPrint (Str, "PciRoot(%s)", UIDStr); + } else { + UefiDevicePathLibCatPrint (Str, "PciRoot(0x%x)", AcpiEx->UID); + } - if (EISA_ID_TO_NUM (AcpiEx->HID) == 0x0A08 || EISA_ID_TO_NUM (AcpiEx->CID) == 0x0A08) { - if (AcpiEx->UID == 0) { - UefiDevicePathLibCatPrint (Str, "PcieRoot(%s)", UIDStr); - } else { - UefiDevicePathLibCatPrint (Str, "PcieRoot(0x%x)", AcpiEx->UID); - } - return; - } - } + return; + } + + if ((EISA_ID_TO_NUM (AcpiEx->HID) == 0x0A08) || (EISA_ID_TO_NUM (AcpiEx->CID) == 0x0A08)) { + if (AcpiEx->UID == 0) { + UefiDevicePathLibCatPrint (Str, "PcieRoot(%s)", UIDStr); + } else { + UefiDevicePathLibCatPrint (Str, "PcieRoot(0x%x)", AcpiEx->UID); + } + + return; + } + } // // Converts EISA identification to string. @@ -535,10 +543,10 @@ DevPathToTextAcpiEx ( // if (AcpiEx->CID == 0) { UefiDevicePathLibCatPrint ( - Str, - "AcpiExp(%s,0,%s)", - HIDText, - UIDStr + Str, + "AcpiExp(%s,0,%s)", + HIDText, + UIDStr ); } else { UefiDevicePathLibCatPrint ( @@ -607,21 +615,22 @@ DevPathToTextAcpiAdr ( IN BOOLEAN AllowShortcuts ) { - ACPI_ADR_DEVICE_PATH *AcpiAdr; - UINT32 *Addr; - UINT16 Index; - UINT16 Length; - UINT16 AdditionalAdrCount; + ACPI_ADR_DEVICE_PATH *AcpiAdr; + UINT32 *Addr; + UINT16 Index; + UINT16 Length; + UINT16 AdditionalAdrCount; AcpiAdr = DevPath; - Length = (UINT16) DevicePathNodeLength ((EFI_DEVICE_PATH_PROTOCOL *) AcpiAdr); - AdditionalAdrCount = (UINT16) ((Length - 8) / 4); + Length = (UINT16)DevicePathNodeLength ((EFI_DEVICE_PATH_PROTOCOL *)AcpiAdr); + AdditionalAdrCount = (UINT16)((Length - 8) / 4); UefiDevicePathLibCatPrint (Str, "AcpiAdr(0x%x", AcpiAdr->ADR); Addr = &AcpiAdr->ADR + 1; for (Index = 0; Index < AdditionalAdrCount; Index++) { UefiDevicePathLibCatPrint (Str, ",0x%x", Addr[Index]); } + UefiDevicePathLibCatPrint (Str, ")"); } @@ -646,7 +655,7 @@ DevPathToTextAtapi ( IN BOOLEAN AllowShortcuts ) { - ATAPI_DEVICE_PATH *Atapi; + ATAPI_DEVICE_PATH *Atapi; Atapi = DevPath; @@ -746,10 +755,12 @@ DevPathToTextFibreEx ( for (Index = 0; Index < sizeof (FibreEx->WWN) / sizeof (FibreEx->WWN[0]); Index++) { UefiDevicePathLibCatPrint (Str, "%02x", FibreEx->WWN[Index]); } + UefiDevicePathLibCatPrint (Str, ",0x"); for (Index = 0; Index < sizeof (FibreEx->Lun) / sizeof (FibreEx->Lun[0]); Index++) { UefiDevicePathLibCatPrint (Str, "%02x", FibreEx->Lun[Index]); } + UefiDevicePathLibCatPrint (Str, ")"); } @@ -783,10 +794,12 @@ DevPathToTextSasEx ( for (Index = 0; Index < sizeof (SasEx->SasAddress) / sizeof (SasEx->SasAddress[0]); Index++) { UefiDevicePathLibCatPrint (Str, "%02x", SasEx->SasAddress[Index]); } + UefiDevicePathLibCatPrint (Str, ",0x"); for (Index = 0; Index < sizeof (SasEx->Lun) / sizeof (SasEx->Lun[0]); Index++) { UefiDevicePathLibCatPrint (Str, "%02x", SasEx->Lun[Index]); } + UefiDevicePathLibCatPrint (Str, ",0x%x,", SasEx->RelativeTargetPort); if (((SasEx->DeviceTopology & 0x0f) == 0) && ((SasEx->DeviceTopology & BIT7) == 0)) { @@ -812,8 +825,7 @@ DevPathToTextSasEx ( } UefiDevicePathLibCatPrint (Str, ")"); - return ; - + return; } /** @@ -837,17 +849,23 @@ DevPathToTextNVMe ( IN BOOLEAN AllowShortcuts ) { - NVME_NAMESPACE_DEVICE_PATH *Nvme; - UINT8 *Uuid; + NVME_NAMESPACE_DEVICE_PATH *Nvme; + UINT8 *Uuid; Nvme = DevPath; - Uuid = (UINT8 *) &Nvme->NamespaceUuid; + Uuid = (UINT8 *)&Nvme->NamespaceUuid; UefiDevicePathLibCatPrint ( Str, "NVMe(0x%x,%02x-%02x-%02x-%02x-%02x-%02x-%02x-%02x)", Nvme->NamespaceId, - Uuid[7], Uuid[6], Uuid[5], Uuid[4], - Uuid[3], Uuid[2], Uuid[1], Uuid[0] + Uuid[7], + Uuid[6], + Uuid[5], + Uuid[4], + Uuid[3], + Uuid[2], + Uuid[1], + Uuid[0] ); } @@ -899,7 +917,7 @@ DevPathToTextSd ( IN BOOLEAN AllowShortcuts ) { - SD_DEVICE_PATH *Sd; + SD_DEVICE_PATH *Sd; Sd = DevPath; UefiDevicePathLibCatPrint ( @@ -930,7 +948,7 @@ DevPathToTextEmmc ( IN BOOLEAN AllowShortcuts ) { - EMMC_DEVICE_PATH *Emmc; + EMMC_DEVICE_PATH *Emmc; Emmc = DevPath; UefiDevicePathLibCatPrint ( @@ -961,7 +979,7 @@ DevPathToText1394 ( IN BOOLEAN AllowShortcuts ) { - F1394_DEVICE_PATH *F1394DevPath; + F1394_DEVICE_PATH *F1394DevPath; F1394DevPath = DevPath; // @@ -991,7 +1009,7 @@ DevPathToTextUsb ( IN BOOLEAN AllowShortcuts ) { - USB_DEVICE_PATH *Usb; + USB_DEVICE_PATH *Usb; Usb = DevPath; UefiDevicePathLibCatPrint (Str, "USB(0x%x,0x%x)", Usb->ParentPortNumber, Usb->InterfaceNumber); @@ -1025,15 +1043,15 @@ DevPathToTextUsbWWID ( UsbWWId = DevPath; - SerialNumberStr = (CHAR16 *) (&UsbWWId + 1); - Length = (UINT16) ((DevicePathNodeLength ((EFI_DEVICE_PATH_PROTOCOL *) UsbWWId) - sizeof (USB_WWID_DEVICE_PATH)) / sizeof (CHAR16)); - if (Length >= 1 && SerialNumberStr [Length - 1] != 0) { + SerialNumberStr = (CHAR16 *)(&UsbWWId + 1); + Length = (UINT16)((DevicePathNodeLength ((EFI_DEVICE_PATH_PROTOCOL *)UsbWWId) - sizeof (USB_WWID_DEVICE_PATH)) / sizeof (CHAR16)); + if ((Length >= 1) && (SerialNumberStr[Length - 1] != 0)) { // // In case no NULL terminator in SerialNumber, create a new one with NULL terminator // NewStr = AllocateCopyPool ((Length + 1) * sizeof (CHAR16), SerialNumberStr); ASSERT (NewStr != NULL); - NewStr [Length] = 0; + NewStr[Length] = 0; SerialNumberStr = NewStr; } @@ -1068,7 +1086,7 @@ DevPathToTextLogicalUnit ( IN BOOLEAN AllowShortcuts ) { - DEVICE_LOGICAL_UNIT_DEVICE_PATH *LogicalUnit; + DEVICE_LOGICAL_UNIT_DEVICE_PATH *LogicalUnit; LogicalUnit = DevPath; UefiDevicePathLibCatPrint (Str, "Unit(0x%x)", LogicalUnit->Lun); @@ -1095,65 +1113,64 @@ DevPathToTextUsbClass ( IN BOOLEAN AllowShortcuts ) { - USB_CLASS_DEVICE_PATH *UsbClass; - BOOLEAN IsKnownSubClass; - + USB_CLASS_DEVICE_PATH *UsbClass; + BOOLEAN IsKnownSubClass; UsbClass = DevPath; IsKnownSubClass = TRUE; switch (UsbClass->DeviceClass) { - case USB_CLASS_AUDIO: - UefiDevicePathLibCatPrint (Str, "UsbAudio"); - break; + case USB_CLASS_AUDIO: + UefiDevicePathLibCatPrint (Str, "UsbAudio"); + break; - case USB_CLASS_CDCCONTROL: - UefiDevicePathLibCatPrint (Str, "UsbCDCControl"); - break; + case USB_CLASS_CDCCONTROL: + UefiDevicePathLibCatPrint (Str, "UsbCDCControl"); + break; - case USB_CLASS_HID: - UefiDevicePathLibCatPrint (Str, "UsbHID"); - break; + case USB_CLASS_HID: + UefiDevicePathLibCatPrint (Str, "UsbHID"); + break; - case USB_CLASS_IMAGE: - UefiDevicePathLibCatPrint (Str, "UsbImage"); - break; + case USB_CLASS_IMAGE: + UefiDevicePathLibCatPrint (Str, "UsbImage"); + break; - case USB_CLASS_PRINTER: - UefiDevicePathLibCatPrint (Str, "UsbPrinter"); - break; + case USB_CLASS_PRINTER: + UefiDevicePathLibCatPrint (Str, "UsbPrinter"); + break; - case USB_CLASS_MASS_STORAGE: - UefiDevicePathLibCatPrint (Str, "UsbMassStorage"); - break; + case USB_CLASS_MASS_STORAGE: + UefiDevicePathLibCatPrint (Str, "UsbMassStorage"); + break; - case USB_CLASS_HUB: - UefiDevicePathLibCatPrint (Str, "UsbHub"); - break; + case USB_CLASS_HUB: + UefiDevicePathLibCatPrint (Str, "UsbHub"); + break; - case USB_CLASS_CDCDATA: - UefiDevicePathLibCatPrint (Str, "UsbCDCData"); - break; + case USB_CLASS_CDCDATA: + UefiDevicePathLibCatPrint (Str, "UsbCDCData"); + break; - case USB_CLASS_SMART_CARD: - UefiDevicePathLibCatPrint (Str, "UsbSmartCard"); - break; + case USB_CLASS_SMART_CARD: + UefiDevicePathLibCatPrint (Str, "UsbSmartCard"); + break; - case USB_CLASS_VIDEO: - UefiDevicePathLibCatPrint (Str, "UsbVideo"); - break; + case USB_CLASS_VIDEO: + UefiDevicePathLibCatPrint (Str, "UsbVideo"); + break; - case USB_CLASS_DIAGNOSTIC: - UefiDevicePathLibCatPrint (Str, "UsbDiagnostic"); - break; + case USB_CLASS_DIAGNOSTIC: + UefiDevicePathLibCatPrint (Str, "UsbDiagnostic"); + break; - case USB_CLASS_WIRELESS: - UefiDevicePathLibCatPrint (Str, "UsbWireless"); - break; + case USB_CLASS_WIRELESS: + UefiDevicePathLibCatPrint (Str, "UsbWireless"); + break; - default: - IsKnownSubClass = FALSE; - break; + default: + IsKnownSubClass = FALSE; + break; } if (IsKnownSubClass) { @@ -1231,7 +1248,7 @@ DevPathToTextSata ( IN BOOLEAN AllowShortcuts ) { - SATA_DEVICE_PATH *Sata; + SATA_DEVICE_PATH *Sata; Sata = DevPath; UefiDevicePathLibCatPrint ( @@ -1264,7 +1281,7 @@ DevPathToTextI2O ( IN BOOLEAN AllowShortcuts ) { - I2O_DEVICE_PATH *I2ODevPath; + I2O_DEVICE_PATH *I2ODevPath; I2ODevPath = DevPath; UefiDevicePathLibCatPrint (Str, "I2O(0x%x)", I2ODevPath->Tid); @@ -1298,7 +1315,7 @@ DevPathToTextMacAddr ( MacDevPath = DevPath; HwAddressSize = sizeof (EFI_MAC_ADDRESS); - if (MacDevPath->IfType == 0x01 || MacDevPath->IfType == 0x00) { + if ((MacDevPath->IfType == 0x01) || (MacDevPath->IfType == 0x00)) { HwAddressSize = 6; } @@ -1341,8 +1358,8 @@ CatNetworkProtocol ( **/ static VOID CatIPv4Address ( - IN OUT POOL_PRINT *Str, - IN EFI_IPv4_ADDRESS *Address + IN OUT POOL_PRINT *Str, + IN EFI_IPv4_ADDRESS *Address ) { UefiDevicePathLibCatPrint (Str, "%d.%d.%d.%d", Address->Addr[0], Address->Addr[1], Address->Addr[2], Address->Addr[3]); @@ -1356,21 +1373,30 @@ CatIPv4Address ( **/ static VOID CatIPv6Address ( - IN OUT POOL_PRINT *Str, - IN EFI_IPv6_ADDRESS *Address + IN OUT POOL_PRINT *Str, + IN EFI_IPv6_ADDRESS *Address ) { UefiDevicePathLibCatPrint ( - Str, "%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x", - Address->Addr[0], Address->Addr[1], - Address->Addr[2], Address->Addr[3], - Address->Addr[4], Address->Addr[5], - Address->Addr[6], Address->Addr[7], - Address->Addr[8], Address->Addr[9], - Address->Addr[10], Address->Addr[11], - Address->Addr[12], Address->Addr[13], - Address->Addr[14], Address->Addr[15] - ); + Str, + "%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x", + Address->Addr[0], + Address->Addr[1], + Address->Addr[2], + Address->Addr[3], + Address->Addr[4], + Address->Addr[5], + Address->Addr[6], + Address->Addr[7], + Address->Addr[8], + Address->Addr[9], + Address->Addr[10], + Address->Addr[11], + Address->Addr[12], + Address->Addr[13], + Address->Addr[14], + Address->Addr[15] + ); } /** @@ -1402,7 +1428,7 @@ DevPathToTextIPv4 ( if (DisplayOnly) { UefiDevicePathLibCatPrint (Str, ")"); - return ; + return; } UefiDevicePathLibCatPrint (Str, ","); @@ -1416,6 +1442,7 @@ DevPathToTextIPv4 ( UefiDevicePathLibCatPrint (Str, ","); CatIPv4Address (Str, &IPDevPath->SubnetMask); } + UefiDevicePathLibCatPrint (Str, ")"); } @@ -1447,7 +1474,7 @@ DevPathToTextIPv6 ( CatIPv6Address (Str, &IPDevPath->RemoteIpAddress); if (DisplayOnly) { UefiDevicePathLibCatPrint (Str, ")"); - return ; + return; } UefiDevicePathLibCatPrint (Str, ","); @@ -1471,6 +1498,7 @@ DevPathToTextIPv6 ( UefiDevicePathLibCatPrint (Str, ",0x%x,", IPDevPath->PrefixLength); CatIPv6Address (Str, &IPDevPath->GatewayIpAddress); } + UefiDevicePathLibCatPrint (Str, ")"); } @@ -1535,33 +1563,33 @@ DevPathToTextUart ( Uart = DevPath; switch (Uart->Parity) { - case 0: - Parity = 'D'; - break; + case 0: + Parity = 'D'; + break; - case 1: - Parity = 'N'; - break; + case 1: + Parity = 'N'; + break; - case 2: - Parity = 'E'; - break; + case 2: + Parity = 'E'; + break; - case 3: - Parity = 'O'; - break; + case 3: + Parity = 'O'; + break; - case 4: - Parity = 'M'; - break; + case 4: + Parity = 'M'; + break; - case 5: - Parity = 'S'; - break; + case 5: + Parity = 'S'; + break; - default: - Parity = 'x'; - break; + default: + Parity = 'x'; + break; } if (Uart->BaudRate == 0) { @@ -1579,25 +1607,25 @@ DevPathToTextUart ( UefiDevicePathLibCatPrint (Str, "%c,", Parity); switch (Uart->StopBits) { - case 0: - UefiDevicePathLibCatPrint (Str, "D)"); - break; + case 0: + UefiDevicePathLibCatPrint (Str, "D)"); + break; - case 1: - UefiDevicePathLibCatPrint (Str, "1)"); - break; + case 1: + UefiDevicePathLibCatPrint (Str, "1)"); + break; - case 2: - UefiDevicePathLibCatPrint (Str, "1.5)"); - break; + case 2: + UefiDevicePathLibCatPrint (Str, "1.5)"); + break; - case 3: - UefiDevicePathLibCatPrint (Str, "2)"); - break; + case 3: + UefiDevicePathLibCatPrint (Str, "2)"); + break; - default: - UefiDevicePathLibCatPrint (Str, "x)"); - break; + default: + UefiDevicePathLibCatPrint (Str, "x)"); + break; } } @@ -1622,9 +1650,9 @@ DevPathToTextiSCSI ( IN BOOLEAN AllowShortcuts ) { - ISCSI_DEVICE_PATH_WITH_NAME *ISCSIDevPath; - UINT16 Options; - UINTN Index; + ISCSI_DEVICE_PATH_WITH_NAME *ISCSIDevPath; + UINT16 Options; + UINTN Index; ISCSIDevPath = DevPath; UefiDevicePathLibCatPrint ( @@ -1636,6 +1664,7 @@ DevPathToTextiSCSI ( for (Index = 0; Index < sizeof (ISCSIDevPath->Lun) / sizeof (UINT8); Index++) { UefiDevicePathLibCatPrint (Str, "%02x", ((UINT8 *)&ISCSIDevPath->Lun)[Index]); } + Options = ISCSIDevPath->LoginOption; UefiDevicePathLibCatPrint (Str, ",%s,", (((Options >> 1) & 0x0001) != 0) ? "CRC32C" : "None"); UefiDevicePathLibCatPrint (Str, "%s,", (((Options >> 3) & 0x0001) != 0) ? "CRC32C" : "None"); @@ -1645,7 +1674,6 @@ DevPathToTextiSCSI ( UefiDevicePathLibCatPrint (Str, "%s,", "CHAP_UNI"); } else { UefiDevicePathLibCatPrint (Str, "%s,", "CHAP_BI"); - } UefiDevicePathLibCatPrint (Str, "%s)", (ISCSIDevPath->NetworkProtocol == 0) ? "TCP" : "reserved"); @@ -1735,8 +1763,8 @@ DevPathToTextWiFi ( IN BOOLEAN AllowShortcuts ) { - WIFI_DEVICE_PATH *WiFi; - UINT8 SSId[33]; + WIFI_DEVICE_PATH *WiFi; + UINT8 SSId[33]; WiFi = DevPath; @@ -1808,8 +1836,8 @@ DevPathToTextDns ( UINT32 DnsServerIpCount; UINT32 DnsServerIpIndex; - DnsDevPath = DevPath; - DnsServerIpCount = (UINT32) (DevicePathNodeLength(DnsDevPath) - sizeof (EFI_DEVICE_PATH_PROTOCOL) - sizeof (DnsDevPath->IsIPv6)) / sizeof (EFI_IP_ADDRESS); + DnsDevPath = DevPath; + DnsServerIpCount = (UINT32)(DevicePathNodeLength (DnsDevPath) - sizeof (EFI_DEVICE_PATH_PROTOCOL) - sizeof (DnsDevPath->IsIPv6)) / sizeof (EFI_IP_ADDRESS); UefiDevicePathLibCatPrint (Str, "Dns("); @@ -1849,16 +1877,16 @@ DevPathToTextUri ( IN BOOLEAN AllowShortcuts ) { - URI_DEVICE_PATH *Uri; - UINTN UriLength; - CHAR8 *UriStr; + URI_DEVICE_PATH *Uri; + UINTN UriLength; + CHAR8 *UriStr; // // Uri in the device path may not be null terminated. // Uri = DevPath; UriLength = DevicePathNodeLength (Uri) - sizeof (URI_DEVICE_PATH); - UriStr = AllocatePool (UriLength + 1); + UriStr = AllocatePool (UriLength + 1); ASSERT (UriStr != NULL); CopyMem (UriStr, Uri->Uri, UriLength); @@ -1888,39 +1916,39 @@ DevPathToTextHardDrive ( IN BOOLEAN AllowShortcuts ) { - HARDDRIVE_DEVICE_PATH *Hd; + HARDDRIVE_DEVICE_PATH *Hd; Hd = DevPath; switch (Hd->SignatureType) { - case SIGNATURE_TYPE_MBR: - UefiDevicePathLibCatPrint ( - Str, - "HD(%d,%s,0x%08x,", - Hd->PartitionNumber, - "MBR", -// *((UINT32 *) (&(Hd->Signature[0]))) - le32dec(&(Hd->Signature[0])) - ); - break; + case SIGNATURE_TYPE_MBR: + UefiDevicePathLibCatPrint ( + Str, + "HD(%d,%s,0x%08x,", + Hd->PartitionNumber, + "MBR", +// *((UINT32 *)(&(Hd->Signature[0]))) + le32dec(&(Hd->Signature[0])) + ); + break; - case SIGNATURE_TYPE_GUID: - UefiDevicePathLibCatPrint ( - Str, - "HD(%d,%s,%36s,", - Hd->PartitionNumber, - "GPT", - G(&(Hd->Signature[0])) - ); - break; + case SIGNATURE_TYPE_GUID: + UefiDevicePathLibCatPrint ( + Str, + "HD(%d,%s,%36s,", + Hd->PartitionNumber, + "GPT", + G(&(Hd->Signature[0])) + ); + break; - default: - UefiDevicePathLibCatPrint ( - Str, - "HD(%d,%d,0,", - Hd->PartitionNumber, - Hd->SignatureType - ); - break; + default: + UefiDevicePathLibCatPrint ( + Str, + "HD(%d,%d,0,", + Hd->PartitionNumber, + Hd->SignatureType + ); + break; } UefiDevicePathLibCatPrint (Str, "0x%lx,0x%lx)", Hd->PartitionStart, Hd->PartitionSize); @@ -1947,12 +1975,12 @@ DevPathToTextCDROM ( IN BOOLEAN AllowShortcuts ) { - CDROM_DEVICE_PATH *Cd; + CDROM_DEVICE_PATH *Cd; Cd = DevPath; if (DisplayOnly) { UefiDevicePathLibCatPrint (Str, "CDROM(0x%x)", Cd->BootEntry); - return ; + return; } UefiDevicePathLibCatPrint (Str, "CDROM(0x%x,0x%lx,0x%lx)", Cd->BootEntry, Cd->PartitionStart, Cd->PartitionSize); @@ -2084,13 +2112,13 @@ DevPathToTextFvFile ( **/ static VOID DevPathRelativeOffsetRange ( - IN OUT POOL_PRINT *Str, - IN VOID *DevPath, - IN BOOLEAN DisplayOnly, - IN BOOLEAN AllowShortcuts + IN OUT POOL_PRINT *Str, + IN VOID *DevPath, + IN BOOLEAN DisplayOnly, + IN BOOLEAN AllowShortcuts ) { - MEDIA_RELATIVE_OFFSET_RANGE_DEVICE_PATH *Offset; + MEDIA_RELATIVE_OFFSET_RANGE_DEVICE_PATH *Offset; Offset = DevPath; UefiDevicePathLibCatPrint ( @@ -2116,13 +2144,13 @@ DevPathRelativeOffsetRange ( **/ static VOID DevPathToTextRamDisk ( - IN OUT POOL_PRINT *Str, - IN VOID *DevPath, - IN BOOLEAN DisplayOnly, - IN BOOLEAN AllowShortcuts + IN OUT POOL_PRINT *Str, + IN VOID *DevPath, + IN BOOLEAN DisplayOnly, + IN BOOLEAN AllowShortcuts ) { - MEDIA_RAM_DISK_DEVICE_PATH *RamDisk; + MEDIA_RAM_DISK_DEVICE_PATH *RamDisk; RamDisk = DevPath; @@ -2191,38 +2219,38 @@ DevPathToTextBBS ( IN BOOLEAN AllowShortcuts ) { - BBS_BBS_DEVICE_PATH *Bbs; - const char *Type; + BBS_BBS_DEVICE_PATH *Bbs; + const char *Type; Bbs = DevPath; switch (Bbs->DeviceType) { - case BBS_TYPE_FLOPPY: - Type = "Floppy"; - break; + case BBS_TYPE_FLOPPY: + Type = "Floppy"; + break; - case BBS_TYPE_HARDDRIVE: - Type = "HD"; - break; + case BBS_TYPE_HARDDRIVE: + Type = "HD"; + break; - case BBS_TYPE_CDROM: - Type = "CDROM"; - break; + case BBS_TYPE_CDROM: + Type = "CDROM"; + break; - case BBS_TYPE_PCMCIA: - Type = "PCMCIA"; - break; + case BBS_TYPE_PCMCIA: + Type = "PCMCIA"; + break; - case BBS_TYPE_USB: - Type = "USB"; - break; + case BBS_TYPE_USB: + Type = "USB"; + break; - case BBS_TYPE_EMBEDDED_NETWORK: - Type = "Network"; - break; + case BBS_TYPE_EMBEDDED_NETWORK: + Type = "Network"; + break; - default: - Type = NULL; - break; + default: + Type = NULL; + break; } if (Type != NULL) { @@ -2233,7 +2261,7 @@ DevPathToTextBBS ( if (DisplayOnly) { UefiDevicePathLibCatPrint (Str, ")"); - return ; + return; } UefiDevicePathLibCatPrint (Str, ",0x%x)", Bbs->StatusFlag); @@ -2263,13 +2291,13 @@ DevPathToTextEndInstance ( UefiDevicePathLibCatPrint (Str, ","); } -GLOBAL_REMOVE_IF_UNREFERENCED const DEVICE_PATH_TO_TEXT_GENERIC_TABLE mUefiDevicePathLibToTextTableGeneric[] = { - {HARDWARE_DEVICE_PATH, "HardwarePath" }, - {ACPI_DEVICE_PATH, "AcpiPath" }, - {MESSAGING_DEVICE_PATH, "Msg" }, - {MEDIA_DEVICE_PATH, "MediaPath" }, - {BBS_DEVICE_PATH, "BbsPath" }, - {0, NULL} +GLOBAL_REMOVE_IF_UNREFERENCED const DEVICE_PATH_TO_TEXT_GENERIC_TABLE mUefiDevicePathLibToTextTableGeneric[] = { + { HARDWARE_DEVICE_PATH, "HardwarePath" }, + { ACPI_DEVICE_PATH, "AcpiPath" }, + { MESSAGING_DEVICE_PATH, "Msg" }, + { MEDIA_DEVICE_PATH, "MediaPath" }, + { BBS_DEVICE_PATH, "BbsPath" }, + { 0, NULL } }; /** @@ -2293,8 +2321,8 @@ DevPathToTextNodeGeneric ( IN BOOLEAN AllowShortcuts ) { - EFI_DEVICE_PATH_PROTOCOL *Node; - UINTN Index; + EFI_DEVICE_PATH_PROTOCOL *Node; + UINTN Index; Node = DevPath; @@ -2319,65 +2347,65 @@ DevPathToTextNodeGeneric ( Index = sizeof (EFI_DEVICE_PATH_PROTOCOL); if (Index < DevicePathNodeLength (Node)) { UefiDevicePathLibCatPrint (Str, ","); - for (; Index < DevicePathNodeLength (Node); Index++) { - UefiDevicePathLibCatPrint (Str, "%02x", ((UINT8 *) Node)[Index]); + for ( ; Index < DevicePathNodeLength (Node); Index++) { + UefiDevicePathLibCatPrint (Str, "%02x", ((UINT8 *)Node)[Index]); } } UefiDevicePathLibCatPrint (Str, ")"); } -static const DEVICE_PATH_TO_TEXT_TABLE mUefiDevicePathLibToTextTable[] = { - {HARDWARE_DEVICE_PATH, HW_PCI_DP, DevPathToTextPci }, - {HARDWARE_DEVICE_PATH, HW_PCCARD_DP, DevPathToTextPccard }, - {HARDWARE_DEVICE_PATH, HW_MEMMAP_DP, DevPathToTextMemMap }, - {HARDWARE_DEVICE_PATH, HW_VENDOR_DP, DevPathToTextVendor }, - {HARDWARE_DEVICE_PATH, HW_CONTROLLER_DP, DevPathToTextController }, - {HARDWARE_DEVICE_PATH, HW_BMC_DP, DevPathToTextBmc }, - {ACPI_DEVICE_PATH, ACPI_DP, DevPathToTextAcpi }, - {ACPI_DEVICE_PATH, ACPI_EXTENDED_DP, DevPathToTextAcpiEx }, - {ACPI_DEVICE_PATH, ACPI_ADR_DP, DevPathToTextAcpiAdr }, - {MESSAGING_DEVICE_PATH, MSG_ATAPI_DP, DevPathToTextAtapi }, - {MESSAGING_DEVICE_PATH, MSG_SCSI_DP, DevPathToTextScsi }, - {MESSAGING_DEVICE_PATH, MSG_FIBRECHANNEL_DP, DevPathToTextFibre }, - {MESSAGING_DEVICE_PATH, MSG_FIBRECHANNELEX_DP, DevPathToTextFibreEx }, - {MESSAGING_DEVICE_PATH, MSG_SASEX_DP, DevPathToTextSasEx }, - {MESSAGING_DEVICE_PATH, MSG_NVME_NAMESPACE_DP, DevPathToTextNVMe }, - {MESSAGING_DEVICE_PATH, MSG_UFS_DP, DevPathToTextUfs }, - {MESSAGING_DEVICE_PATH, MSG_SD_DP, DevPathToTextSd }, - {MESSAGING_DEVICE_PATH, MSG_EMMC_DP, DevPathToTextEmmc }, - {MESSAGING_DEVICE_PATH, MSG_1394_DP, DevPathToText1394 }, - {MESSAGING_DEVICE_PATH, MSG_USB_DP, DevPathToTextUsb }, - {MESSAGING_DEVICE_PATH, MSG_USB_WWID_DP, DevPathToTextUsbWWID }, - {MESSAGING_DEVICE_PATH, MSG_DEVICE_LOGICAL_UNIT_DP, DevPathToTextLogicalUnit }, - {MESSAGING_DEVICE_PATH, MSG_USB_CLASS_DP, DevPathToTextUsbClass }, - {MESSAGING_DEVICE_PATH, MSG_SATA_DP, DevPathToTextSata }, - {MESSAGING_DEVICE_PATH, MSG_I2O_DP, DevPathToTextI2O }, - {MESSAGING_DEVICE_PATH, MSG_MAC_ADDR_DP, DevPathToTextMacAddr }, - {MESSAGING_DEVICE_PATH, MSG_IPv4_DP, DevPathToTextIPv4 }, - {MESSAGING_DEVICE_PATH, MSG_IPv6_DP, DevPathToTextIPv6 }, - {MESSAGING_DEVICE_PATH, MSG_INFINIBAND_DP, DevPathToTextInfiniBand }, - {MESSAGING_DEVICE_PATH, MSG_UART_DP, DevPathToTextUart }, - {MESSAGING_DEVICE_PATH, MSG_VENDOR_DP, DevPathToTextVendor }, - {MESSAGING_DEVICE_PATH, MSG_ISCSI_DP, DevPathToTextiSCSI }, - {MESSAGING_DEVICE_PATH, MSG_VLAN_DP, DevPathToTextVlan }, - {MESSAGING_DEVICE_PATH, MSG_DNS_DP, DevPathToTextDns }, - {MESSAGING_DEVICE_PATH, MSG_URI_DP, DevPathToTextUri }, - {MESSAGING_DEVICE_PATH, MSG_BLUETOOTH_DP, DevPathToTextBluetooth }, - {MESSAGING_DEVICE_PATH, MSG_WIFI_DP, DevPathToTextWiFi }, - {MESSAGING_DEVICE_PATH, MSG_BLUETOOTH_LE_DP, DevPathToTextBluetoothLE }, - {MEDIA_DEVICE_PATH, MEDIA_HARDDRIVE_DP, DevPathToTextHardDrive }, - {MEDIA_DEVICE_PATH, MEDIA_CDROM_DP, DevPathToTextCDROM }, - {MEDIA_DEVICE_PATH, MEDIA_VENDOR_DP, DevPathToTextVendor }, - {MEDIA_DEVICE_PATH, MEDIA_PROTOCOL_DP, DevPathToTextMediaProtocol }, - {MEDIA_DEVICE_PATH, MEDIA_FILEPATH_DP, DevPathToTextFilePath }, - {MEDIA_DEVICE_PATH, MEDIA_PIWG_FW_VOL_DP, DevPathToTextFv }, - {MEDIA_DEVICE_PATH, MEDIA_PIWG_FW_FILE_DP, DevPathToTextFvFile }, - {MEDIA_DEVICE_PATH, MEDIA_RELATIVE_OFFSET_RANGE_DP, DevPathRelativeOffsetRange }, - {MEDIA_DEVICE_PATH, MEDIA_RAM_DISK_DP, DevPathToTextRamDisk }, - {BBS_DEVICE_PATH, BBS_BBS_DP, DevPathToTextBBS }, - {END_DEVICE_PATH_TYPE, END_INSTANCE_DEVICE_PATH_SUBTYPE, DevPathToTextEndInstance }, - {0, 0, NULL} +static const DEVICE_PATH_TO_TEXT_TABLE mUefiDevicePathLibToTextTable[] = { + { HARDWARE_DEVICE_PATH, HW_PCI_DP, DevPathToTextPci }, + { HARDWARE_DEVICE_PATH, HW_PCCARD_DP, DevPathToTextPccard }, + { HARDWARE_DEVICE_PATH, HW_MEMMAP_DP, DevPathToTextMemMap }, + { HARDWARE_DEVICE_PATH, HW_VENDOR_DP, DevPathToTextVendor }, + { HARDWARE_DEVICE_PATH, HW_CONTROLLER_DP, DevPathToTextController }, + { HARDWARE_DEVICE_PATH, HW_BMC_DP, DevPathToTextBmc }, + { ACPI_DEVICE_PATH, ACPI_DP, DevPathToTextAcpi }, + { ACPI_DEVICE_PATH, ACPI_EXTENDED_DP, DevPathToTextAcpiEx }, + { ACPI_DEVICE_PATH, ACPI_ADR_DP, DevPathToTextAcpiAdr }, + { MESSAGING_DEVICE_PATH, MSG_ATAPI_DP, DevPathToTextAtapi }, + { MESSAGING_DEVICE_PATH, MSG_SCSI_DP, DevPathToTextScsi }, + { MESSAGING_DEVICE_PATH, MSG_FIBRECHANNEL_DP, DevPathToTextFibre }, + { MESSAGING_DEVICE_PATH, MSG_FIBRECHANNELEX_DP, DevPathToTextFibreEx }, + { MESSAGING_DEVICE_PATH, MSG_SASEX_DP, DevPathToTextSasEx }, + { MESSAGING_DEVICE_PATH, MSG_NVME_NAMESPACE_DP, DevPathToTextNVMe }, + { MESSAGING_DEVICE_PATH, MSG_UFS_DP, DevPathToTextUfs }, + { MESSAGING_DEVICE_PATH, MSG_SD_DP, DevPathToTextSd }, + { MESSAGING_DEVICE_PATH, MSG_EMMC_DP, DevPathToTextEmmc }, + { MESSAGING_DEVICE_PATH, MSG_1394_DP, DevPathToText1394 }, + { MESSAGING_DEVICE_PATH, MSG_USB_DP, DevPathToTextUsb }, + { MESSAGING_DEVICE_PATH, MSG_USB_WWID_DP, DevPathToTextUsbWWID }, + { MESSAGING_DEVICE_PATH, MSG_DEVICE_LOGICAL_UNIT_DP, DevPathToTextLogicalUnit }, + { MESSAGING_DEVICE_PATH, MSG_USB_CLASS_DP, DevPathToTextUsbClass }, + { MESSAGING_DEVICE_PATH, MSG_SATA_DP, DevPathToTextSata }, + { MESSAGING_DEVICE_PATH, MSG_I2O_DP, DevPathToTextI2O }, + { MESSAGING_DEVICE_PATH, MSG_MAC_ADDR_DP, DevPathToTextMacAddr }, + { MESSAGING_DEVICE_PATH, MSG_IPv4_DP, DevPathToTextIPv4 }, + { MESSAGING_DEVICE_PATH, MSG_IPv6_DP, DevPathToTextIPv6 }, + { MESSAGING_DEVICE_PATH, MSG_INFINIBAND_DP, DevPathToTextInfiniBand }, + { MESSAGING_DEVICE_PATH, MSG_UART_DP, DevPathToTextUart }, + { MESSAGING_DEVICE_PATH, MSG_VENDOR_DP, DevPathToTextVendor }, + { MESSAGING_DEVICE_PATH, MSG_ISCSI_DP, DevPathToTextiSCSI }, + { MESSAGING_DEVICE_PATH, MSG_VLAN_DP, DevPathToTextVlan }, + { MESSAGING_DEVICE_PATH, MSG_DNS_DP, DevPathToTextDns }, + { MESSAGING_DEVICE_PATH, MSG_URI_DP, DevPathToTextUri }, + { MESSAGING_DEVICE_PATH, MSG_BLUETOOTH_DP, DevPathToTextBluetooth }, + { MESSAGING_DEVICE_PATH, MSG_WIFI_DP, DevPathToTextWiFi }, + { MESSAGING_DEVICE_PATH, MSG_BLUETOOTH_LE_DP, DevPathToTextBluetoothLE }, + { MEDIA_DEVICE_PATH, MEDIA_HARDDRIVE_DP, DevPathToTextHardDrive }, + { MEDIA_DEVICE_PATH, MEDIA_CDROM_DP, DevPathToTextCDROM }, + { MEDIA_DEVICE_PATH, MEDIA_VENDOR_DP, DevPathToTextVendor }, + { MEDIA_DEVICE_PATH, MEDIA_PROTOCOL_DP, DevPathToTextMediaProtocol }, + { MEDIA_DEVICE_PATH, MEDIA_FILEPATH_DP, DevPathToTextFilePath }, + { MEDIA_DEVICE_PATH, MEDIA_PIWG_FW_VOL_DP, DevPathToTextFv }, + { MEDIA_DEVICE_PATH, MEDIA_PIWG_FW_FILE_DP, DevPathToTextFvFile }, + { MEDIA_DEVICE_PATH, MEDIA_RELATIVE_OFFSET_RANGE_DP, DevPathRelativeOffsetRange }, + { MEDIA_DEVICE_PATH, MEDIA_RAM_DISK_DP, DevPathToTextRamDisk }, + { BBS_DEVICE_PATH, BBS_BBS_DP, DevPathToTextBBS }, + { END_DEVICE_PATH_TYPE, END_INSTANCE_DEVICE_PATH_SUBTYPE, DevPathToTextEndInstance }, + { 0, 0, NULL } }; /** @@ -2403,10 +2431,10 @@ UefiDevicePathLibConvertDeviceNodeToText ( IN BOOLEAN AllowShortcuts ) { - POOL_PRINT Str; - UINTN Index; - DEVICE_PATH_TO_TEXT ToText; - EFI_DEVICE_PATH_PROTOCOL *Node; + POOL_PRINT Str; + UINTN Index; + DEVICE_PATH_TO_TEXT ToText; + EFI_DEVICE_PATH_PROTOCOL *Node; if (DeviceNode == NULL) { return NULL; @@ -2421,9 +2449,10 @@ UefiDevicePathLibConvertDeviceNodeToText ( Node = __DECONST(EFI_DEVICE_PATH_PROTOCOL *, DeviceNode); ToText = DevPathToTextNodeGeneric; for (Index = 0; mUefiDevicePathLibToTextTable[Index].Function != NULL; Index++) { - if (DevicePathType (DeviceNode) == mUefiDevicePathLibToTextTable[Index].Type && - DevicePathSubType (DeviceNode) == mUefiDevicePathLibToTextTable[Index].SubType - ) { + if ((DevicePathType (DeviceNode) == mUefiDevicePathLibToTextTable[Index].Type) && + (DevicePathSubType (DeviceNode) == mUefiDevicePathLibToTextTable[Index].SubType) + ) + { ToText = mUefiDevicePathLibToTextTable[Index].Function; break; } @@ -2432,7 +2461,7 @@ UefiDevicePathLibConvertDeviceNodeToText ( // // Print this node // - ToText (&Str, (VOID *) Node, DisplayOnly, AllowShortcuts); + ToText (&Str, (VOID *)Node, DisplayOnly, AllowShortcuts); ASSERT (Str.Str != NULL); return Str.Str; @@ -2456,16 +2485,16 @@ UefiDevicePathLibConvertDeviceNodeToText ( static char * EFIAPI UefiDevicePathLibConvertDevicePathToText ( - IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath, - IN BOOLEAN DisplayOnly, - IN BOOLEAN AllowShortcuts + IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath, + IN BOOLEAN DisplayOnly, + IN BOOLEAN AllowShortcuts ) { - POOL_PRINT Str; - EFI_DEVICE_PATH_PROTOCOL *Node; - EFI_DEVICE_PATH_PROTOCOL *AlignedNode; - UINTN Index; - DEVICE_PATH_TO_TEXT ToText; + POOL_PRINT Str; + EFI_DEVICE_PATH_PROTOCOL *Node; + EFI_DEVICE_PATH_PROTOCOL *AlignedNode; + UINTN Index; + DEVICE_PATH_TO_TEXT ToText; if (DevicePath == NULL) { return NULL; @@ -2484,14 +2513,15 @@ UefiDevicePathLibConvertDevicePathToText ( // ToText = DevPathToTextNodeGeneric; for (Index = 0; mUefiDevicePathLibToTextTable[Index].Function != NULL; Index += 1) { - - if (DevicePathType (Node) == mUefiDevicePathLibToTextTable[Index].Type && - DevicePathSubType (Node) == mUefiDevicePathLibToTextTable[Index].SubType - ) { + if ((DevicePathType (Node) == mUefiDevicePathLibToTextTable[Index].Type) && + (DevicePathSubType (Node) == mUefiDevicePathLibToTextTable[Index].SubType) + ) + { ToText = mUefiDevicePathLibToTextTable[Index].Function; break; } } + // // Put a path separator in if needed // diff --git a/lib/libefivar/efivar-dp-parse.c b/lib/libefivar/efivar-dp-parse.c index 2441360380e2..b47f3401c835 100644 --- a/lib/libefivar/efivar-dp-parse.c +++ b/lib/libefivar/efivar-dp-parse.c @@ -102,8 +102,8 @@ UefiDevicePathLibStrDuplicate ( static CHAR16 * GetParamByNodeName ( - IN CHAR16 *Str, - IN const CHAR16 *NodeName + IN CHAR16 *Str, + IN const CHAR16 *NodeName ) { CHAR16 *ParamStr; @@ -129,14 +129,16 @@ GetParamByNodeName ( // ParamStr++; ParameterLength = 0; - StrPointer = ParamStr; + StrPointer = ParamStr; while (!IS_NULL (*StrPointer)) { if (IS_RIGHT_PARENTH (*StrPointer)) { break; } + StrPointer++; ParameterLength++; } + if (IS_NULL (*StrPointer)) { // // ')' not found @@ -148,6 +150,7 @@ GetParamByNodeName ( if (ParamStr == NULL) { return NULL; } + // // Terminate the parameter string // @@ -171,14 +174,14 @@ GetParamByNodeName ( static CHAR16 * SplitStr ( - IN OUT CHAR16 **List, - IN CHAR16 Separator + IN OUT CHAR16 **List, + IN CHAR16 Separator ) { CHAR16 *Str; CHAR16 *ReturnStr; - Str = *List; + Str = *List; ReturnStr = Str; if (IS_NULL (*Str)) { @@ -192,6 +195,7 @@ SplitStr ( if (*Str == Separator) { break; } + Str++; } @@ -222,7 +226,7 @@ SplitStr ( static CHAR16 * GetNextParamStr ( - IN OUT CHAR16 **List + IN OUT CHAR16 **List ) { // @@ -263,9 +267,11 @@ GetNextDeviceNodeStr ( if (!IS_SLASH (*Str) && !IS_COMMA (*Str) && !IS_LEFT_PARENTH (*Str) && - !IS_RIGHT_PARENTH (*Str)) { + !IS_RIGHT_PARENTH (*Str)) + { break; } + Str++; } @@ -298,7 +304,7 @@ GetNextDeviceNodeStr ( if (IS_COMMA (*Str)) { *IsInstanceEnd = TRUE; - *Str = '\0'; + *Str = '\0'; Str++; } else { *IsInstanceEnd = FALSE; @@ -327,23 +333,24 @@ GetNextDeviceNodeStr ( static BOOLEAN IsHexStr ( - IN CHAR16 *Str + IN CHAR16 *Str ) { // // skip preceeding white space // while ((*Str != 0) && *Str == ' ') { - Str ++; + Str++; } + // // skip preceeding zeros // while ((*Str != 0) && *Str == '0') { - Str ++; + Str++; } - return (BOOLEAN) (*Str == 'x' || *Str == 'X'); + return (BOOLEAN)(*Str == 'x' || *Str == 'X'); } /** @@ -402,16 +409,17 @@ Strtoi64 ( static VOID StrToAscii ( - IN CHAR16 *Str, - IN OUT CHAR8 **AsciiStr + IN CHAR16 *Str, + IN OUT CHAR8 **AsciiStr ) { - CHAR8 *Dest; + CHAR8 *Dest; Dest = *AsciiStr; while (!IS_NULL (*Str)) { - *(Dest++) = (CHAR8) *(Str++); + *(Dest++) = (CHAR8)*(Str++); } + *Dest = 0; // @@ -431,14 +439,14 @@ StrToAscii ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextGenericPath ( - IN UINT8 Type, - IN CHAR16 *TextDeviceNode + IN UINT8 Type, + IN CHAR16 *TextDeviceNode ) { - EFI_DEVICE_PATH_PROTOCOL *Node; - CHAR16 *SubtypeStr; - CHAR16 *DataStr; - UINTN DataLength; + EFI_DEVICE_PATH_PROTOCOL *Node; + CHAR16 *SubtypeStr; + CHAR16 *DataStr; + UINTN DataLength; SubtypeStr = GetNextParamStr (&TextDeviceNode); DataStr = GetNextParamStr (&TextDeviceNode); @@ -448,13 +456,14 @@ DevPathFromTextGenericPath ( } else { DataLength = StrLen (DataStr) / 2; } + Node = CreateDeviceNode ( Type, - (UINT8) Strtoi (SubtypeStr), - (UINT16) (sizeof (EFI_DEVICE_PATH_PROTOCOL) + DataLength) + (UINT8)Strtoi (SubtypeStr), + (UINT16)(sizeof (EFI_DEVICE_PATH_PROTOCOL) + DataLength) ); - StrHexToBytes (DataStr, DataLength * 2, (UINT8 *) (Node + 1), DataLength); + StrHexToBytes (DataStr, DataLength * 2, (UINT8 *)(Node + 1), DataLength); return Node; } @@ -469,14 +478,14 @@ DevPathFromTextGenericPath ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextPath ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { - CHAR16 *TypeStr; + CHAR16 *TypeStr; - TypeStr = GetNextParamStr (&TextDeviceNode); + TypeStr = GetNextParamStr (&TextDeviceNode); - return DevPathFromTextGenericPath ((UINT8) Strtoi (TypeStr), TextDeviceNode); + return DevPathFromTextGenericPath ((UINT8)Strtoi (TypeStr), TextDeviceNode); } /** @@ -490,7 +499,7 @@ DevPathFromTextPath ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextHardwarePath ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { return DevPathFromTextGenericPath (HARDWARE_DEVICE_PATH, TextDeviceNode); @@ -507,25 +516,25 @@ DevPathFromTextHardwarePath ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextPci ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { - CHAR16 *FunctionStr; - CHAR16 *DeviceStr; - PCI_DEVICE_PATH *Pci; + CHAR16 *FunctionStr; + CHAR16 *DeviceStr; + PCI_DEVICE_PATH *Pci; DeviceStr = GetNextParamStr (&TextDeviceNode); FunctionStr = GetNextParamStr (&TextDeviceNode); - Pci = (PCI_DEVICE_PATH *) CreateDeviceNode ( - HARDWARE_DEVICE_PATH, - HW_PCI_DP, - (UINT16) sizeof (PCI_DEVICE_PATH) - ); + Pci = (PCI_DEVICE_PATH *)CreateDeviceNode ( + HARDWARE_DEVICE_PATH, + HW_PCI_DP, + (UINT16)sizeof (PCI_DEVICE_PATH) + ); - Pci->Function = (UINT8) Strtoi (FunctionStr); - Pci->Device = (UINT8) Strtoi (DeviceStr); + Pci->Function = (UINT8)Strtoi (FunctionStr); + Pci->Device = (UINT8)Strtoi (DeviceStr); - return (EFI_DEVICE_PATH_PROTOCOL *) Pci; + return (EFI_DEVICE_PATH_PROTOCOL *)Pci; } /** @@ -539,22 +548,22 @@ DevPathFromTextPci ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextPcCard ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { CHAR16 *FunctionNumberStr; PCCARD_DEVICE_PATH *Pccard; FunctionNumberStr = GetNextParamStr (&TextDeviceNode); - Pccard = (PCCARD_DEVICE_PATH *) CreateDeviceNode ( - HARDWARE_DEVICE_PATH, - HW_PCCARD_DP, - (UINT16) sizeof (PCCARD_DEVICE_PATH) - ); + Pccard = (PCCARD_DEVICE_PATH *)CreateDeviceNode ( + HARDWARE_DEVICE_PATH, + HW_PCCARD_DP, + (UINT16)sizeof (PCCARD_DEVICE_PATH) + ); - Pccard->FunctionNumber = (UINT8) Strtoi (FunctionNumberStr); + Pccard->FunctionNumber = (UINT8)Strtoi (FunctionNumberStr); - return (EFI_DEVICE_PATH_PROTOCOL *) Pccard; + return (EFI_DEVICE_PATH_PROTOCOL *)Pccard; } /** @@ -568,7 +577,7 @@ DevPathFromTextPcCard ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextMemoryMapped ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { CHAR16 *MemoryTypeStr; @@ -579,17 +588,17 @@ DevPathFromTextMemoryMapped ( MemoryTypeStr = GetNextParamStr (&TextDeviceNode); StartingAddressStr = GetNextParamStr (&TextDeviceNode); EndingAddressStr = GetNextParamStr (&TextDeviceNode); - MemMap = (MEMMAP_DEVICE_PATH *) CreateDeviceNode ( + MemMap = (MEMMAP_DEVICE_PATH *)CreateDeviceNode ( HARDWARE_DEVICE_PATH, HW_MEMMAP_DP, - (UINT16) sizeof (MEMMAP_DEVICE_PATH) + (UINT16)sizeof (MEMMAP_DEVICE_PATH) ); - MemMap->MemoryType = (UINT32) Strtoi (MemoryTypeStr); + MemMap->MemoryType = (UINT32)Strtoi (MemoryTypeStr); Strtoi64 (StartingAddressStr, &MemMap->StartingAddress); Strtoi64 (EndingAddressStr, &MemMap->EndingAddress); - return (EFI_DEVICE_PATH_PROTOCOL *) MemMap; + return (EFI_DEVICE_PATH_PROTOCOL *)MemMap; } /** @@ -606,9 +615,9 @@ DevPathFromTextMemoryMapped ( static EFI_DEVICE_PATH_PROTOCOL * ConvertFromTextVendor ( - IN CHAR16 *TextDeviceNode, - IN UINT8 Type, - IN UINT8 SubType + IN CHAR16 *TextDeviceNode, + IN UINT8 Type, + IN UINT8 SubType ) { CHAR16 *GuidStr; @@ -623,18 +632,18 @@ ConvertFromTextVendor ( // // Two hex characters make up 1 buffer byte // - Length = (Length + 1) / 2; + Length = (Length + 1) / 2; - Vendor = (VENDOR_DEVICE_PATH *) CreateDeviceNode ( - Type, - SubType, - (UINT16) (sizeof (VENDOR_DEVICE_PATH) + Length) - ); + Vendor = (VENDOR_DEVICE_PATH *)CreateDeviceNode ( + Type, + SubType, + (UINT16)(sizeof (VENDOR_DEVICE_PATH) + Length) + ); StrToGuid (GuidStr, &Vendor->Guid); - StrHexToBytes (DataStr, Length * 2, (UINT8 *) (Vendor + 1), Length); + StrHexToBytes (DataStr, Length * 2, (UINT8 *)(Vendor + 1), Length); - return (EFI_DEVICE_PATH_PROTOCOL *) Vendor; + return (EFI_DEVICE_PATH_PROTOCOL *)Vendor; } /** @@ -648,7 +657,7 @@ ConvertFromTextVendor ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextVenHw ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { return ConvertFromTextVendor ( @@ -669,21 +678,21 @@ DevPathFromTextVenHw ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextCtrl ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { CHAR16 *ControllerStr; CONTROLLER_DEVICE_PATH *Controller; ControllerStr = GetNextParamStr (&TextDeviceNode); - Controller = (CONTROLLER_DEVICE_PATH *) CreateDeviceNode ( - HARDWARE_DEVICE_PATH, - HW_CONTROLLER_DP, - (UINT16) sizeof (CONTROLLER_DEVICE_PATH) - ); - Controller->ControllerNumber = (UINT32) Strtoi (ControllerStr); + Controller = (CONTROLLER_DEVICE_PATH *)CreateDeviceNode ( + HARDWARE_DEVICE_PATH, + HW_CONTROLLER_DP, + (UINT16)sizeof (CONTROLLER_DEVICE_PATH) + ); + Controller->ControllerNumber = (UINT32)Strtoi (ControllerStr); - return (EFI_DEVICE_PATH_PROTOCOL *) Controller; + return (EFI_DEVICE_PATH_PROTOCOL *)Controller; } /** @@ -697,28 +706,28 @@ DevPathFromTextCtrl ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextBmc ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { - CHAR16 *InterfaceTypeStr; - CHAR16 *BaseAddressStr; - BMC_DEVICE_PATH *BmcDp; + CHAR16 *InterfaceTypeStr; + CHAR16 *BaseAddressStr; + BMC_DEVICE_PATH *BmcDp; InterfaceTypeStr = GetNextParamStr (&TextDeviceNode); BaseAddressStr = GetNextParamStr (&TextDeviceNode); - BmcDp = (BMC_DEVICE_PATH *) CreateDeviceNode ( - HARDWARE_DEVICE_PATH, - HW_BMC_DP, - (UINT16) sizeof (BMC_DEVICE_PATH) - ); + BmcDp = (BMC_DEVICE_PATH *)CreateDeviceNode ( + HARDWARE_DEVICE_PATH, + HW_BMC_DP, + (UINT16)sizeof (BMC_DEVICE_PATH) + ); - BmcDp->InterfaceType = (UINT8) Strtoi (InterfaceTypeStr); + BmcDp->InterfaceType = (UINT8)Strtoi (InterfaceTypeStr); WriteUnaligned64 ( - (UINT64 *) (&BmcDp->BaseAddress), + (UINT64 *)(&BmcDp->BaseAddress), StrHexToUint64 (BaseAddressStr) ); - return (EFI_DEVICE_PATH_PROTOCOL *) BmcDp; + return (EFI_DEVICE_PATH_PROTOCOL *)BmcDp; } /** @@ -732,7 +741,7 @@ DevPathFromTextBmc ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextAcpiPath ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { return DevPathFromTextGenericPath (ACPI_DEVICE_PATH, TextDeviceNode); @@ -748,14 +757,14 @@ DevPathFromTextAcpiPath ( static UINT32 EisaIdFromText ( - IN CHAR16 *Text + IN CHAR16 *Text ) { return (((Text[0] - 'A' + 1) & 0x1f) << 10) - + (((Text[1] - 'A' + 1) & 0x1f) << 5) - + (((Text[2] - 'A' + 1) & 0x1f) << 0) - + (UINT32) (StrHexToUintn (&Text[3]) << 16) - ; + + (((Text[1] - 'A' + 1) & 0x1f) << 5) + + (((Text[2] - 'A' + 1) & 0x1f) << 0) + + (UINT32)(StrHexToUintn (&Text[3]) << 16) + ; } /** @@ -769,7 +778,7 @@ EisaIdFromText ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextAcpi ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { CHAR16 *HIDStr; @@ -778,16 +787,16 @@ DevPathFromTextAcpi ( HIDStr = GetNextParamStr (&TextDeviceNode); UIDStr = GetNextParamStr (&TextDeviceNode); - Acpi = (ACPI_HID_DEVICE_PATH *) CreateDeviceNode ( - ACPI_DEVICE_PATH, - ACPI_DP, - (UINT16) sizeof (ACPI_HID_DEVICE_PATH) - ); + Acpi = (ACPI_HID_DEVICE_PATH *)CreateDeviceNode ( + ACPI_DEVICE_PATH, + ACPI_DP, + (UINT16)sizeof (ACPI_HID_DEVICE_PATH) + ); Acpi->HID = EisaIdFromText (HIDStr); - Acpi->UID = (UINT32) Strtoi (UIDStr); + Acpi->UID = (UINT32)Strtoi (UIDStr); - return (EFI_DEVICE_PATH_PROTOCOL *) Acpi; + return (EFI_DEVICE_PATH_PROTOCOL *)Acpi; } /** @@ -802,7 +811,7 @@ DevPathFromTextAcpi ( static EFI_DEVICE_PATH_PROTOCOL * ConvertFromTextAcpi ( - IN CHAR16 *TextDeviceNode, + IN CHAR16 *TextDeviceNode, IN UINT32 PnPId ) { @@ -810,16 +819,16 @@ ConvertFromTextAcpi ( ACPI_HID_DEVICE_PATH *Acpi; UIDStr = GetNextParamStr (&TextDeviceNode); - Acpi = (ACPI_HID_DEVICE_PATH *) CreateDeviceNode ( - ACPI_DEVICE_PATH, - ACPI_DP, - (UINT16) sizeof (ACPI_HID_DEVICE_PATH) - ); + Acpi = (ACPI_HID_DEVICE_PATH *)CreateDeviceNode ( + ACPI_DEVICE_PATH, + ACPI_DP, + (UINT16)sizeof (ACPI_HID_DEVICE_PATH) + ); Acpi->HID = EFI_PNP_ID (PnPId); - Acpi->UID = (UINT32) Strtoi (UIDStr); + Acpi->UID = (UINT32)Strtoi (UIDStr); - return (EFI_DEVICE_PATH_PROTOCOL *) Acpi; + return (EFI_DEVICE_PATH_PROTOCOL *)Acpi; } /** @@ -833,7 +842,7 @@ ConvertFromTextAcpi ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextPciRoot ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { return ConvertFromTextAcpi (TextDeviceNode, 0x0a03); @@ -850,7 +859,7 @@ DevPathFromTextPciRoot ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextPcieRoot ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { return ConvertFromTextAcpi (TextDeviceNode, 0x0a08); @@ -867,7 +876,7 @@ DevPathFromTextPcieRoot ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextFloppy ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { return ConvertFromTextAcpi (TextDeviceNode, 0x0604); @@ -884,7 +893,7 @@ DevPathFromTextFloppy ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextKeyboard ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { return ConvertFromTextAcpi (TextDeviceNode, 0x0301); @@ -901,7 +910,7 @@ DevPathFromTextKeyboard ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextSerial ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { return ConvertFromTextAcpi (TextDeviceNode, 0x0501); @@ -918,7 +927,7 @@ DevPathFromTextSerial ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextParallelPort ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { return ConvertFromTextAcpi (TextDeviceNode, 0x0401); @@ -935,7 +944,7 @@ DevPathFromTextParallelPort ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextAcpiEx ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { CHAR16 *HIDStr; @@ -955,25 +964,25 @@ DevPathFromTextAcpiEx ( CIDSTRStr = GetNextParamStr (&TextDeviceNode); UIDSTRStr = GetNextParamStr (&TextDeviceNode); - Length = (UINT16) (sizeof (ACPI_EXTENDED_HID_DEVICE_PATH) + StrLen (HIDSTRStr) + 1); - Length = (UINT16) (Length + StrLen (UIDSTRStr) + 1); - Length = (UINT16) (Length + StrLen (CIDSTRStr) + 1); - AcpiEx = (ACPI_EXTENDED_HID_DEVICE_PATH *) CreateDeviceNode ( - ACPI_DEVICE_PATH, - ACPI_EXTENDED_DP, - Length - ); + Length = (UINT16)(sizeof (ACPI_EXTENDED_HID_DEVICE_PATH) + StrLen (HIDSTRStr) + 1); + Length = (UINT16)(Length + StrLen (UIDSTRStr) + 1); + Length = (UINT16)(Length + StrLen (CIDSTRStr) + 1); + AcpiEx = (ACPI_EXTENDED_HID_DEVICE_PATH *)CreateDeviceNode ( + ACPI_DEVICE_PATH, + ACPI_EXTENDED_DP, + Length + ); AcpiEx->HID = EisaIdFromText (HIDStr); AcpiEx->CID = EisaIdFromText (CIDStr); - AcpiEx->UID = (UINT32) Strtoi (UIDStr); + AcpiEx->UID = (UINT32)Strtoi (UIDStr); - AsciiStr = (CHAR8 *) ((UINT8 *)AcpiEx + sizeof (ACPI_EXTENDED_HID_DEVICE_PATH)); + AsciiStr = (CHAR8 *)((UINT8 *)AcpiEx + sizeof (ACPI_EXTENDED_HID_DEVICE_PATH)); StrToAscii (HIDSTRStr, &AsciiStr); StrToAscii (UIDSTRStr, &AsciiStr); StrToAscii (CIDSTRStr, &AsciiStr); - return (EFI_DEVICE_PATH_PROTOCOL *) AcpiEx; + return (EFI_DEVICE_PATH_PROTOCOL *)AcpiEx; } /** @@ -987,7 +996,7 @@ DevPathFromTextAcpiEx ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextAcpiExp ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { CHAR16 *HIDStr; @@ -1000,12 +1009,12 @@ DevPathFromTextAcpiExp ( HIDStr = GetNextParamStr (&TextDeviceNode); CIDStr = GetNextParamStr (&TextDeviceNode); UIDSTRStr = GetNextParamStr (&TextDeviceNode); - Length = (UINT16) (sizeof (ACPI_EXTENDED_HID_DEVICE_PATH) + StrLen (UIDSTRStr) + 3); - AcpiEx = (ACPI_EXTENDED_HID_DEVICE_PATH *) CreateDeviceNode ( - ACPI_DEVICE_PATH, - ACPI_EXTENDED_DP, - Length - ); + Length = (UINT16)(sizeof (ACPI_EXTENDED_HID_DEVICE_PATH) + StrLen (UIDSTRStr) + 3); + AcpiEx = (ACPI_EXTENDED_HID_DEVICE_PATH *)CreateDeviceNode ( + ACPI_DEVICE_PATH, + ACPI_EXTENDED_DP, + Length + ); AcpiEx->HID = EisaIdFromText (HIDStr); // @@ -1013,14 +1022,15 @@ DevPathFromTextAcpiExp ( // So when the CID parameter is not specified or specified as 0 in the text device node. // Set the CID to 0 in the ACPI extension device path structure. // - if (*CIDStr == '\0' || *CIDStr == '0') { + if ((*CIDStr == '\0') || (*CIDStr == '0')) { AcpiEx->CID = 0; } else { AcpiEx->CID = EisaIdFromText (CIDStr); } + AcpiEx->UID = 0; - AsciiStr = (CHAR8 *) ((UINT8 *)AcpiEx + sizeof (ACPI_EXTENDED_HID_DEVICE_PATH)); + AsciiStr = (CHAR8 *)((UINT8 *)AcpiEx + sizeof (ACPI_EXTENDED_HID_DEVICE_PATH)); // // HID string is NULL // @@ -1035,7 +1045,7 @@ DevPathFromTextAcpiExp ( // *AsciiStr = '\0'; - return (EFI_DEVICE_PATH_PROTOCOL *) AcpiEx; + return (EFI_DEVICE_PATH_PROTOCOL *)AcpiEx; } /** @@ -1049,7 +1059,7 @@ DevPathFromTextAcpiExp ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextAcpiAdr ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { CHAR16 *DisplayDeviceStr; @@ -1057,11 +1067,11 @@ DevPathFromTextAcpiAdr ( UINTN Index; UINTN Length; - AcpiAdr = (ACPI_ADR_DEVICE_PATH *) CreateDeviceNode ( - ACPI_DEVICE_PATH, - ACPI_ADR_DP, - (UINT16) sizeof (ACPI_ADR_DEVICE_PATH) - ); + AcpiAdr = (ACPI_ADR_DEVICE_PATH *)CreateDeviceNode ( + ACPI_DEVICE_PATH, + ACPI_ADR_DP, + (UINT16)sizeof (ACPI_ADR_DEVICE_PATH) + ); ASSERT (AcpiAdr != NULL); for (Index = 0; ; Index++) { @@ -1069,6 +1079,7 @@ DevPathFromTextAcpiAdr ( if (IS_NULL (*DisplayDeviceStr)) { break; } + if (Index > 0) { Length = DevicePathNodeLength (AcpiAdr); AcpiAdr = ReallocatePool ( @@ -1080,10 +1091,10 @@ DevPathFromTextAcpiAdr ( SetDevicePathNodeLength (AcpiAdr, Length + sizeof (UINT32)); } - (&AcpiAdr->ADR)[Index] = (UINT32) Strtoi (DisplayDeviceStr); + (&AcpiAdr->ADR)[Index] = (UINT32)Strtoi (DisplayDeviceStr); } - return (EFI_DEVICE_PATH_PROTOCOL *) AcpiAdr; + return (EFI_DEVICE_PATH_PROTOCOL *)AcpiAdr; } /** @@ -1097,7 +1108,7 @@ DevPathFromTextAcpiAdr ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextMsg ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { return DevPathFromTextGenericPath (MESSAGING_DEVICE_PATH, TextDeviceNode); @@ -1114,19 +1125,19 @@ DevPathFromTextMsg ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextAta ( -IN CHAR16 *TextDeviceNode -) + IN CHAR16 *TextDeviceNode + ) { - CHAR16 *PrimarySecondaryStr; - CHAR16 *SlaveMasterStr; - CHAR16 *LunStr; - ATAPI_DEVICE_PATH *Atapi; + CHAR16 *PrimarySecondaryStr; + CHAR16 *SlaveMasterStr; + CHAR16 *LunStr; + ATAPI_DEVICE_PATH *Atapi; - Atapi = (ATAPI_DEVICE_PATH *) CreateDeviceNode ( - MESSAGING_DEVICE_PATH, - MSG_ATAPI_DP, - (UINT16) sizeof (ATAPI_DEVICE_PATH) - ); + Atapi = (ATAPI_DEVICE_PATH *)CreateDeviceNode ( + MESSAGING_DEVICE_PATH, + MSG_ATAPI_DP, + (UINT16)sizeof (ATAPI_DEVICE_PATH) + ); PrimarySecondaryStr = GetNextParamStr (&TextDeviceNode); SlaveMasterStr = GetNextParamStr (&TextDeviceNode); @@ -1137,19 +1148,20 @@ IN CHAR16 *TextDeviceNode } else if (StrCmp (PrimarySecondaryStr, "Secondary") == 0) { Atapi->PrimarySecondary = 1; } else { - Atapi->PrimarySecondary = (UINT8) Strtoi (PrimarySecondaryStr); + Atapi->PrimarySecondary = (UINT8)Strtoi (PrimarySecondaryStr); } + if (StrCmp (SlaveMasterStr, "Master") == 0) { - Atapi->SlaveMaster = 0; + Atapi->SlaveMaster = 0; } else if (StrCmp (SlaveMasterStr, "Slave") == 0) { - Atapi->SlaveMaster = 1; + Atapi->SlaveMaster = 1; } else { - Atapi->SlaveMaster = (UINT8) Strtoi (SlaveMasterStr); + Atapi->SlaveMaster = (UINT8)Strtoi (SlaveMasterStr); } - Atapi->Lun = (UINT16) Strtoi (LunStr); + Atapi->Lun = (UINT16)Strtoi (LunStr); - return (EFI_DEVICE_PATH_PROTOCOL *) Atapi; + return (EFI_DEVICE_PATH_PROTOCOL *)Atapi; } /** @@ -1163,7 +1175,7 @@ IN CHAR16 *TextDeviceNode static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextScsi ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { CHAR16 *PunStr; @@ -1172,16 +1184,16 @@ DevPathFromTextScsi ( PunStr = GetNextParamStr (&TextDeviceNode); LunStr = GetNextParamStr (&TextDeviceNode); - Scsi = (SCSI_DEVICE_PATH *) CreateDeviceNode ( - MESSAGING_DEVICE_PATH, - MSG_SCSI_DP, - (UINT16) sizeof (SCSI_DEVICE_PATH) - ); + Scsi = (SCSI_DEVICE_PATH *)CreateDeviceNode ( + MESSAGING_DEVICE_PATH, + MSG_SCSI_DP, + (UINT16)sizeof (SCSI_DEVICE_PATH) + ); - Scsi->Pun = (UINT16) Strtoi (PunStr); - Scsi->Lun = (UINT16) Strtoi (LunStr); + Scsi->Pun = (UINT16)Strtoi (PunStr); + Scsi->Lun = (UINT16)Strtoi (LunStr); - return (EFI_DEVICE_PATH_PROTOCOL *) Scsi; + return (EFI_DEVICE_PATH_PROTOCOL *)Scsi; } /** @@ -1195,7 +1207,7 @@ DevPathFromTextScsi ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextFibre ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { CHAR16 *WWNStr; @@ -1204,17 +1216,17 @@ DevPathFromTextFibre ( WWNStr = GetNextParamStr (&TextDeviceNode); LunStr = GetNextParamStr (&TextDeviceNode); - Fibre = (FIBRECHANNEL_DEVICE_PATH *) CreateDeviceNode ( - MESSAGING_DEVICE_PATH, - MSG_FIBRECHANNEL_DP, - (UINT16) sizeof (FIBRECHANNEL_DEVICE_PATH) - ); + Fibre = (FIBRECHANNEL_DEVICE_PATH *)CreateDeviceNode ( + MESSAGING_DEVICE_PATH, + MSG_FIBRECHANNEL_DP, + (UINT16)sizeof (FIBRECHANNEL_DEVICE_PATH) + ); Fibre->Reserved = 0; Strtoi64 (WWNStr, &Fibre->WWN); Strtoi64 (LunStr, &Fibre->Lun); - return (EFI_DEVICE_PATH_PROTOCOL *) Fibre; + return (EFI_DEVICE_PATH_PROTOCOL *)Fibre; } /** @@ -1228,7 +1240,7 @@ DevPathFromTextFibre ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextFibreEx ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { CHAR16 *WWNStr; @@ -1237,20 +1249,20 @@ DevPathFromTextFibreEx ( WWNStr = GetNextParamStr (&TextDeviceNode); LunStr = GetNextParamStr (&TextDeviceNode); - FibreEx = (FIBRECHANNELEX_DEVICE_PATH *) CreateDeviceNode ( - MESSAGING_DEVICE_PATH, - MSG_FIBRECHANNELEX_DP, - (UINT16) sizeof (FIBRECHANNELEX_DEVICE_PATH) - ); + FibreEx = (FIBRECHANNELEX_DEVICE_PATH *)CreateDeviceNode ( + MESSAGING_DEVICE_PATH, + MSG_FIBRECHANNELEX_DP, + (UINT16)sizeof (FIBRECHANNELEX_DEVICE_PATH) + ); FibreEx->Reserved = 0; - Strtoi64 (WWNStr, (UINT64 *) (&FibreEx->WWN)); - Strtoi64 (LunStr, (UINT64 *) (&FibreEx->Lun)); + Strtoi64 (WWNStr, (UINT64 *)(&FibreEx->WWN)); + Strtoi64 (LunStr, (UINT64 *)(&FibreEx->Lun)); - *(UINT64 *) (&FibreEx->WWN) = SwapBytes64 (*(UINT64 *) (&FibreEx->WWN)); - *(UINT64 *) (&FibreEx->Lun) = SwapBytes64 (*(UINT64 *) (&FibreEx->Lun)); + *(UINT64 *)(&FibreEx->WWN) = SwapBytes64 (*(UINT64 *)(&FibreEx->WWN)); + *(UINT64 *)(&FibreEx->Lun) = SwapBytes64 (*(UINT64 *)(&FibreEx->Lun)); - return (EFI_DEVICE_PATH_PROTOCOL *) FibreEx; + return (EFI_DEVICE_PATH_PROTOCOL *)FibreEx; } /** @@ -1264,23 +1276,23 @@ DevPathFromTextFibreEx ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromText1394 ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { - CHAR16 *GuidStr; - F1394_DEVICE_PATH *F1394DevPath; + CHAR16 *GuidStr; + F1394_DEVICE_PATH *F1394DevPath; - GuidStr = GetNextParamStr (&TextDeviceNode); - F1394DevPath = (F1394_DEVICE_PATH *) CreateDeviceNode ( - MESSAGING_DEVICE_PATH, - MSG_1394_DP, - (UINT16) sizeof (F1394_DEVICE_PATH) - ); + GuidStr = GetNextParamStr (&TextDeviceNode); + F1394DevPath = (F1394_DEVICE_PATH *)CreateDeviceNode ( + MESSAGING_DEVICE_PATH, + MSG_1394_DP, + (UINT16)sizeof (F1394_DEVICE_PATH) + ); F1394DevPath->Reserved = 0; F1394DevPath->Guid = StrHexToUint64 (GuidStr); - return (EFI_DEVICE_PATH_PROTOCOL *) F1394DevPath; + return (EFI_DEVICE_PATH_PROTOCOL *)F1394DevPath; } /** @@ -1294,25 +1306,25 @@ DevPathFromText1394 ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextUsb ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { - CHAR16 *PortStr; - CHAR16 *InterfaceStr; - USB_DEVICE_PATH *Usb; + CHAR16 *PortStr; + CHAR16 *InterfaceStr; + USB_DEVICE_PATH *Usb; - PortStr = GetNextParamStr (&TextDeviceNode); - InterfaceStr = GetNextParamStr (&TextDeviceNode); - Usb = (USB_DEVICE_PATH *) CreateDeviceNode ( - MESSAGING_DEVICE_PATH, - MSG_USB_DP, - (UINT16) sizeof (USB_DEVICE_PATH) - ); + PortStr = GetNextParamStr (&TextDeviceNode); + InterfaceStr = GetNextParamStr (&TextDeviceNode); + Usb = (USB_DEVICE_PATH *)CreateDeviceNode ( + MESSAGING_DEVICE_PATH, + MSG_USB_DP, + (UINT16)sizeof (USB_DEVICE_PATH) + ); - Usb->ParentPortNumber = (UINT8) Strtoi (PortStr); - Usb->InterfaceNumber = (UINT8) Strtoi (InterfaceStr); + Usb->ParentPortNumber = (UINT8)Strtoi (PortStr); + Usb->InterfaceNumber = (UINT8)Strtoi (InterfaceStr); - return (EFI_DEVICE_PATH_PROTOCOL *) Usb; + return (EFI_DEVICE_PATH_PROTOCOL *)Usb; } /** @@ -1326,22 +1338,22 @@ DevPathFromTextUsb ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextI2O ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { - CHAR16 *TIDStr; - I2O_DEVICE_PATH *I2ODevPath; + CHAR16 *TIDStr; + I2O_DEVICE_PATH *I2ODevPath; TIDStr = GetNextParamStr (&TextDeviceNode); - I2ODevPath = (I2O_DEVICE_PATH *) CreateDeviceNode ( + I2ODevPath = (I2O_DEVICE_PATH *)CreateDeviceNode ( MESSAGING_DEVICE_PATH, MSG_I2O_DP, - (UINT16) sizeof (I2O_DEVICE_PATH) + (UINT16)sizeof (I2O_DEVICE_PATH) ); - I2ODevPath->Tid = (UINT32) Strtoi (TIDStr); + I2ODevPath->Tid = (UINT32)Strtoi (TIDStr); - return (EFI_DEVICE_PATH_PROTOCOL *) I2ODevPath; + return (EFI_DEVICE_PATH_PROTOCOL *)I2ODevPath; } /** @@ -1355,7 +1367,7 @@ DevPathFromTextI2O ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextInfiniband ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { CHAR16 *FlagsStr; @@ -1370,19 +1382,19 @@ DevPathFromTextInfiniband ( SidStr = GetNextParamStr (&TextDeviceNode); TidStr = GetNextParamStr (&TextDeviceNode); DidStr = GetNextParamStr (&TextDeviceNode); - InfiniBand = (INFINIBAND_DEVICE_PATH *) CreateDeviceNode ( - MESSAGING_DEVICE_PATH, - MSG_INFINIBAND_DP, - (UINT16) sizeof (INFINIBAND_DEVICE_PATH) - ); + InfiniBand = (INFINIBAND_DEVICE_PATH *)CreateDeviceNode ( + MESSAGING_DEVICE_PATH, + MSG_INFINIBAND_DP, + (UINT16)sizeof (INFINIBAND_DEVICE_PATH) + ); - InfiniBand->ResourceFlags = (UINT32) Strtoi (FlagsStr); - StrToGuid (GuidStr, (EFI_GUID *) InfiniBand->PortGid); + InfiniBand->ResourceFlags = (UINT32)Strtoi (FlagsStr); + StrToGuid (GuidStr, (EFI_GUID *)InfiniBand->PortGid); Strtoi64 (SidStr, &InfiniBand->ServiceId); Strtoi64 (TidStr, &InfiniBand->TargetPortId); Strtoi64 (DidStr, &InfiniBand->DeviceId); - return (EFI_DEVICE_PATH_PROTOCOL *) InfiniBand; + return (EFI_DEVICE_PATH_PROTOCOL *)InfiniBand; } /** @@ -1396,14 +1408,14 @@ DevPathFromTextInfiniband ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextVenMsg ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { return ConvertFromTextVendor ( - TextDeviceNode, - MESSAGING_DEVICE_PATH, - MSG_VENDOR_DP - ); + TextDeviceNode, + MESSAGING_DEVICE_PATH, + MSG_VENDOR_DP + ); } /** @@ -1417,18 +1429,19 @@ DevPathFromTextVenMsg ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextVenPcAnsi ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { VENDOR_DEVICE_PATH *Vendor; - Vendor = (VENDOR_DEVICE_PATH *) CreateDeviceNode ( - MESSAGING_DEVICE_PATH, - MSG_VENDOR_DP, - (UINT16) sizeof (VENDOR_DEVICE_PATH)); + Vendor = (VENDOR_DEVICE_PATH *)CreateDeviceNode ( + MESSAGING_DEVICE_PATH, + MSG_VENDOR_DP, + (UINT16)sizeof (VENDOR_DEVICE_PATH) + ); CopyGuid (&Vendor->Guid, &gEfiPcAnsiGuid); - return (EFI_DEVICE_PATH_PROTOCOL *) Vendor; + return (EFI_DEVICE_PATH_PROTOCOL *)Vendor; } /** @@ -1442,18 +1455,19 @@ DevPathFromTextVenPcAnsi ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextVenVt100 ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { VENDOR_DEVICE_PATH *Vendor; - Vendor = (VENDOR_DEVICE_PATH *) CreateDeviceNode ( - MESSAGING_DEVICE_PATH, - MSG_VENDOR_DP, - (UINT16) sizeof (VENDOR_DEVICE_PATH)); + Vendor = (VENDOR_DEVICE_PATH *)CreateDeviceNode ( + MESSAGING_DEVICE_PATH, + MSG_VENDOR_DP, + (UINT16)sizeof (VENDOR_DEVICE_PATH) + ); CopyGuid (&Vendor->Guid, &gEfiVT100Guid); - return (EFI_DEVICE_PATH_PROTOCOL *) Vendor; + return (EFI_DEVICE_PATH_PROTOCOL *)Vendor; } /** @@ -1467,18 +1481,19 @@ DevPathFromTextVenVt100 ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextVenVt100Plus ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { VENDOR_DEVICE_PATH *Vendor; - Vendor = (VENDOR_DEVICE_PATH *) CreateDeviceNode ( - MESSAGING_DEVICE_PATH, - MSG_VENDOR_DP, - (UINT16) sizeof (VENDOR_DEVICE_PATH)); + Vendor = (VENDOR_DEVICE_PATH *)CreateDeviceNode ( + MESSAGING_DEVICE_PATH, + MSG_VENDOR_DP, + (UINT16)sizeof (VENDOR_DEVICE_PATH) + ); CopyGuid (&Vendor->Guid, &gEfiVT100PlusGuid); - return (EFI_DEVICE_PATH_PROTOCOL *) Vendor; + return (EFI_DEVICE_PATH_PROTOCOL *)Vendor; } /** @@ -1492,18 +1507,19 @@ DevPathFromTextVenVt100Plus ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextVenUtf8 ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { VENDOR_DEVICE_PATH *Vendor; - Vendor = (VENDOR_DEVICE_PATH *) CreateDeviceNode ( - MESSAGING_DEVICE_PATH, - MSG_VENDOR_DP, - (UINT16) sizeof (VENDOR_DEVICE_PATH)); + Vendor = (VENDOR_DEVICE_PATH *)CreateDeviceNode ( + MESSAGING_DEVICE_PATH, + MSG_VENDOR_DP, + (UINT16)sizeof (VENDOR_DEVICE_PATH) + ); CopyGuid (&Vendor->Guid, &gEfiVTUTF8Guid); - return (EFI_DEVICE_PATH_PROTOCOL *) Vendor; + return (EFI_DEVICE_PATH_PROTOCOL *)Vendor; } /** @@ -1517,18 +1533,18 @@ DevPathFromTextVenUtf8 ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextUartFlowCtrl ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { - CHAR16 *ValueStr; - UART_FLOW_CONTROL_DEVICE_PATH *UartFlowControl; + CHAR16 *ValueStr; + UART_FLOW_CONTROL_DEVICE_PATH *UartFlowControl; ValueStr = GetNextParamStr (&TextDeviceNode); - UartFlowControl = (UART_FLOW_CONTROL_DEVICE_PATH *) CreateDeviceNode ( - MESSAGING_DEVICE_PATH, - MSG_VENDOR_DP, - (UINT16) sizeof (UART_FLOW_CONTROL_DEVICE_PATH) - ); + UartFlowControl = (UART_FLOW_CONTROL_DEVICE_PATH *)CreateDeviceNode ( + MESSAGING_DEVICE_PATH, + MSG_VENDOR_DP, + (UINT16)sizeof (UART_FLOW_CONTROL_DEVICE_PATH) + ); CopyGuid (&UartFlowControl->Guid, &gEfiUartDevicePathGuid); if (StrCmp (ValueStr, "XonXoff") == 0) { @@ -1539,7 +1555,7 @@ DevPathFromTextUartFlowCtrl ( UartFlowControl->FlowControlMap = 0; } - return (EFI_DEVICE_PATH_PROTOCOL *) UartFlowControl; + return (EFI_DEVICE_PATH_PROTOCOL *)UartFlowControl; } /** @@ -1553,20 +1569,20 @@ DevPathFromTextUartFlowCtrl ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextSAS ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { - CHAR16 *AddressStr; - CHAR16 *LunStr; - CHAR16 *RTPStr; - CHAR16 *SASSATAStr; - CHAR16 *LocationStr; - CHAR16 *ConnectStr; - CHAR16 *DriveBayStr; - CHAR16 *ReservedStr; - UINT16 Info; - UINT16 Uint16; - SAS_DEVICE_PATH *Sas; + CHAR16 *AddressStr; + CHAR16 *LunStr; + CHAR16 *RTPStr; + CHAR16 *SASSATAStr; + CHAR16 *LocationStr; + CHAR16 *ConnectStr; + CHAR16 *DriveBayStr; + CHAR16 *ReservedStr; + UINT16 Info; + UINT16 Uint16; + SAS_DEVICE_PATH *Sas; AddressStr = GetNextParamStr (&TextDeviceNode); LunStr = GetNextParamStr (&TextDeviceNode); @@ -1576,27 +1592,25 @@ DevPathFromTextSAS ( ConnectStr = GetNextParamStr (&TextDeviceNode); DriveBayStr = GetNextParamStr (&TextDeviceNode); ReservedStr = GetNextParamStr (&TextDeviceNode); - Sas = (SAS_DEVICE_PATH *) CreateDeviceNode ( - MESSAGING_DEVICE_PATH, - MSG_VENDOR_DP, - (UINT16) sizeof (SAS_DEVICE_PATH) - ); + Sas = (SAS_DEVICE_PATH *)CreateDeviceNode ( + MESSAGING_DEVICE_PATH, + MSG_VENDOR_DP, + (UINT16)sizeof (SAS_DEVICE_PATH) + ); CopyGuid (&Sas->Guid, &gEfiSasDevicePathGuid); Strtoi64 (AddressStr, &Sas->SasAddress); Strtoi64 (LunStr, &Sas->Lun); - Sas->RelativeTargetPort = (UINT16) Strtoi (RTPStr); + Sas->RelativeTargetPort = (UINT16)Strtoi (RTPStr); if (StrCmp (SASSATAStr, "NoTopology") == 0) { Info = 0x0; - } else if ((StrCmp (SASSATAStr, "SATA") == 0) || (StrCmp (SASSATAStr, "SAS") == 0)) { - - Uint16 = (UINT16) Strtoi (DriveBayStr); + Uint16 = (UINT16)Strtoi (DriveBayStr); if (Uint16 == 0) { Info = 0x1; } else { - Info = (UINT16) (0x2 | ((Uint16 - 1) << 8)); + Info = (UINT16)(0x2 | ((Uint16 - 1) << 8)); } if (StrCmp (SASSATAStr, "SATA") == 0) { @@ -1612,8 +1626,9 @@ DevPathFromTextSAS ( } else if (StrCmp (LocationStr, "Internal") == 0) { Uint16 = 0; } else { - Uint16 = ((UINT16) Strtoi (LocationStr) & BIT0); + Uint16 = ((UINT16)Strtoi (LocationStr) & BIT0); } + Info |= (Uint16 << 5); // @@ -1625,18 +1640,18 @@ DevPathFromTextSAS ( } else if (StrCmp (ConnectStr, "Direct") == 0) { Uint16 = 0; } else { - Uint16 = ((UINT16) Strtoi (ConnectStr) & (BIT0 | BIT1)); + Uint16 = ((UINT16)Strtoi (ConnectStr) & (BIT0 | BIT1)); } - Info |= (Uint16 << 6); + Info |= (Uint16 << 6); } else { - Info = (UINT16) Strtoi (SASSATAStr); + Info = (UINT16)Strtoi (SASSATAStr); } Sas->DeviceTopology = Info; - Sas->Reserved = (UINT32) Strtoi (ReservedStr); + Sas->Reserved = (UINT32)Strtoi (ReservedStr); - return (EFI_DEVICE_PATH_PROTOCOL *) Sas; + return (EFI_DEVICE_PATH_PROTOCOL *)Sas; } /** @@ -1650,21 +1665,21 @@ DevPathFromTextSAS ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextSasEx ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { - CHAR16 *AddressStr; - CHAR16 *LunStr; - CHAR16 *RTPStr; - CHAR16 *SASSATAStr; - CHAR16 *LocationStr; - CHAR16 *ConnectStr; - CHAR16 *DriveBayStr; - UINT16 Info; - UINT16 Uint16; - UINT64 SasAddress; - UINT64 Lun; - SASEX_DEVICE_PATH *SasEx; + CHAR16 *AddressStr; + CHAR16 *LunStr; + CHAR16 *RTPStr; + CHAR16 *SASSATAStr; + CHAR16 *LocationStr; + CHAR16 *ConnectStr; + CHAR16 *DriveBayStr; + UINT16 Info; + UINT16 Uint16; + UINT64 SasAddress; + UINT64 Lun; + SASEX_DEVICE_PATH *SasEx; AddressStr = GetNextParamStr (&TextDeviceNode); LunStr = GetNextParamStr (&TextDeviceNode); @@ -1673,28 +1688,26 @@ DevPathFromTextSasEx ( LocationStr = GetNextParamStr (&TextDeviceNode); ConnectStr = GetNextParamStr (&TextDeviceNode); DriveBayStr = GetNextParamStr (&TextDeviceNode); - SasEx = (SASEX_DEVICE_PATH *) CreateDeviceNode ( - MESSAGING_DEVICE_PATH, - MSG_SASEX_DP, - (UINT16) sizeof (SASEX_DEVICE_PATH) - ); + SasEx = (SASEX_DEVICE_PATH *)CreateDeviceNode ( + MESSAGING_DEVICE_PATH, + MSG_SASEX_DP, + (UINT16)sizeof (SASEX_DEVICE_PATH) + ); Strtoi64 (AddressStr, &SasAddress); - Strtoi64 (LunStr, &Lun); - WriteUnaligned64 ((UINT64 *) &SasEx->SasAddress, SwapBytes64 (SasAddress)); - WriteUnaligned64 ((UINT64 *) &SasEx->Lun, SwapBytes64 (Lun)); - SasEx->RelativeTargetPort = (UINT16) Strtoi (RTPStr); + Strtoi64 (LunStr, &Lun); + WriteUnaligned64 ((UINT64 *)&SasEx->SasAddress, SwapBytes64 (SasAddress)); + WriteUnaligned64 ((UINT64 *)&SasEx->Lun, SwapBytes64 (Lun)); + SasEx->RelativeTargetPort = (UINT16)Strtoi (RTPStr); if (StrCmp (SASSATAStr, "NoTopology") == 0) { Info = 0x0; - } else if ((StrCmp (SASSATAStr, "SATA") == 0) || (StrCmp (SASSATAStr, "SAS") == 0)) { - - Uint16 = (UINT16) Strtoi (DriveBayStr); + Uint16 = (UINT16)Strtoi (DriveBayStr); if (Uint16 == 0) { Info = 0x1; } else { - Info = (UINT16) (0x2 | ((Uint16 - 1) << 8)); + Info = (UINT16)(0x2 | ((Uint16 - 1) << 8)); } if (StrCmp (SASSATAStr, "SATA") == 0) { @@ -1710,8 +1723,9 @@ DevPathFromTextSasEx ( } else if (StrCmp (LocationStr, "Internal") == 0) { Uint16 = 0; } else { - Uint16 = ((UINT16) Strtoi (LocationStr) & BIT0); + Uint16 = ((UINT16)Strtoi (LocationStr) & BIT0); } + Info |= (Uint16 << 5); // @@ -1723,17 +1737,17 @@ DevPathFromTextSasEx ( } else if (StrCmp (ConnectStr, "Direct") == 0) { Uint16 = 0; } else { - Uint16 = ((UINT16) Strtoi (ConnectStr) & (BIT0 | BIT1)); + Uint16 = ((UINT16)Strtoi (ConnectStr) & (BIT0 | BIT1)); } - Info |= (Uint16 << 6); + Info |= (Uint16 << 6); } else { - Info = (UINT16) Strtoi (SASSATAStr); + Info = (UINT16)Strtoi (SASSATAStr); } SasEx->DeviceTopology = Info; - return (EFI_DEVICE_PATH_PROTOCOL *) SasEx; + return (EFI_DEVICE_PATH_PROTOCOL *)SasEx; } /** @@ -1747,32 +1761,32 @@ DevPathFromTextSasEx ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextNVMe ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { - CHAR16 *NamespaceIdStr; - CHAR16 *NamespaceUuidStr; - NVME_NAMESPACE_DEVICE_PATH *Nvme; - UINT8 *Uuid; - UINTN Index; + CHAR16 *NamespaceIdStr; + CHAR16 *NamespaceUuidStr; + NVME_NAMESPACE_DEVICE_PATH *Nvme; + UINT8 *Uuid; + UINTN Index; NamespaceIdStr = GetNextParamStr (&TextDeviceNode); NamespaceUuidStr = GetNextParamStr (&TextDeviceNode); - Nvme = (NVME_NAMESPACE_DEVICE_PATH *) CreateDeviceNode ( - MESSAGING_DEVICE_PATH, - MSG_NVME_NAMESPACE_DP, - (UINT16) sizeof (NVME_NAMESPACE_DEVICE_PATH) - ); + Nvme = (NVME_NAMESPACE_DEVICE_PATH *)CreateDeviceNode ( + MESSAGING_DEVICE_PATH, + MSG_NVME_NAMESPACE_DP, + (UINT16)sizeof (NVME_NAMESPACE_DEVICE_PATH) + ); - Nvme->NamespaceId = (UINT32) Strtoi (NamespaceIdStr); - Uuid = (UINT8 *) &Nvme->NamespaceUuid; + Nvme->NamespaceId = (UINT32)Strtoi (NamespaceIdStr); + Uuid = (UINT8 *)&Nvme->NamespaceUuid; Index = sizeof (Nvme->NamespaceUuid) / sizeof (UINT8); while (Index-- != 0) { - Uuid[Index] = (UINT8) StrHexToUintn (SplitStr (&NamespaceUuidStr, '-')); + Uuid[Index] = (UINT8)StrHexToUintn (SplitStr (&NamespaceUuidStr, '-')); } - return (EFI_DEVICE_PATH_PROTOCOL *) Nvme; + return (EFI_DEVICE_PATH_PROTOCOL *)Nvme; } /** @@ -1786,25 +1800,25 @@ DevPathFromTextNVMe ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextUfs ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { - CHAR16 *PunStr; - CHAR16 *LunStr; - UFS_DEVICE_PATH *Ufs; + CHAR16 *PunStr; + CHAR16 *LunStr; + UFS_DEVICE_PATH *Ufs; PunStr = GetNextParamStr (&TextDeviceNode); LunStr = GetNextParamStr (&TextDeviceNode); - Ufs = (UFS_DEVICE_PATH *) CreateDeviceNode ( - MESSAGING_DEVICE_PATH, - MSG_UFS_DP, - (UINT16) sizeof (UFS_DEVICE_PATH) - ); + Ufs = (UFS_DEVICE_PATH *)CreateDeviceNode ( + MESSAGING_DEVICE_PATH, + MSG_UFS_DP, + (UINT16)sizeof (UFS_DEVICE_PATH) + ); - Ufs->Pun = (UINT8) Strtoi (PunStr); - Ufs->Lun = (UINT8) Strtoi (LunStr); + Ufs->Pun = (UINT8)Strtoi (PunStr); + Ufs->Lun = (UINT8)Strtoi (LunStr); - return (EFI_DEVICE_PATH_PROTOCOL *) Ufs; + return (EFI_DEVICE_PATH_PROTOCOL *)Ufs; } /** @@ -1818,22 +1832,22 @@ DevPathFromTextUfs ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextSd ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { - CHAR16 *SlotNumberStr; - SD_DEVICE_PATH *Sd; + CHAR16 *SlotNumberStr; + SD_DEVICE_PATH *Sd; SlotNumberStr = GetNextParamStr (&TextDeviceNode); - Sd = (SD_DEVICE_PATH *) CreateDeviceNode ( - MESSAGING_DEVICE_PATH, - MSG_SD_DP, - (UINT16) sizeof (SD_DEVICE_PATH) - ); + Sd = (SD_DEVICE_PATH *)CreateDeviceNode ( + MESSAGING_DEVICE_PATH, + MSG_SD_DP, + (UINT16)sizeof (SD_DEVICE_PATH) + ); - Sd->SlotNumber = (UINT8) Strtoi (SlotNumberStr); + Sd->SlotNumber = (UINT8)Strtoi (SlotNumberStr); - return (EFI_DEVICE_PATH_PROTOCOL *) Sd; + return (EFI_DEVICE_PATH_PROTOCOL *)Sd; } /** @@ -1847,22 +1861,22 @@ DevPathFromTextSd ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextEmmc ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { CHAR16 *SlotNumberStr; EMMC_DEVICE_PATH *Emmc; SlotNumberStr = GetNextParamStr (&TextDeviceNode); - Emmc = (EMMC_DEVICE_PATH *) CreateDeviceNode ( - MESSAGING_DEVICE_PATH, - MSG_EMMC_DP, - (UINT16) sizeof (EMMC_DEVICE_PATH) - ); + Emmc = (EMMC_DEVICE_PATH *)CreateDeviceNode ( + MESSAGING_DEVICE_PATH, + MSG_EMMC_DP, + (UINT16)sizeof (EMMC_DEVICE_PATH) + ); - Emmc->SlotNumber = (UINT8) Strtoi (SlotNumberStr); + Emmc->SlotNumber = (UINT8)Strtoi (SlotNumberStr); - return (EFI_DEVICE_PATH_PROTOCOL *) Emmc; + return (EFI_DEVICE_PATH_PROTOCOL *)Emmc; } /** @@ -1876,20 +1890,20 @@ DevPathFromTextEmmc ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextDebugPort ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { VENDOR_DEVICE_PATH *Vend; - Vend = (VENDOR_DEVICE_PATH *) CreateDeviceNode ( - MESSAGING_DEVICE_PATH, - MSG_VENDOR_DP, - (UINT16) sizeof (VENDOR_DEVICE_PATH) - ); + Vend = (VENDOR_DEVICE_PATH *)CreateDeviceNode ( + MESSAGING_DEVICE_PATH, + MSG_VENDOR_DP, + (UINT16)sizeof (VENDOR_DEVICE_PATH) + ); CopyGuid (&Vend->Guid, &gEfiDebugPortProtocolGuid); - return (EFI_DEVICE_PATH_PROTOCOL *) Vend; + return (EFI_DEVICE_PATH_PROTOCOL *)Vend; } /** @@ -1903,7 +1917,7 @@ DevPathFromTextDebugPort ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextMAC ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { CHAR16 *AddressStr; @@ -1911,27 +1925,26 @@ DevPathFromTextMAC ( UINTN Length; MAC_ADDR_DEVICE_PATH *MACDevPath; - AddressStr = GetNextParamStr (&TextDeviceNode); - IfTypeStr = GetNextParamStr (&TextDeviceNode); - MACDevPath = (MAC_ADDR_DEVICE_PATH *) CreateDeviceNode ( - MESSAGING_DEVICE_PATH, - MSG_MAC_ADDR_DP, - (UINT16) sizeof (MAC_ADDR_DEVICE_PATH) - ); + AddressStr = GetNextParamStr (&TextDeviceNode); + IfTypeStr = GetNextParamStr (&TextDeviceNode); + MACDevPath = (MAC_ADDR_DEVICE_PATH *)CreateDeviceNode ( + MESSAGING_DEVICE_PATH, + MSG_MAC_ADDR_DP, + (UINT16)sizeof (MAC_ADDR_DEVICE_PATH) + ); - MACDevPath->IfType = (UINT8) Strtoi (IfTypeStr); + MACDevPath->IfType = (UINT8)Strtoi (IfTypeStr); Length = sizeof (EFI_MAC_ADDRESS); - if (MACDevPath->IfType == 0x01 || MACDevPath->IfType == 0x00) { + if ((MACDevPath->IfType == 0x01) || (MACDevPath->IfType == 0x00)) { Length = 6; } StrHexToBytes (AddressStr, Length * 2, MACDevPath->MacAddress.Addr, Length); - return (EFI_DEVICE_PATH_PROTOCOL *) MACDevPath; + return (EFI_DEVICE_PATH_PROTOCOL *)MACDevPath; } - /** Converts a text format to the network protocol ID. @@ -1943,7 +1956,7 @@ DevPathFromTextMAC ( static UINTN NetworkProtocolFromText ( - IN CHAR16 *Text + IN CHAR16 *Text ) { if (StrCmp (Text, "UDP") == 0) { @@ -1957,7 +1970,6 @@ NetworkProtocolFromText ( return Strtoi (Text); } - /** Converts a text device path node to IPV4 device path structure. @@ -1969,7 +1981,7 @@ NetworkProtocolFromText ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextIPv4 ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { CHAR16 *RemoteIPStr; @@ -1980,20 +1992,20 @@ DevPathFromTextIPv4 ( CHAR16 *SubnetMaskStr; IPv4_DEVICE_PATH *IPv4; - RemoteIPStr = GetNextParamStr (&TextDeviceNode); - ProtocolStr = GetNextParamStr (&TextDeviceNode); - TypeStr = GetNextParamStr (&TextDeviceNode); - LocalIPStr = GetNextParamStr (&TextDeviceNode); - GatewayIPStr = GetNextParamStr (&TextDeviceNode); - SubnetMaskStr = GetNextParamStr (&TextDeviceNode); - IPv4 = (IPv4_DEVICE_PATH *) CreateDeviceNode ( - MESSAGING_DEVICE_PATH, - MSG_IPv4_DP, - (UINT16) sizeof (IPv4_DEVICE_PATH) - ); + RemoteIPStr = GetNextParamStr (&TextDeviceNode); + ProtocolStr = GetNextParamStr (&TextDeviceNode); + TypeStr = GetNextParamStr (&TextDeviceNode); + LocalIPStr = GetNextParamStr (&TextDeviceNode); + GatewayIPStr = GetNextParamStr (&TextDeviceNode); + SubnetMaskStr = GetNextParamStr (&TextDeviceNode); + IPv4 = (IPv4_DEVICE_PATH *)CreateDeviceNode ( + MESSAGING_DEVICE_PATH, + MSG_IPv4_DP, + (UINT16)sizeof (IPv4_DEVICE_PATH) + ); StrToIpv4Address (RemoteIPStr, NULL, &IPv4->RemoteIpAddress, NULL); - IPv4->Protocol = (UINT16) NetworkProtocolFromText (ProtocolStr); + IPv4->Protocol = (UINT16)NetworkProtocolFromText (ProtocolStr); if (StrCmp (TypeStr, "Static") == 0) { IPv4->StaticIpAddress = TRUE; } else { @@ -2002,17 +2014,17 @@ DevPathFromTextIPv4 ( StrToIpv4Address (LocalIPStr, NULL, &IPv4->LocalIpAddress, NULL); if (!IS_NULL (*GatewayIPStr) && !IS_NULL (*SubnetMaskStr)) { - StrToIpv4Address (GatewayIPStr, NULL, &IPv4->GatewayIpAddress, NULL); - StrToIpv4Address (SubnetMaskStr, NULL, &IPv4->SubnetMask, NULL); + StrToIpv4Address (GatewayIPStr, NULL, &IPv4->GatewayIpAddress, NULL); + StrToIpv4Address (SubnetMaskStr, NULL, &IPv4->SubnetMask, NULL); } else { ZeroMem (&IPv4->GatewayIpAddress, sizeof (IPv4->GatewayIpAddress)); - ZeroMem (&IPv4->SubnetMask, sizeof (IPv4->SubnetMask)); + ZeroMem (&IPv4->SubnetMask, sizeof (IPv4->SubnetMask)); } - IPv4->LocalPort = 0; - IPv4->RemotePort = 0; + IPv4->LocalPort = 0; + IPv4->RemotePort = 0; - return (EFI_DEVICE_PATH_PROTOCOL *) IPv4; + return (EFI_DEVICE_PATH_PROTOCOL *)IPv4; } /** @@ -2026,7 +2038,7 @@ DevPathFromTextIPv4 ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextIPv6 ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { CHAR16 *RemoteIPStr; @@ -2037,20 +2049,20 @@ DevPathFromTextIPv6 ( CHAR16 *PrefixLengthStr; IPv6_DEVICE_PATH *IPv6; - RemoteIPStr = GetNextParamStr (&TextDeviceNode); - ProtocolStr = GetNextParamStr (&TextDeviceNode); - TypeStr = GetNextParamStr (&TextDeviceNode); - LocalIPStr = GetNextParamStr (&TextDeviceNode); - PrefixLengthStr = GetNextParamStr (&TextDeviceNode); - GatewayIPStr = GetNextParamStr (&TextDeviceNode); - IPv6 = (IPv6_DEVICE_PATH *) CreateDeviceNode ( - MESSAGING_DEVICE_PATH, - MSG_IPv6_DP, - (UINT16) sizeof (IPv6_DEVICE_PATH) - ); + RemoteIPStr = GetNextParamStr (&TextDeviceNode); + ProtocolStr = GetNextParamStr (&TextDeviceNode); + TypeStr = GetNextParamStr (&TextDeviceNode); + LocalIPStr = GetNextParamStr (&TextDeviceNode); + PrefixLengthStr = GetNextParamStr (&TextDeviceNode); + GatewayIPStr = GetNextParamStr (&TextDeviceNode); + IPv6 = (IPv6_DEVICE_PATH *)CreateDeviceNode ( + MESSAGING_DEVICE_PATH, + MSG_IPv6_DP, + (UINT16)sizeof (IPv6_DEVICE_PATH) + ); StrToIpv6Address (RemoteIPStr, NULL, &IPv6->RemoteIpAddress, NULL); - IPv6->Protocol = (UINT16) NetworkProtocolFromText (ProtocolStr); + IPv6->Protocol = (UINT16)NetworkProtocolFromText (ProtocolStr); if (StrCmp (TypeStr, "Static") == 0) { IPv6->IpAddressOrigin = 0; } else if (StrCmp (TypeStr, "StatelessAutoConfigure") == 0) { @@ -2062,16 +2074,16 @@ DevPathFromTextIPv6 ( StrToIpv6Address (LocalIPStr, NULL, &IPv6->LocalIpAddress, NULL); if (!IS_NULL (*GatewayIPStr) && !IS_NULL (*PrefixLengthStr)) { StrToIpv6Address (GatewayIPStr, NULL, &IPv6->GatewayIpAddress, NULL); - IPv6->PrefixLength = (UINT8) Strtoi (PrefixLengthStr); + IPv6->PrefixLength = (UINT8)Strtoi (PrefixLengthStr); } else { ZeroMem (&IPv6->GatewayIpAddress, sizeof (IPv6->GatewayIpAddress)); IPv6->PrefixLength = 0; } - IPv6->LocalPort = 0; - IPv6->RemotePort = 0; + IPv6->LocalPort = 0; + IPv6->RemotePort = 0; - return (EFI_DEVICE_PATH_PROTOCOL *) IPv6; + return (EFI_DEVICE_PATH_PROTOCOL *)IPv6; } /** @@ -2085,7 +2097,7 @@ DevPathFromTextIPv6 ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextUart ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { CHAR16 *BaudStr; @@ -2094,65 +2106,66 @@ DevPathFromTextUart ( CHAR16 *StopBitsStr; UART_DEVICE_PATH *Uart; - BaudStr = GetNextParamStr (&TextDeviceNode); - DataBitsStr = GetNextParamStr (&TextDeviceNode); - ParityStr = GetNextParamStr (&TextDeviceNode); - StopBitsStr = GetNextParamStr (&TextDeviceNode); - Uart = (UART_DEVICE_PATH *) CreateDeviceNode ( - MESSAGING_DEVICE_PATH, - MSG_UART_DP, - (UINT16) sizeof (UART_DEVICE_PATH) - ); + BaudStr = GetNextParamStr (&TextDeviceNode); + DataBitsStr = GetNextParamStr (&TextDeviceNode); + ParityStr = GetNextParamStr (&TextDeviceNode); + StopBitsStr = GetNextParamStr (&TextDeviceNode); + Uart = (UART_DEVICE_PATH *)CreateDeviceNode ( + MESSAGING_DEVICE_PATH, + MSG_UART_DP, + (UINT16)sizeof (UART_DEVICE_PATH) + ); if (StrCmp (BaudStr, "DEFAULT") == 0) { Uart->BaudRate = 115200; } else { Strtoi64 (BaudStr, &Uart->BaudRate); } - Uart->DataBits = (UINT8) ((StrCmp (DataBitsStr, "DEFAULT") == 0) ? 8 : Strtoi (DataBitsStr)); + + Uart->DataBits = (UINT8)((StrCmp (DataBitsStr, "DEFAULT") == 0) ? 8 : Strtoi (DataBitsStr)); switch (*ParityStr) { - case 'D': - Uart->Parity = 0; - break; + case 'D': + Uart->Parity = 0; + break; - case 'N': - Uart->Parity = 1; - break; + case 'N': + Uart->Parity = 1; + break; - case 'E': - Uart->Parity = 2; - break; + case 'E': + Uart->Parity = 2; + break; - case 'O': - Uart->Parity = 3; - break; + case 'O': + Uart->Parity = 3; + break; - case 'M': - Uart->Parity = 4; - break; + case 'M': + Uart->Parity = 4; + break; - case 'S': - Uart->Parity = 5; - break; + case 'S': + Uart->Parity = 5; + break; - default: - Uart->Parity = (UINT8) Strtoi (ParityStr); - break; + default: + Uart->Parity = (UINT8)Strtoi (ParityStr); + break; } if (StrCmp (StopBitsStr, "D") == 0) { - Uart->StopBits = (UINT8) 0; + Uart->StopBits = (UINT8)0; } else if (StrCmp (StopBitsStr, "1") == 0) { - Uart->StopBits = (UINT8) 1; + Uart->StopBits = (UINT8)1; } else if (StrCmp (StopBitsStr, "1.5") == 0) { - Uart->StopBits = (UINT8) 2; + Uart->StopBits = (UINT8)2; } else if (StrCmp (StopBitsStr, "2") == 0) { - Uart->StopBits = (UINT8) 3; + Uart->StopBits = (UINT8)3; } else { - Uart->StopBits = (UINT8) Strtoi (StopBitsStr); + Uart->StopBits = (UINT8)Strtoi (StopBitsStr); } - return (EFI_DEVICE_PATH_PROTOCOL *) Uart; + return (EFI_DEVICE_PATH_PROTOCOL *)Uart; } /** @@ -2167,41 +2180,42 @@ DevPathFromTextUart ( static EFI_DEVICE_PATH_PROTOCOL * ConvertFromTextUsbClass ( - IN CHAR16 *TextDeviceNode, - IN USB_CLASS_TEXT *UsbClassText + IN CHAR16 *TextDeviceNode, + IN USB_CLASS_TEXT *UsbClassText ) { - CHAR16 *VIDStr; - CHAR16 *PIDStr; - CHAR16 *ClassStr; - CHAR16 *SubClassStr; - CHAR16 *ProtocolStr; - USB_CLASS_DEVICE_PATH *UsbClass; + CHAR16 *VIDStr; + CHAR16 *PIDStr; + CHAR16 *ClassStr; + CHAR16 *SubClassStr; + CHAR16 *ProtocolStr; + USB_CLASS_DEVICE_PATH *UsbClass; - UsbClass = (USB_CLASS_DEVICE_PATH *) CreateDeviceNode ( - MESSAGING_DEVICE_PATH, - MSG_USB_CLASS_DP, - (UINT16) sizeof (USB_CLASS_DEVICE_PATH) - ); + UsbClass = (USB_CLASS_DEVICE_PATH *)CreateDeviceNode ( + MESSAGING_DEVICE_PATH, + MSG_USB_CLASS_DP, + (UINT16)sizeof (USB_CLASS_DEVICE_PATH) + ); - VIDStr = GetNextParamStr (&TextDeviceNode); - PIDStr = GetNextParamStr (&TextDeviceNode); + VIDStr = GetNextParamStr (&TextDeviceNode); + PIDStr = GetNextParamStr (&TextDeviceNode); if (UsbClassText->ClassExist) { ClassStr = GetNextParamStr (&TextDeviceNode); if (*ClassStr == '\0') { UsbClass->DeviceClass = 0xFF; } else { - UsbClass->DeviceClass = (UINT8) Strtoi (ClassStr); + UsbClass->DeviceClass = (UINT8)Strtoi (ClassStr); } } else { UsbClass->DeviceClass = UsbClassText->Class; } + if (UsbClassText->SubClassExist) { SubClassStr = GetNextParamStr (&TextDeviceNode); if (*SubClassStr == '\0') { UsbClass->DeviceSubClass = 0xFF; } else { - UsbClass->DeviceSubClass = (UINT8) Strtoi (SubClassStr); + UsbClass->DeviceSubClass = (UINT8)Strtoi (SubClassStr); } } else { UsbClass->DeviceSubClass = UsbClassText->SubClass; @@ -2210,25 +2224,26 @@ ConvertFromTextUsbClass ( ProtocolStr = GetNextParamStr (&TextDeviceNode); if (*VIDStr == '\0') { - UsbClass->VendorId = 0xFFFF; + UsbClass->VendorId = 0xFFFF; } else { - UsbClass->VendorId = (UINT16) Strtoi (VIDStr); + UsbClass->VendorId = (UINT16)Strtoi (VIDStr); } + if (*PIDStr == '\0') { - UsbClass->ProductId = 0xFFFF; + UsbClass->ProductId = 0xFFFF; } else { - UsbClass->ProductId = (UINT16) Strtoi (PIDStr); + UsbClass->ProductId = (UINT16)Strtoi (PIDStr); } + if (*ProtocolStr == '\0') { - UsbClass->DeviceProtocol = 0xFF; + UsbClass->DeviceProtocol = 0xFF; } else { - UsbClass->DeviceProtocol = (UINT8) Strtoi (ProtocolStr); + UsbClass->DeviceProtocol = (UINT8)Strtoi (ProtocolStr); } - return (EFI_DEVICE_PATH_PROTOCOL *) UsbClass; + return (EFI_DEVICE_PATH_PROTOCOL *)UsbClass; } - /** Converts a text device path node to USB class device path structure. @@ -2240,7 +2255,7 @@ ConvertFromTextUsbClass ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextUsbClass ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { USB_CLASS_TEXT UsbClassText; @@ -2262,7 +2277,7 @@ DevPathFromTextUsbClass ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextUsbAudio ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { USB_CLASS_TEXT UsbClassText; @@ -2285,7 +2300,7 @@ DevPathFromTextUsbAudio ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextUsbCDCControl ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { USB_CLASS_TEXT UsbClassText; @@ -2308,7 +2323,7 @@ DevPathFromTextUsbCDCControl ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextUsbHID ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { USB_CLASS_TEXT UsbClassText; @@ -2331,7 +2346,7 @@ DevPathFromTextUsbHID ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextUsbImage ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { USB_CLASS_TEXT UsbClassText; @@ -2354,7 +2369,7 @@ DevPathFromTextUsbImage ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextUsbPrinter ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { USB_CLASS_TEXT UsbClassText; @@ -2377,7 +2392,7 @@ DevPathFromTextUsbPrinter ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextUsbMassStorage ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { USB_CLASS_TEXT UsbClassText; @@ -2400,7 +2415,7 @@ DevPathFromTextUsbMassStorage ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextUsbHub ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { USB_CLASS_TEXT UsbClassText; @@ -2423,7 +2438,7 @@ DevPathFromTextUsbHub ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextUsbCDCData ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { USB_CLASS_TEXT UsbClassText; @@ -2446,7 +2461,7 @@ DevPathFromTextUsbCDCData ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextUsbSmartCard ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { USB_CLASS_TEXT UsbClassText; @@ -2469,7 +2484,7 @@ DevPathFromTextUsbSmartCard ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextUsbVideo ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { USB_CLASS_TEXT UsbClassText; @@ -2492,7 +2507,7 @@ DevPathFromTextUsbVideo ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextUsbDiagnostic ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { USB_CLASS_TEXT UsbClassText; @@ -2515,7 +2530,7 @@ DevPathFromTextUsbDiagnostic ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextUsbWireless ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { USB_CLASS_TEXT UsbClassText; @@ -2538,7 +2553,7 @@ DevPathFromTextUsbWireless ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextUsbDeviceFirmwareUpdate ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { USB_CLASS_TEXT UsbClassText; @@ -2562,7 +2577,7 @@ DevPathFromTextUsbDeviceFirmwareUpdate ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextUsbIrdaBridge ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { USB_CLASS_TEXT UsbClassText; @@ -2586,7 +2601,7 @@ DevPathFromTextUsbIrdaBridge ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextUsbTestAndMeasurement ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { USB_CLASS_TEXT UsbClassText; @@ -2610,7 +2625,7 @@ DevPathFromTextUsbTestAndMeasurement ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextUsbWwid ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { CHAR16 *VIDStr; @@ -2620,39 +2635,41 @@ DevPathFromTextUsbWwid ( USB_WWID_DEVICE_PATH *UsbWwid; UINTN SerialNumberStrLen; - VIDStr = GetNextParamStr (&TextDeviceNode); - PIDStr = GetNextParamStr (&TextDeviceNode); - InterfaceNumStr = GetNextParamStr (&TextDeviceNode); - SerialNumberStr = GetNextParamStr (&TextDeviceNode); - SerialNumberStrLen = StrLen (SerialNumberStr); - if (SerialNumberStrLen >= 2 && - SerialNumberStr[0] == '\"' && - SerialNumberStr[SerialNumberStrLen - 1] == '\"' - ) { + VIDStr = GetNextParamStr (&TextDeviceNode); + PIDStr = GetNextParamStr (&TextDeviceNode); + InterfaceNumStr = GetNextParamStr (&TextDeviceNode); + SerialNumberStr = GetNextParamStr (&TextDeviceNode); + SerialNumberStrLen = StrLen (SerialNumberStr); + if ((SerialNumberStrLen >= 2) && + (SerialNumberStr[0] == '\"') && + (SerialNumberStr[SerialNumberStrLen - 1] == '\"') + ) + { SerialNumberStr[SerialNumberStrLen - 1] = '\0'; SerialNumberStr++; SerialNumberStrLen -= 2; } - UsbWwid = (USB_WWID_DEVICE_PATH *) CreateDeviceNode ( - MESSAGING_DEVICE_PATH, - MSG_USB_WWID_DP, - (UINT16) (sizeof (USB_WWID_DEVICE_PATH) + SerialNumberStrLen * sizeof (CHAR16)) - ); - UsbWwid->VendorId = (UINT16) Strtoi (VIDStr); - UsbWwid->ProductId = (UINT16) Strtoi (PIDStr); - UsbWwid->InterfaceNumber = (UINT16) Strtoi (InterfaceNumStr); + + UsbWwid = (USB_WWID_DEVICE_PATH *)CreateDeviceNode ( + MESSAGING_DEVICE_PATH, + MSG_USB_WWID_DP, + (UINT16)(sizeof (USB_WWID_DEVICE_PATH) + SerialNumberStrLen * sizeof (CHAR16)) + ); + UsbWwid->VendorId = (UINT16)Strtoi (VIDStr); + UsbWwid->ProductId = (UINT16)Strtoi (PIDStr); + UsbWwid->InterfaceNumber = (UINT16)Strtoi (InterfaceNumStr); // // There is no memory allocated in UsbWwid for the '\0' in SerialNumberStr. // Therefore, the '\0' will not be copied. // CopyMem ( - (UINT8 *) UsbWwid + sizeof (USB_WWID_DEVICE_PATH), + (UINT8 *)UsbWwid + sizeof (USB_WWID_DEVICE_PATH), SerialNumberStr, SerialNumberStrLen * sizeof (CHAR16) ); - return (EFI_DEVICE_PATH_PROTOCOL *) UsbWwid; + return (EFI_DEVICE_PATH_PROTOCOL *)UsbWwid; } /** @@ -2666,22 +2683,22 @@ DevPathFromTextUsbWwid ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextUnit ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { - CHAR16 *LunStr; - DEVICE_LOGICAL_UNIT_DEVICE_PATH *LogicalUnit; + CHAR16 *LunStr; + DEVICE_LOGICAL_UNIT_DEVICE_PATH *LogicalUnit; LunStr = GetNextParamStr (&TextDeviceNode); - LogicalUnit = (DEVICE_LOGICAL_UNIT_DEVICE_PATH *) CreateDeviceNode ( - MESSAGING_DEVICE_PATH, - MSG_DEVICE_LOGICAL_UNIT_DP, - (UINT16) sizeof (DEVICE_LOGICAL_UNIT_DEVICE_PATH) - ); + LogicalUnit = (DEVICE_LOGICAL_UNIT_DEVICE_PATH *)CreateDeviceNode ( + MESSAGING_DEVICE_PATH, + MSG_DEVICE_LOGICAL_UNIT_DP, + (UINT16)sizeof (DEVICE_LOGICAL_UNIT_DEVICE_PATH) + ); - LogicalUnit->Lun = (UINT8) Strtoi (LunStr); + LogicalUnit->Lun = (UINT8)Strtoi (LunStr); - return (EFI_DEVICE_PATH_PROTOCOL *) LogicalUnit; + return (EFI_DEVICE_PATH_PROTOCOL *)LogicalUnit; } /** @@ -2695,20 +2712,20 @@ DevPathFromTextUnit ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextiSCSI ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { - UINT16 Options; - CHAR16 *NameStr; - CHAR16 *PortalGroupStr; - CHAR16 *LunStr; - CHAR16 *HeaderDigestStr; - CHAR16 *DataDigestStr; - CHAR16 *AuthenticationStr; - CHAR16 *ProtocolStr; - CHAR8 *AsciiStr; - ISCSI_DEVICE_PATH_WITH_NAME *ISCSIDevPath; - UINT64 Lun; + UINT16 Options; + CHAR16 *NameStr; + CHAR16 *PortalGroupStr; + CHAR16 *LunStr; + CHAR16 *HeaderDigestStr; + CHAR16 *DataDigestStr; + CHAR16 *AuthenticationStr; + CHAR16 *ProtocolStr; + CHAR8 *AsciiStr; + ISCSI_DEVICE_PATH_WITH_NAME *ISCSIDevPath; + UINT64 Lun; NameStr = GetNextParamStr (&TextDeviceNode); PortalGroupStr = GetNextParamStr (&TextDeviceNode); @@ -2717,18 +2734,18 @@ DevPathFromTextiSCSI ( DataDigestStr = GetNextParamStr (&TextDeviceNode); AuthenticationStr = GetNextParamStr (&TextDeviceNode); ProtocolStr = GetNextParamStr (&TextDeviceNode); - ISCSIDevPath = (ISCSI_DEVICE_PATH_WITH_NAME *) CreateDeviceNode ( - MESSAGING_DEVICE_PATH, - MSG_ISCSI_DP, - (UINT16) (sizeof (ISCSI_DEVICE_PATH_WITH_NAME) + StrLen (NameStr)) - ); + ISCSIDevPath = (ISCSI_DEVICE_PATH_WITH_NAME *)CreateDeviceNode ( + MESSAGING_DEVICE_PATH, + MSG_ISCSI_DP, + (UINT16)(sizeof (ISCSI_DEVICE_PATH_WITH_NAME) + StrLen (NameStr)) + ); AsciiStr = ISCSIDevPath->TargetName; StrToAscii (NameStr, &AsciiStr); - ISCSIDevPath->TargetPortalGroupTag = (UINT16) Strtoi (PortalGroupStr); + ISCSIDevPath->TargetPortalGroupTag = (UINT16)Strtoi (PortalGroupStr); Strtoi64 (LunStr, &Lun); - WriteUnaligned64 ((UINT64 *) &ISCSIDevPath->Lun, SwapBytes64 (Lun)); + WriteUnaligned64 ((UINT64 *)&ISCSIDevPath->Lun, SwapBytes64 (Lun)); Options = 0x0000; if (StrCmp (HeaderDigestStr, "CRC32C") == 0) { @@ -2747,7 +2764,7 @@ DevPathFromTextiSCSI ( Options |= 0x1000; } - ISCSIDevPath->LoginOption = (UINT16) Options; + ISCSIDevPath->LoginOption = (UINT16)Options; if (IS_NULL (*ProtocolStr) || (StrCmp (ProtocolStr, "TCP") == 0)) { ISCSIDevPath->NetworkProtocol = 0; @@ -2758,7 +2775,7 @@ DevPathFromTextiSCSI ( ISCSIDevPath->NetworkProtocol = 1; } - return (EFI_DEVICE_PATH_PROTOCOL *) ISCSIDevPath; + return (EFI_DEVICE_PATH_PROTOCOL *)ISCSIDevPath; } /** @@ -2772,22 +2789,22 @@ DevPathFromTextiSCSI ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextVlan ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { CHAR16 *VlanStr; VLAN_DEVICE_PATH *Vlan; VlanStr = GetNextParamStr (&TextDeviceNode); - Vlan = (VLAN_DEVICE_PATH *) CreateDeviceNode ( - MESSAGING_DEVICE_PATH, - MSG_VLAN_DP, - (UINT16) sizeof (VLAN_DEVICE_PATH) - ); + Vlan = (VLAN_DEVICE_PATH *)CreateDeviceNode ( + MESSAGING_DEVICE_PATH, + MSG_VLAN_DP, + (UINT16)sizeof (VLAN_DEVICE_PATH) + ); - Vlan->VlanId = (UINT16) Strtoi (VlanStr); + Vlan->VlanId = (UINT16)Strtoi (VlanStr); - return (EFI_DEVICE_PATH_PROTOCOL *) Vlan; + return (EFI_DEVICE_PATH_PROTOCOL *)Vlan; } /** @@ -2801,25 +2818,25 @@ DevPathFromTextVlan ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextBluetooth ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { - CHAR16 *BluetoothStr; - BLUETOOTH_DEVICE_PATH *BluetoothDp; + CHAR16 *BluetoothStr; + BLUETOOTH_DEVICE_PATH *BluetoothDp; BluetoothStr = GetNextParamStr (&TextDeviceNode); - BluetoothDp = (BLUETOOTH_DEVICE_PATH *) CreateDeviceNode ( - MESSAGING_DEVICE_PATH, - MSG_BLUETOOTH_DP, - (UINT16) sizeof (BLUETOOTH_DEVICE_PATH) - ); + BluetoothDp = (BLUETOOTH_DEVICE_PATH *)CreateDeviceNode ( + MESSAGING_DEVICE_PATH, + MSG_BLUETOOTH_DP, + (UINT16)sizeof (BLUETOOTH_DEVICE_PATH) + ); StrHexToBytes ( BluetoothStr, sizeof (BLUETOOTH_ADDRESS) * 2, BluetoothDp->BD_ADDR.Address, sizeof (BLUETOOTH_ADDRESS) ); - return (EFI_DEVICE_PATH_PROTOCOL *) BluetoothDp; + return (EFI_DEVICE_PATH_PROTOCOL *)BluetoothDp; } /** @@ -2833,20 +2850,20 @@ DevPathFromTextBluetooth ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextWiFi ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { - CHAR16 *SSIdStr; - CHAR8 AsciiStr[33]; - UINTN DataLen; - WIFI_DEVICE_PATH *WiFiDp; + CHAR16 *SSIdStr; + CHAR8 AsciiStr[33]; + UINTN DataLen; + WIFI_DEVICE_PATH *WiFiDp; SSIdStr = GetNextParamStr (&TextDeviceNode); - WiFiDp = (WIFI_DEVICE_PATH *) CreateDeviceNode ( - MESSAGING_DEVICE_PATH, - MSG_WIFI_DP, - (UINT16) sizeof (WIFI_DEVICE_PATH) - ); + WiFiDp = (WIFI_DEVICE_PATH *)CreateDeviceNode ( + MESSAGING_DEVICE_PATH, + MSG_WIFI_DP, + (UINT16)sizeof (WIFI_DEVICE_PATH) + ); if (NULL != SSIdStr) { DataLen = StrLen (SSIdStr); @@ -2859,7 +2876,7 @@ DevPathFromTextWiFi ( CopyMem (WiFiDp->SSId, AsciiStr, DataLen); } - return (EFI_DEVICE_PATH_PROTOCOL *) WiFiDp; + return (EFI_DEVICE_PATH_PROTOCOL *)WiFiDp; } /** @@ -2873,27 +2890,29 @@ DevPathFromTextWiFi ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextBluetoothLE ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { - CHAR16 *BluetoothLeAddrStr; - CHAR16 *BluetoothLeAddrTypeStr; - BLUETOOTH_LE_DEVICE_PATH *BluetoothLeDp; + CHAR16 *BluetoothLeAddrStr; + CHAR16 *BluetoothLeAddrTypeStr; + BLUETOOTH_LE_DEVICE_PATH *BluetoothLeDp; BluetoothLeAddrStr = GetNextParamStr (&TextDeviceNode); BluetoothLeAddrTypeStr = GetNextParamStr (&TextDeviceNode); - BluetoothLeDp = (BLUETOOTH_LE_DEVICE_PATH *) CreateDeviceNode ( - MESSAGING_DEVICE_PATH, - MSG_BLUETOOTH_LE_DP, - (UINT16) sizeof (BLUETOOTH_LE_DEVICE_PATH) - ); + BluetoothLeDp = (BLUETOOTH_LE_DEVICE_PATH *)CreateDeviceNode ( + MESSAGING_DEVICE_PATH, + MSG_BLUETOOTH_LE_DP, + (UINT16)sizeof (BLUETOOTH_LE_DEVICE_PATH) + ); - BluetoothLeDp->Address.Type = (UINT8) Strtoi (BluetoothLeAddrTypeStr); + BluetoothLeDp->Address.Type = (UINT8)Strtoi (BluetoothLeAddrTypeStr); StrHexToBytes ( - BluetoothLeAddrStr, sizeof (BluetoothLeDp->Address.Address) * 2, - BluetoothLeDp->Address.Address, sizeof (BluetoothLeDp->Address.Address) + BluetoothLeAddrStr, + sizeof (BluetoothLeDp->Address.Address) * 2, + BluetoothLeDp->Address.Address, + sizeof (BluetoothLeDp->Address.Address) ); - return (EFI_DEVICE_PATH_PROTOCOL *) BluetoothLeDp; + return (EFI_DEVICE_PATH_PROTOCOL *)BluetoothLeDp; } /** @@ -2907,17 +2926,16 @@ DevPathFromTextBluetoothLE ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextDns ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { - CHAR16 *DeviceNodeStr; - CHAR16 *DeviceNodeStrPtr; - UINT32 DnsServerIpCount; - UINT16 DnsDeviceNodeLength; - DNS_DEVICE_PATH *DnsDeviceNode; - UINT32 DnsServerIpIndex; - CHAR16 *DnsServerIp; - + CHAR16 *DeviceNodeStr; + CHAR16 *DeviceNodeStrPtr; + UINT32 DnsServerIpCount; + UINT16 DnsDeviceNodeLength; + DNS_DEVICE_PATH *DnsDeviceNode; + UINT32 DnsServerIpIndex; + CHAR16 *DnsServerIp; // // Count the DNS server address number. @@ -2932,7 +2950,7 @@ DevPathFromTextDns ( DnsServerIpCount = 0; while (DeviceNodeStrPtr != NULL && *DeviceNodeStrPtr != '\0') { GetNextParamStr (&DeviceNodeStrPtr); - DnsServerIpCount ++; + DnsServerIpCount++; } FreePool (DeviceNodeStr); @@ -2949,12 +2967,12 @@ DevPathFromTextDns ( // // Create the DNS DeviceNode. // - DnsDeviceNodeLength = (UINT16) (sizeof (EFI_DEVICE_PATH_PROTOCOL) + sizeof (UINT8) + DnsServerIpCount * sizeof (EFI_IP_ADDRESS)); - DnsDeviceNode = (DNS_DEVICE_PATH *) CreateDeviceNode ( - MESSAGING_DEVICE_PATH, - MSG_DNS_DP, - DnsDeviceNodeLength - ); + DnsDeviceNodeLength = (UINT16)(sizeof (EFI_DEVICE_PATH_PROTOCOL) + sizeof (UINT8) + DnsServerIpCount * sizeof (EFI_IP_ADDRESS)); + DnsDeviceNode = (DNS_DEVICE_PATH *)CreateDeviceNode ( + MESSAGING_DEVICE_PATH, + MSG_DNS_DP, + DnsDeviceNodeLength + ); if (DnsDeviceNode == NULL) { return NULL; } @@ -2980,13 +2998,13 @@ DevPathFromTextDns ( for (DnsServerIpIndex = 0; DnsServerIpIndex < DnsServerIpCount; DnsServerIpIndex++) { DnsServerIp = GetNextParamStr (&TextDeviceNode); if (DnsDeviceNode->IsIPv6 == 0x00) { - StrToIpv4Address (DnsServerIp, NULL, &(DnsDeviceNode->DnsServerIp[DnsServerIpIndex].v4), NULL); + StrToIpv4Address (DnsServerIp, NULL, &(DnsDeviceNode->DnsServerIp[DnsServerIpIndex].v4), NULL); } else { StrToIpv6Address (DnsServerIp, NULL, &(DnsDeviceNode->DnsServerIp[DnsServerIpIndex].v6), NULL); } } - return (EFI_DEVICE_PATH_PROTOCOL *) DnsDeviceNode; + return (EFI_DEVICE_PATH_PROTOCOL *)DnsDeviceNode; } /** @@ -3000,26 +3018,26 @@ DevPathFromTextDns ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextUri ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { CHAR16 *UriStr; UINTN UriLength; URI_DEVICE_PATH *Uri; - UriStr = GetNextParamStr (&TextDeviceNode); + UriStr = GetNextParamStr (&TextDeviceNode); UriLength = StrnLenS (UriStr, MAX_UINT16 - sizeof (URI_DEVICE_PATH)); - Uri = (URI_DEVICE_PATH *) CreateDeviceNode ( - MESSAGING_DEVICE_PATH, - MSG_URI_DP, - (UINT16) (sizeof (URI_DEVICE_PATH) + UriLength) - ); + Uri = (URI_DEVICE_PATH *)CreateDeviceNode ( + MESSAGING_DEVICE_PATH, + MSG_URI_DP, + (UINT16)(sizeof (URI_DEVICE_PATH) + UriLength) + ); while (UriLength-- != 0) { - Uri->Uri[UriLength] = (CHAR8) UriStr[UriLength]; + Uri->Uri[UriLength] = (CHAR8)UriStr[UriLength]; } - return (EFI_DEVICE_PATH_PROTOCOL *) Uri; + return (EFI_DEVICE_PATH_PROTOCOL *)Uri; } /** @@ -3033,7 +3051,7 @@ DevPathFromTextUri ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextMediaPath ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { return DevPathFromTextGenericPath (MEDIA_DEVICE_PATH, TextDeviceNode); @@ -3050,52 +3068,52 @@ DevPathFromTextMediaPath ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextHD ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { - CHAR16 *PartitionStr; - CHAR16 *TypeStr; - CHAR16 *SignatureStr; - CHAR16 *StartStr; - CHAR16 *SizeStr; - UINT32 Signature32; - HARDDRIVE_DEVICE_PATH *Hd; + CHAR16 *PartitionStr; + CHAR16 *TypeStr; + CHAR16 *SignatureStr; + CHAR16 *StartStr; + CHAR16 *SizeStr; + UINT32 Signature32; + HARDDRIVE_DEVICE_PATH *Hd; - PartitionStr = GetNextParamStr (&TextDeviceNode); - TypeStr = GetNextParamStr (&TextDeviceNode); - SignatureStr = GetNextParamStr (&TextDeviceNode); - StartStr = GetNextParamStr (&TextDeviceNode); - SizeStr = GetNextParamStr (&TextDeviceNode); - Hd = (HARDDRIVE_DEVICE_PATH *) CreateDeviceNode ( - MEDIA_DEVICE_PATH, - MEDIA_HARDDRIVE_DP, - (UINT16) sizeof (HARDDRIVE_DEVICE_PATH) - ); + PartitionStr = GetNextParamStr (&TextDeviceNode); + TypeStr = GetNextParamStr (&TextDeviceNode); + SignatureStr = GetNextParamStr (&TextDeviceNode); + StartStr = GetNextParamStr (&TextDeviceNode); + SizeStr = GetNextParamStr (&TextDeviceNode); + Hd = (HARDDRIVE_DEVICE_PATH *)CreateDeviceNode ( + MEDIA_DEVICE_PATH, + MEDIA_HARDDRIVE_DP, + (UINT16)sizeof (HARDDRIVE_DEVICE_PATH) + ); - Hd->PartitionNumber = (UINT32) Strtoi (PartitionStr); + Hd->PartitionNumber = (UINT32)Strtoi (PartitionStr); ZeroMem (Hd->Signature, 16); - Hd->MBRType = (UINT8) 0; + Hd->MBRType = (UINT8)0; if (StrCmp (TypeStr, "MBR") == 0) { Hd->SignatureType = SIGNATURE_TYPE_MBR; Hd->MBRType = 0x01; - Signature32 = (UINT32) Strtoi (SignatureStr); + Signature32 = (UINT32)Strtoi (SignatureStr); CopyMem (Hd->Signature, &Signature32, sizeof (UINT32)); } else if (StrCmp (TypeStr, "GPT") == 0) { Hd->SignatureType = SIGNATURE_TYPE_GUID; Hd->MBRType = 0x02; - StrToGuid (SignatureStr, (EFI_GUID *) Hd->Signature); + StrToGuid (SignatureStr, (EFI_GUID *)Hd->Signature); } else { - Hd->SignatureType = (UINT8) Strtoi (TypeStr); + Hd->SignatureType = (UINT8)Strtoi (TypeStr); } Strtoi64 (StartStr, &Hd->PartitionStart); Strtoi64 (SizeStr, &Hd->PartitionSize); - return (EFI_DEVICE_PATH_PROTOCOL *) Hd; + return (EFI_DEVICE_PATH_PROTOCOL *)Hd; } /** @@ -3109,28 +3127,28 @@ DevPathFromTextHD ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextCDROM ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { - CHAR16 *EntryStr; - CHAR16 *StartStr; - CHAR16 *SizeStr; - CDROM_DEVICE_PATH *CDROMDevPath; + CHAR16 *EntryStr; + CHAR16 *StartStr; + CHAR16 *SizeStr; + CDROM_DEVICE_PATH *CDROMDevPath; - EntryStr = GetNextParamStr (&TextDeviceNode); - StartStr = GetNextParamStr (&TextDeviceNode); - SizeStr = GetNextParamStr (&TextDeviceNode); - CDROMDevPath = (CDROM_DEVICE_PATH *) CreateDeviceNode ( - MEDIA_DEVICE_PATH, - MEDIA_CDROM_DP, - (UINT16) sizeof (CDROM_DEVICE_PATH) - ); + EntryStr = GetNextParamStr (&TextDeviceNode); + StartStr = GetNextParamStr (&TextDeviceNode); + SizeStr = GetNextParamStr (&TextDeviceNode); + CDROMDevPath = (CDROM_DEVICE_PATH *)CreateDeviceNode ( + MEDIA_DEVICE_PATH, + MEDIA_CDROM_DP, + (UINT16)sizeof (CDROM_DEVICE_PATH) + ); - CDROMDevPath->BootEntry = (UINT32) Strtoi (EntryStr); + CDROMDevPath->BootEntry = (UINT32)Strtoi (EntryStr); Strtoi64 (StartStr, &CDROMDevPath->PartitionStart); Strtoi64 (SizeStr, &CDROMDevPath->PartitionSize); - return (EFI_DEVICE_PATH_PROTOCOL *) CDROMDevPath; + return (EFI_DEVICE_PATH_PROTOCOL *)CDROMDevPath; } /** @@ -3144,7 +3162,7 @@ DevPathFromTextCDROM ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextVenMedia ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { return ConvertFromTextVendor ( @@ -3165,32 +3183,32 @@ DevPathFromTextVenMedia ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextFilePath ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { FILEPATH_DEVICE_PATH *File; #ifndef __FreeBSD__ - File = (FILEPATH_DEVICE_PATH *) CreateDeviceNode ( - MEDIA_DEVICE_PATH, - MEDIA_FILEPATH_DP, - (UINT16) (sizeof (FILEPATH_DEVICE_PATH) + StrLen (TextDeviceNode) * 2) - ); + File = (FILEPATH_DEVICE_PATH *)CreateDeviceNode ( + MEDIA_DEVICE_PATH, + MEDIA_FILEPATH_DP, + (UINT16)(sizeof (FILEPATH_DEVICE_PATH) + StrLen (TextDeviceNode) * 2) + ); StrCpyS (File->PathName, StrLen (TextDeviceNode) + 1, TextDeviceNode); #else size_t len = (sizeof (FILEPATH_DEVICE_PATH) + StrLen (TextDeviceNode) * 2); - efi_char * v; - File = (FILEPATH_DEVICE_PATH *) CreateDeviceNode ( - MEDIA_DEVICE_PATH, - MEDIA_FILEPATH_DP, - (UINT16)len - ); + efi_char *v; + File = (FILEPATH_DEVICE_PATH *)CreateDeviceNode ( + MEDIA_DEVICE_PATH, + MEDIA_FILEPATH_DP, + (UINT16)len + ); v = File->PathName; utf8_to_ucs2(TextDeviceNode, &v, &len); #endif - return (EFI_DEVICE_PATH_PROTOCOL *) File; + return (EFI_DEVICE_PATH_PROTOCOL *)File; } /** @@ -3204,22 +3222,22 @@ DevPathFromTextFilePath ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextMedia ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { CHAR16 *GuidStr; MEDIA_PROTOCOL_DEVICE_PATH *Media; GuidStr = GetNextParamStr (&TextDeviceNode); - Media = (MEDIA_PROTOCOL_DEVICE_PATH *) CreateDeviceNode ( - MEDIA_DEVICE_PATH, - MEDIA_PROTOCOL_DP, - (UINT16) sizeof (MEDIA_PROTOCOL_DEVICE_PATH) - ); + Media = (MEDIA_PROTOCOL_DEVICE_PATH *)CreateDeviceNode ( + MEDIA_DEVICE_PATH, + MEDIA_PROTOCOL_DP, + (UINT16)sizeof (MEDIA_PROTOCOL_DEVICE_PATH) + ); StrToGuid (GuidStr, &Media->Protocol); - return (EFI_DEVICE_PATH_PROTOCOL *) Media; + return (EFI_DEVICE_PATH_PROTOCOL *)Media; } /** @@ -3233,22 +3251,22 @@ DevPathFromTextMedia ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextFv ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { CHAR16 *GuidStr; MEDIA_FW_VOL_DEVICE_PATH *Fv; GuidStr = GetNextParamStr (&TextDeviceNode); - Fv = (MEDIA_FW_VOL_DEVICE_PATH *) CreateDeviceNode ( - MEDIA_DEVICE_PATH, - MEDIA_PIWG_FW_VOL_DP, - (UINT16) sizeof (MEDIA_FW_VOL_DEVICE_PATH) - ); + Fv = (MEDIA_FW_VOL_DEVICE_PATH *)CreateDeviceNode ( + MEDIA_DEVICE_PATH, + MEDIA_PIWG_FW_VOL_DP, + (UINT16)sizeof (MEDIA_FW_VOL_DEVICE_PATH) + ); StrToGuid (GuidStr, &Fv->FvName); - return (EFI_DEVICE_PATH_PROTOCOL *) Fv; + return (EFI_DEVICE_PATH_PROTOCOL *)Fv; } /** @@ -3262,22 +3280,22 @@ DevPathFromTextFv ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextFvFile ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { CHAR16 *GuidStr; MEDIA_FW_VOL_FILEPATH_DEVICE_PATH *FvFile; GuidStr = GetNextParamStr (&TextDeviceNode); - FvFile = (MEDIA_FW_VOL_FILEPATH_DEVICE_PATH *) CreateDeviceNode ( - MEDIA_DEVICE_PATH, - MEDIA_PIWG_FW_FILE_DP, - (UINT16) sizeof (MEDIA_FW_VOL_FILEPATH_DEVICE_PATH) - ); + FvFile = (MEDIA_FW_VOL_FILEPATH_DEVICE_PATH *)CreateDeviceNode ( + MEDIA_DEVICE_PATH, + MEDIA_PIWG_FW_FILE_DP, + (UINT16)sizeof (MEDIA_FW_VOL_FILEPATH_DEVICE_PATH) + ); StrToGuid (GuidStr, &FvFile->FvFileName); - return (EFI_DEVICE_PATH_PROTOCOL *) FvFile; + return (EFI_DEVICE_PATH_PROTOCOL *)FvFile; } /** @@ -3291,25 +3309,25 @@ DevPathFromTextFvFile ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextRelativeOffsetRange ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { - CHAR16 *StartingOffsetStr; - CHAR16 *EndingOffsetStr; - MEDIA_RELATIVE_OFFSET_RANGE_DEVICE_PATH *Offset; + CHAR16 *StartingOffsetStr; + CHAR16 *EndingOffsetStr; + MEDIA_RELATIVE_OFFSET_RANGE_DEVICE_PATH *Offset; StartingOffsetStr = GetNextParamStr (&TextDeviceNode); EndingOffsetStr = GetNextParamStr (&TextDeviceNode); - Offset = (MEDIA_RELATIVE_OFFSET_RANGE_DEVICE_PATH *) CreateDeviceNode ( - MEDIA_DEVICE_PATH, - MEDIA_RELATIVE_OFFSET_RANGE_DP, - (UINT16) sizeof (MEDIA_RELATIVE_OFFSET_RANGE_DEVICE_PATH) - ); + Offset = (MEDIA_RELATIVE_OFFSET_RANGE_DEVICE_PATH *)CreateDeviceNode ( + MEDIA_DEVICE_PATH, + MEDIA_RELATIVE_OFFSET_RANGE_DP, + (UINT16)sizeof (MEDIA_RELATIVE_OFFSET_RANGE_DEVICE_PATH) + ); Strtoi64 (StartingOffsetStr, &Offset->StartingOffset); Strtoi64 (EndingOffsetStr, &Offset->EndingOffset); - return (EFI_DEVICE_PATH_PROTOCOL *) Offset; + return (EFI_DEVICE_PATH_PROTOCOL *)Offset; } /** @@ -3323,35 +3341,35 @@ DevPathFromTextRelativeOffsetRange ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextRamDisk ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { - CHAR16 *StartingAddrStr; - CHAR16 *EndingAddrStr; - CHAR16 *TypeGuidStr; - CHAR16 *InstanceStr; - MEDIA_RAM_DISK_DEVICE_PATH *RamDisk; - UINT64 StartingAddr; - UINT64 EndingAddr; + CHAR16 *StartingAddrStr; + CHAR16 *EndingAddrStr; + CHAR16 *TypeGuidStr; + CHAR16 *InstanceStr; + MEDIA_RAM_DISK_DEVICE_PATH *RamDisk; + UINT64 StartingAddr; + UINT64 EndingAddr; StartingAddrStr = GetNextParamStr (&TextDeviceNode); EndingAddrStr = GetNextParamStr (&TextDeviceNode); InstanceStr = GetNextParamStr (&TextDeviceNode); TypeGuidStr = GetNextParamStr (&TextDeviceNode); - RamDisk = (MEDIA_RAM_DISK_DEVICE_PATH *) CreateDeviceNode ( - MEDIA_DEVICE_PATH, - MEDIA_RAM_DISK_DP, - (UINT16) sizeof (MEDIA_RAM_DISK_DEVICE_PATH) - ); + RamDisk = (MEDIA_RAM_DISK_DEVICE_PATH *)CreateDeviceNode ( + MEDIA_DEVICE_PATH, + MEDIA_RAM_DISK_DP, + (UINT16)sizeof (MEDIA_RAM_DISK_DEVICE_PATH) + ); Strtoi64 (StartingAddrStr, &StartingAddr); - WriteUnaligned64 ((UINT64 *) &(RamDisk->StartingAddr[0]), StartingAddr); + WriteUnaligned64 ((UINT64 *)&(RamDisk->StartingAddr[0]), StartingAddr); Strtoi64 (EndingAddrStr, &EndingAddr); - WriteUnaligned64 ((UINT64 *) &(RamDisk->EndingAddr[0]), EndingAddr); - RamDisk->Instance = (UINT16) Strtoi (InstanceStr); + WriteUnaligned64 ((UINT64 *)&(RamDisk->EndingAddr[0]), EndingAddr); + RamDisk->Instance = (UINT16)Strtoi (InstanceStr); StrToGuid (TypeGuidStr, &RamDisk->TypeGuid); - return (EFI_DEVICE_PATH_PROTOCOL *) RamDisk; + return (EFI_DEVICE_PATH_PROTOCOL *)RamDisk; } /** @@ -3365,34 +3383,34 @@ DevPathFromTextRamDisk ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextVirtualDisk ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { - CHAR16 *StartingAddrStr; - CHAR16 *EndingAddrStr; - CHAR16 *InstanceStr; - MEDIA_RAM_DISK_DEVICE_PATH *RamDisk; - UINT64 StartingAddr; - UINT64 EndingAddr; + CHAR16 *StartingAddrStr; + CHAR16 *EndingAddrStr; + CHAR16 *InstanceStr; + MEDIA_RAM_DISK_DEVICE_PATH *RamDisk; + UINT64 StartingAddr; + UINT64 EndingAddr; StartingAddrStr = GetNextParamStr (&TextDeviceNode); EndingAddrStr = GetNextParamStr (&TextDeviceNode); InstanceStr = GetNextParamStr (&TextDeviceNode); - RamDisk = (MEDIA_RAM_DISK_DEVICE_PATH *) CreateDeviceNode ( - MEDIA_DEVICE_PATH, - MEDIA_RAM_DISK_DP, - (UINT16) sizeof (MEDIA_RAM_DISK_DEVICE_PATH) - ); + RamDisk = (MEDIA_RAM_DISK_DEVICE_PATH *)CreateDeviceNode ( + MEDIA_DEVICE_PATH, + MEDIA_RAM_DISK_DP, + (UINT16)sizeof (MEDIA_RAM_DISK_DEVICE_PATH) + ); Strtoi64 (StartingAddrStr, &StartingAddr); - WriteUnaligned64 ((UINT64 *) &(RamDisk->StartingAddr[0]), StartingAddr); + WriteUnaligned64 ((UINT64 *)&(RamDisk->StartingAddr[0]), StartingAddr); Strtoi64 (EndingAddrStr, &EndingAddr); - WriteUnaligned64 ((UINT64 *) &(RamDisk->EndingAddr[0]), EndingAddr); - RamDisk->Instance = (UINT16) Strtoi (InstanceStr); + WriteUnaligned64 ((UINT64 *)&(RamDisk->EndingAddr[0]), EndingAddr); + RamDisk->Instance = (UINT16)Strtoi (InstanceStr); CopyGuid (&RamDisk->TypeGuid, &gEfiVirtualDiskGuid); - return (EFI_DEVICE_PATH_PROTOCOL *) RamDisk; + return (EFI_DEVICE_PATH_PROTOCOL *)RamDisk; } /** @@ -3406,34 +3424,34 @@ DevPathFromTextVirtualDisk ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextVirtualCd ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { - CHAR16 *StartingAddrStr; - CHAR16 *EndingAddrStr; - CHAR16 *InstanceStr; - MEDIA_RAM_DISK_DEVICE_PATH *RamDisk; - UINT64 StartingAddr; - UINT64 EndingAddr; + CHAR16 *StartingAddrStr; + CHAR16 *EndingAddrStr; + CHAR16 *InstanceStr; + MEDIA_RAM_DISK_DEVICE_PATH *RamDisk; + UINT64 StartingAddr; + UINT64 EndingAddr; StartingAddrStr = GetNextParamStr (&TextDeviceNode); EndingAddrStr = GetNextParamStr (&TextDeviceNode); InstanceStr = GetNextParamStr (&TextDeviceNode); - RamDisk = (MEDIA_RAM_DISK_DEVICE_PATH *) CreateDeviceNode ( - MEDIA_DEVICE_PATH, - MEDIA_RAM_DISK_DP, - (UINT16) sizeof (MEDIA_RAM_DISK_DEVICE_PATH) - ); + RamDisk = (MEDIA_RAM_DISK_DEVICE_PATH *)CreateDeviceNode ( + MEDIA_DEVICE_PATH, + MEDIA_RAM_DISK_DP, + (UINT16)sizeof (MEDIA_RAM_DISK_DEVICE_PATH) + ); Strtoi64 (StartingAddrStr, &StartingAddr); - WriteUnaligned64 ((UINT64 *) &(RamDisk->StartingAddr[0]), StartingAddr); + WriteUnaligned64 ((UINT64 *)&(RamDisk->StartingAddr[0]), StartingAddr); Strtoi64 (EndingAddrStr, &EndingAddr); - WriteUnaligned64 ((UINT64 *) &(RamDisk->EndingAddr[0]), EndingAddr); - RamDisk->Instance = (UINT16) Strtoi (InstanceStr); + WriteUnaligned64 ((UINT64 *)&(RamDisk->EndingAddr[0]), EndingAddr); + RamDisk->Instance = (UINT16)Strtoi (InstanceStr); CopyGuid (&RamDisk->TypeGuid, &gEfiVirtualCdGuid); - return (EFI_DEVICE_PATH_PROTOCOL *) RamDisk; + return (EFI_DEVICE_PATH_PROTOCOL *)RamDisk; } /** @@ -3447,34 +3465,34 @@ DevPathFromTextVirtualCd ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextPersistentVirtualDisk ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { - CHAR16 *StartingAddrStr; - CHAR16 *EndingAddrStr; - CHAR16 *InstanceStr; - MEDIA_RAM_DISK_DEVICE_PATH *RamDisk; - UINT64 StartingAddr; - UINT64 EndingAddr; + CHAR16 *StartingAddrStr; + CHAR16 *EndingAddrStr; + CHAR16 *InstanceStr; + MEDIA_RAM_DISK_DEVICE_PATH *RamDisk; + UINT64 StartingAddr; + UINT64 EndingAddr; StartingAddrStr = GetNextParamStr (&TextDeviceNode); EndingAddrStr = GetNextParamStr (&TextDeviceNode); InstanceStr = GetNextParamStr (&TextDeviceNode); - RamDisk = (MEDIA_RAM_DISK_DEVICE_PATH *) CreateDeviceNode ( - MEDIA_DEVICE_PATH, - MEDIA_RAM_DISK_DP, - (UINT16) sizeof (MEDIA_RAM_DISK_DEVICE_PATH) - ); + RamDisk = (MEDIA_RAM_DISK_DEVICE_PATH *)CreateDeviceNode ( + MEDIA_DEVICE_PATH, + MEDIA_RAM_DISK_DP, + (UINT16)sizeof (MEDIA_RAM_DISK_DEVICE_PATH) + ); Strtoi64 (StartingAddrStr, &StartingAddr); - WriteUnaligned64 ((UINT64 *) &(RamDisk->StartingAddr[0]), StartingAddr); + WriteUnaligned64 ((UINT64 *)&(RamDisk->StartingAddr[0]), StartingAddr); Strtoi64 (EndingAddrStr, &EndingAddr); - WriteUnaligned64 ((UINT64 *) &(RamDisk->EndingAddr[0]), EndingAddr); - RamDisk->Instance = (UINT16) Strtoi (InstanceStr); + WriteUnaligned64 ((UINT64 *)&(RamDisk->EndingAddr[0]), EndingAddr); + RamDisk->Instance = (UINT16)Strtoi (InstanceStr); CopyGuid (&RamDisk->TypeGuid, &gEfiPersistentVirtualDiskGuid); - return (EFI_DEVICE_PATH_PROTOCOL *) RamDisk; + return (EFI_DEVICE_PATH_PROTOCOL *)RamDisk; } /** @@ -3488,34 +3506,34 @@ DevPathFromTextPersistentVirtualDisk ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextPersistentVirtualCd ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { - CHAR16 *StartingAddrStr; - CHAR16 *EndingAddrStr; - CHAR16 *InstanceStr; - MEDIA_RAM_DISK_DEVICE_PATH *RamDisk; - UINT64 StartingAddr; - UINT64 EndingAddr; + CHAR16 *StartingAddrStr; + CHAR16 *EndingAddrStr; + CHAR16 *InstanceStr; + MEDIA_RAM_DISK_DEVICE_PATH *RamDisk; + UINT64 StartingAddr; + UINT64 EndingAddr; StartingAddrStr = GetNextParamStr (&TextDeviceNode); EndingAddrStr = GetNextParamStr (&TextDeviceNode); InstanceStr = GetNextParamStr (&TextDeviceNode); - RamDisk = (MEDIA_RAM_DISK_DEVICE_PATH *) CreateDeviceNode ( - MEDIA_DEVICE_PATH, - MEDIA_RAM_DISK_DP, - (UINT16) sizeof (MEDIA_RAM_DISK_DEVICE_PATH) - ); + RamDisk = (MEDIA_RAM_DISK_DEVICE_PATH *)CreateDeviceNode ( + MEDIA_DEVICE_PATH, + MEDIA_RAM_DISK_DP, + (UINT16)sizeof (MEDIA_RAM_DISK_DEVICE_PATH) + ); Strtoi64 (StartingAddrStr, &StartingAddr); - WriteUnaligned64 ((UINT64 *) &(RamDisk->StartingAddr[0]), StartingAddr); + WriteUnaligned64 ((UINT64 *)&(RamDisk->StartingAddr[0]), StartingAddr); Strtoi64 (EndingAddrStr, &EndingAddr); - WriteUnaligned64 ((UINT64 *) &(RamDisk->EndingAddr[0]), EndingAddr); - RamDisk->Instance = (UINT16) Strtoi (InstanceStr); + WriteUnaligned64 ((UINT64 *)&(RamDisk->EndingAddr[0]), EndingAddr); + RamDisk->Instance = (UINT16)Strtoi (InstanceStr); CopyGuid (&RamDisk->TypeGuid, &gEfiPersistentVirtualCdGuid); - return (EFI_DEVICE_PATH_PROTOCOL *) RamDisk; + return (EFI_DEVICE_PATH_PROTOCOL *)RamDisk; } /** @@ -3529,7 +3547,7 @@ DevPathFromTextPersistentVirtualCd ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextBbsPath ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { return DevPathFromTextGenericPath (BBS_DEVICE_PATH, TextDeviceNode); @@ -3546,23 +3564,23 @@ DevPathFromTextBbsPath ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextBBS ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { - CHAR16 *TypeStr; - CHAR16 *IdStr; - CHAR16 *FlagsStr; - CHAR8 *AsciiStr; - BBS_BBS_DEVICE_PATH *Bbs; + CHAR16 *TypeStr; + CHAR16 *IdStr; + CHAR16 *FlagsStr; + CHAR8 *AsciiStr; + BBS_BBS_DEVICE_PATH *Bbs; - TypeStr = GetNextParamStr (&TextDeviceNode); - IdStr = GetNextParamStr (&TextDeviceNode); - FlagsStr = GetNextParamStr (&TextDeviceNode); - Bbs = (BBS_BBS_DEVICE_PATH *) CreateDeviceNode ( - BBS_DEVICE_PATH, - BBS_BBS_DP, - (UINT16) (sizeof (BBS_BBS_DEVICE_PATH) + StrLen (IdStr)) - ); + TypeStr = GetNextParamStr (&TextDeviceNode); + IdStr = GetNextParamStr (&TextDeviceNode); + FlagsStr = GetNextParamStr (&TextDeviceNode); + Bbs = (BBS_BBS_DEVICE_PATH *)CreateDeviceNode ( + BBS_DEVICE_PATH, + BBS_BBS_DP, + (UINT16)(sizeof (BBS_BBS_DEVICE_PATH) + StrLen (IdStr)) + ); if (StrCmp (TypeStr, "Floppy") == 0) { Bbs->DeviceType = BBS_TYPE_FLOPPY; @@ -3577,15 +3595,15 @@ DevPathFromTextBBS ( } else if (StrCmp (TypeStr, "Network") == 0) { Bbs->DeviceType = BBS_TYPE_EMBEDDED_NETWORK; } else { - Bbs->DeviceType = (UINT16) Strtoi (TypeStr); + Bbs->DeviceType = (UINT16)Strtoi (TypeStr); } AsciiStr = Bbs->String; StrToAscii (IdStr, &AsciiStr); - Bbs->StatusFlag = (UINT16) Strtoi (FlagsStr); + Bbs->StatusFlag = (UINT16)Strtoi (FlagsStr); - return (EFI_DEVICE_PATH_PROTOCOL *) Bbs; + return (EFI_DEVICE_PATH_PROTOCOL *)Bbs; } /** @@ -3599,24 +3617,24 @@ DevPathFromTextBBS ( static EFI_DEVICE_PATH_PROTOCOL * DevPathFromTextSata ( - IN CHAR16 *TextDeviceNode + IN CHAR16 *TextDeviceNode ) { - SATA_DEVICE_PATH *Sata; - CHAR16 *Param1; - CHAR16 *Param2; - CHAR16 *Param3; + SATA_DEVICE_PATH *Sata; + CHAR16 *Param1; + CHAR16 *Param2; + CHAR16 *Param3; Param1 = GetNextParamStr (&TextDeviceNode); Param2 = GetNextParamStr (&TextDeviceNode); Param3 = GetNextParamStr (&TextDeviceNode); - Sata = (SATA_DEVICE_PATH *) CreateDeviceNode ( - MESSAGING_DEVICE_PATH, - MSG_SATA_DP, - (UINT16) sizeof (SATA_DEVICE_PATH) - ); - Sata->HBAPortNumber = (UINT16) Strtoi (Param1); + Sata = (SATA_DEVICE_PATH *)CreateDeviceNode ( + MESSAGING_DEVICE_PATH, + MSG_SATA_DP, + (UINT16)sizeof (SATA_DEVICE_PATH) + ); + Sata->HBAPortNumber = (UINT16)Strtoi (Param1); // // According to UEFI spec, if PMPN is not provided, the default is 0xFFFF @@ -3624,106 +3642,107 @@ DevPathFromTextSata ( if (*Param2 == '\0' ) { Sata->PortMultiplierPortNumber = 0xFFFF; } else { - Sata->PortMultiplierPortNumber = (UINT16) Strtoi (Param2); + Sata->PortMultiplierPortNumber = (UINT16)Strtoi (Param2); } - Sata->Lun = (UINT16) Strtoi (Param3); - return (EFI_DEVICE_PATH_PROTOCOL *) Sata; + Sata->Lun = (UINT16)Strtoi (Param3); + + return (EFI_DEVICE_PATH_PROTOCOL *)Sata; } -GLOBAL_REMOVE_IF_UNREFERENCED DEVICE_PATH_FROM_TEXT_TABLE mUefiDevicePathLibDevPathFromTextTable[] = { - {"Path", DevPathFromTextPath }, +GLOBAL_REMOVE_IF_UNREFERENCED DEVICE_PATH_FROM_TEXT_TABLE mUefiDevicePathLibDevPathFromTextTable[] = { + { "Path", DevPathFromTextPath }, - {"HardwarePath", DevPathFromTextHardwarePath }, - {"Pci", DevPathFromTextPci }, - {"PcCard", DevPathFromTextPcCard }, - {"MemoryMapped", DevPathFromTextMemoryMapped }, - {"VenHw", DevPathFromTextVenHw }, - {"Ctrl", DevPathFromTextCtrl }, - {"BMC", DevPathFromTextBmc }, + { "HardwarePath", DevPathFromTextHardwarePath }, + { "Pci", DevPathFromTextPci }, + { "PcCard", DevPathFromTextPcCard }, + { "MemoryMapped", DevPathFromTextMemoryMapped }, + { "VenHw", DevPathFromTextVenHw }, + { "Ctrl", DevPathFromTextCtrl }, + { "BMC", DevPathFromTextBmc }, - {"AcpiPath", DevPathFromTextAcpiPath }, - {"Acpi", DevPathFromTextAcpi }, - {"PciRoot", DevPathFromTextPciRoot }, - {"PcieRoot", DevPathFromTextPcieRoot }, - {"Floppy", DevPathFromTextFloppy }, - {"Keyboard", DevPathFromTextKeyboard }, - {"Serial", DevPathFromTextSerial }, - {"ParallelPort", DevPathFromTextParallelPort }, - {"AcpiEx", DevPathFromTextAcpiEx }, - {"AcpiExp", DevPathFromTextAcpiExp }, - {"AcpiAdr", DevPathFromTextAcpiAdr }, + { "AcpiPath", DevPathFromTextAcpiPath }, + { "Acpi", DevPathFromTextAcpi }, + { "PciRoot", DevPathFromTextPciRoot }, + { "PcieRoot", DevPathFromTextPcieRoot }, + { "Floppy", DevPathFromTextFloppy }, + { "Keyboard", DevPathFromTextKeyboard }, + { "Serial", DevPathFromTextSerial }, + { "ParallelPort", DevPathFromTextParallelPort }, + { "AcpiEx", DevPathFromTextAcpiEx }, + { "AcpiExp", DevPathFromTextAcpiExp }, + { "AcpiAdr", DevPathFromTextAcpiAdr }, - {"Msg", DevPathFromTextMsg }, - {"Ata", DevPathFromTextAta }, - {"Scsi", DevPathFromTextScsi }, - {"Fibre", DevPathFromTextFibre }, - {"FibreEx", DevPathFromTextFibreEx }, - {"I1394", DevPathFromText1394 }, - {"USB", DevPathFromTextUsb }, - {"I2O", DevPathFromTextI2O }, - {"Infiniband", DevPathFromTextInfiniband }, - {"VenMsg", DevPathFromTextVenMsg }, - {"VenPcAnsi", DevPathFromTextVenPcAnsi }, - {"VenVt100", DevPathFromTextVenVt100 }, - {"VenVt100Plus", DevPathFromTextVenVt100Plus }, - {"VenUtf8", DevPathFromTextVenUtf8 }, - {"UartFlowCtrl", DevPathFromTextUartFlowCtrl }, - {"SAS", DevPathFromTextSAS }, - {"SasEx", DevPathFromTextSasEx }, - {"NVMe", DevPathFromTextNVMe }, - {"UFS", DevPathFromTextUfs }, - {"SD", DevPathFromTextSd }, - {"eMMC", DevPathFromTextEmmc }, - {"DebugPort", DevPathFromTextDebugPort }, - {"MAC", DevPathFromTextMAC }, - {"IPv4", DevPathFromTextIPv4 }, - {"IPv6", DevPathFromTextIPv6 }, - {"Uart", DevPathFromTextUart }, - {"UsbClass", DevPathFromTextUsbClass }, - {"UsbAudio", DevPathFromTextUsbAudio }, - {"UsbCDCControl", DevPathFromTextUsbCDCControl }, - {"UsbHID", DevPathFromTextUsbHID }, - {"UsbImage", DevPathFromTextUsbImage }, - {"UsbPrinter", DevPathFromTextUsbPrinter }, - {"UsbMassStorage", DevPathFromTextUsbMassStorage }, - {"UsbHub", DevPathFromTextUsbHub }, - {"UsbCDCData", DevPathFromTextUsbCDCData }, - {"UsbSmartCard", DevPathFromTextUsbSmartCard }, - {"UsbVideo", DevPathFromTextUsbVideo }, - {"UsbDiagnostic", DevPathFromTextUsbDiagnostic }, - {"UsbWireless", DevPathFromTextUsbWireless }, - {"UsbDeviceFirmwareUpdate", DevPathFromTextUsbDeviceFirmwareUpdate }, - {"UsbIrdaBridge", DevPathFromTextUsbIrdaBridge }, - {"UsbTestAndMeasurement", DevPathFromTextUsbTestAndMeasurement }, - {"UsbWwid", DevPathFromTextUsbWwid }, - {"Unit", DevPathFromTextUnit }, - {"iSCSI", DevPathFromTextiSCSI }, - {"Vlan", DevPathFromTextVlan }, - {"Dns", DevPathFromTextDns }, - {"Uri", DevPathFromTextUri }, - {"Bluetooth", DevPathFromTextBluetooth }, - {"Wi-Fi", DevPathFromTextWiFi }, - {"BluetoothLE", DevPathFromTextBluetoothLE }, - {"MediaPath", DevPathFromTextMediaPath }, - {"HD", DevPathFromTextHD }, - {"CDROM", DevPathFromTextCDROM }, - {"VenMedia", DevPathFromTextVenMedia }, - {"Media", DevPathFromTextMedia }, - {"Fv", DevPathFromTextFv }, - {"FvFile", DevPathFromTextFvFile }, - {"File", DevPathFromTextFilePath }, - {"Offset", DevPathFromTextRelativeOffsetRange }, - {"RamDisk", DevPathFromTextRamDisk }, - {"VirtualDisk", DevPathFromTextVirtualDisk }, - {"VirtualCD", DevPathFromTextVirtualCd }, - {"PersistentVirtualDisk", DevPathFromTextPersistentVirtualDisk }, - {"PersistentVirtualCD", DevPathFromTextPersistentVirtualCd }, + { "Msg", DevPathFromTextMsg }, + { "Ata", DevPathFromTextAta }, + { "Scsi", DevPathFromTextScsi }, + { "Fibre", DevPathFromTextFibre }, + { "FibreEx", DevPathFromTextFibreEx }, + { "I1394", DevPathFromText1394 }, + { "USB", DevPathFromTextUsb }, + { "I2O", DevPathFromTextI2O }, + { "Infiniband", DevPathFromTextInfiniband }, + { "VenMsg", DevPathFromTextVenMsg }, + { "VenPcAnsi", DevPathFromTextVenPcAnsi }, + { "VenVt100", DevPathFromTextVenVt100 }, + { "VenVt100Plus", DevPathFromTextVenVt100Plus }, + { "VenUtf8", DevPathFromTextVenUtf8 }, + { "UartFlowCtrl", DevPathFromTextUartFlowCtrl }, + { "SAS", DevPathFromTextSAS }, + { "SasEx", DevPathFromTextSasEx }, + { "NVMe", DevPathFromTextNVMe }, + { "UFS", DevPathFromTextUfs }, + { "SD", DevPathFromTextSd }, + { "eMMC", DevPathFromTextEmmc }, + { "DebugPort", DevPathFromTextDebugPort }, + { "MAC", DevPathFromTextMAC }, + { "IPv4", DevPathFromTextIPv4 }, + { "IPv6", DevPathFromTextIPv6 }, + { "Uart", DevPathFromTextUart }, + { "UsbClass", DevPathFromTextUsbClass }, + { "UsbAudio", DevPathFromTextUsbAudio }, + { "UsbCDCControl", DevPathFromTextUsbCDCControl }, + { "UsbHID", DevPathFromTextUsbHID }, + { "UsbImage", DevPathFromTextUsbImage }, + { "UsbPrinter", DevPathFromTextUsbPrinter }, + { "UsbMassStorage", DevPathFromTextUsbMassStorage }, + { "UsbHub", DevPathFromTextUsbHub }, + { "UsbCDCData", DevPathFromTextUsbCDCData }, + { "UsbSmartCard", DevPathFromTextUsbSmartCard }, + { "UsbVideo", DevPathFromTextUsbVideo }, + { "UsbDiagnostic", DevPathFromTextUsbDiagnostic }, + { "UsbWireless", DevPathFromTextUsbWireless }, + { "UsbDeviceFirmwareUpdate", DevPathFromTextUsbDeviceFirmwareUpdate }, + { "UsbIrdaBridge", DevPathFromTextUsbIrdaBridge }, + { "UsbTestAndMeasurement", DevPathFromTextUsbTestAndMeasurement }, + { "UsbWwid", DevPathFromTextUsbWwid }, + { "Unit", DevPathFromTextUnit }, + { "iSCSI", DevPathFromTextiSCSI }, + { "Vlan", DevPathFromTextVlan }, + { "Dns", DevPathFromTextDns }, + { "Uri", DevPathFromTextUri }, + { "Bluetooth", DevPathFromTextBluetooth }, + { "Wi-Fi", DevPathFromTextWiFi }, + { "BluetoothLE", DevPathFromTextBluetoothLE }, + { "MediaPath", DevPathFromTextMediaPath }, + { "HD", DevPathFromTextHD }, + { "CDROM", DevPathFromTextCDROM }, + { "VenMedia", DevPathFromTextVenMedia }, + { "Media", DevPathFromTextMedia }, + { "Fv", DevPathFromTextFv }, + { "FvFile", DevPathFromTextFvFile }, + { "File", DevPathFromTextFilePath }, + { "Offset", DevPathFromTextRelativeOffsetRange }, + { "RamDisk", DevPathFromTextRamDisk }, + { "VirtualDisk", DevPathFromTextVirtualDisk }, + { "VirtualCD", DevPathFromTextVirtualCd }, + { "PersistentVirtualDisk", DevPathFromTextPersistentVirtualDisk }, + { "PersistentVirtualCD", DevPathFromTextPersistentVirtualCd }, - {"BbsPath", DevPathFromTextBbsPath }, - {"BBS", DevPathFromTextBBS }, - {"Sata", DevPathFromTextSata }, - {NULL, NULL} + { "BbsPath", DevPathFromTextBbsPath }, + { "BBS", DevPathFromTextBBS }, + { "Sata", DevPathFromTextSata }, + { NULL, NULL } }; /** @@ -3741,14 +3760,14 @@ static EFI_DEVICE_PATH_PROTOCOL * EFIAPI UefiDevicePathLibConvertTextToDeviceNode ( - IN CONST CHAR16 *TextDeviceNode + IN CONST CHAR16 *TextDeviceNode ) { - DEVICE_PATH_FROM_TEXT FromText; - CHAR16 *ParamStr; - EFI_DEVICE_PATH_PROTOCOL *DeviceNode; - CHAR16 *DeviceNodeStr; - UINTN Index; + DEVICE_PATH_FROM_TEXT FromText; + CHAR16 *ParamStr; + EFI_DEVICE_PATH_PROTOCOL *DeviceNode; + CHAR16 *DeviceNodeStr; + UINTN Index; if ((TextDeviceNode == NULL) || (IS_NULL (*TextDeviceNode))) { return NULL; @@ -3771,7 +3790,7 @@ UefiDevicePathLibConvertTextToDeviceNode ( // // A file path // - FromText = DevPathFromTextFilePath; + FromText = DevPathFromTextFilePath; DeviceNode = FromText (DeviceNodeStr); } else { DeviceNode = FromText (ParamStr); @@ -3799,28 +3818,28 @@ static EFI_DEVICE_PATH_PROTOCOL * EFIAPI UefiDevicePathLibConvertTextToDevicePath ( - IN CONST CHAR16 *TextDevicePath + IN CONST CHAR16 *TextDevicePath ) { - EFI_DEVICE_PATH_PROTOCOL *DeviceNode; - EFI_DEVICE_PATH_PROTOCOL *NewDevicePath; - CHAR16 *DevicePathStr; - CHAR16 *Str; - CHAR16 *DeviceNodeStr; - BOOLEAN IsInstanceEnd; - EFI_DEVICE_PATH_PROTOCOL *DevicePath; + EFI_DEVICE_PATH_PROTOCOL *DeviceNode; + EFI_DEVICE_PATH_PROTOCOL *NewDevicePath; + CHAR16 *DevicePathStr; + CHAR16 *Str; + CHAR16 *DeviceNodeStr; + BOOLEAN IsInstanceEnd; + EFI_DEVICE_PATH_PROTOCOL *DevicePath; if ((TextDevicePath == NULL) || (IS_NULL (*TextDevicePath))) { return NULL; } - DevicePath = (EFI_DEVICE_PATH_PROTOCOL *) AllocatePool (END_DEVICE_PATH_LENGTH); + DevicePath = (EFI_DEVICE_PATH_PROTOCOL *)AllocatePool (END_DEVICE_PATH_LENGTH); ASSERT (DevicePath != NULL); SetDevicePathEndNode (DevicePath); DevicePathStr = UefiDevicePathLibStrDuplicate (TextDevicePath); - Str = DevicePathStr; + Str = DevicePathStr; while ((DeviceNodeStr = GetNextDeviceNodeStr (&Str, &IsInstanceEnd)) != NULL) { DeviceNode = UefiDevicePathLibConvertTextToDeviceNode (DeviceNodeStr); @@ -3830,7 +3849,7 @@ UefiDevicePathLibConvertTextToDevicePath ( DevicePath = NewDevicePath; if (IsInstanceEnd) { - DeviceNode = (EFI_DEVICE_PATH_PROTOCOL *) AllocatePool (END_DEVICE_PATH_LENGTH); + DeviceNode = (EFI_DEVICE_PATH_PROTOCOL *)AllocatePool (END_DEVICE_PATH_LENGTH); ASSERT (DeviceNode != NULL); SetDevicePathEndNode (DeviceNode); DeviceNode->SubType = END_INSTANCE_DEVICE_PATH_SUBTYPE; diff --git a/lib/libefivar/uefi-dplib.h b/lib/libefivar/uefi-dplib.h index 3382cccc6392..17b4a6f0fba5 100644 --- a/lib/libefivar/uefi-dplib.h +++ b/lib/libefivar/uefi-dplib.h @@ -55,28 +55,27 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include #include -#define IS_COMMA(a) ((a) == ',') -#define IS_HYPHEN(a) ((a) == '-') -#define IS_DOT(a) ((a) == '.') -#define IS_LEFT_PARENTH(a) ((a) == '(') -#define IS_RIGHT_PARENTH(a) ((a) == ')') -#define IS_SLASH(a) ((a) == '/') -#define IS_NULL(a) ((a) == '\0') - +#define IS_COMMA(a) ((a) == ',') +#define IS_HYPHEN(a) ((a) == '-') +#define IS_DOT(a) ((a) == '.') +#define IS_LEFT_PARENTH(a) ((a) == '(') +#define IS_RIGHT_PARENTH(a) ((a) == ')') +#define IS_SLASH(a) ((a) == '/') +#define IS_NULL(a) ((a) == '\0') // // Private Data structure // typedef struct { - char *Str; - UINTN Count; - UINTN Capacity; + char *Str; + UINTN Count; + UINTN Capacity; } POOL_PRINT; typedef EFI_DEVICE_PATH_PROTOCOL * (*DEVICE_PATH_FROM_TEXT) ( - IN char *Str + IN char *Str ); typedef @@ -89,90 +88,90 @@ VOID ); typedef struct { - UINT8 Type; - UINT8 SubType; - DEVICE_PATH_TO_TEXT Function; + UINT8 Type; + UINT8 SubType; + DEVICE_PATH_TO_TEXT Function; } DEVICE_PATH_TO_TEXT_TABLE; typedef struct { - UINT8 Type; - const char *Text; + UINT8 Type; + const char *Text; } DEVICE_PATH_TO_TEXT_GENERIC_TABLE; typedef struct { - const char *DevicePathNodeText; - DEVICE_PATH_FROM_TEXT Function; + const char *DevicePathNodeText; + DEVICE_PATH_FROM_TEXT Function; } DEVICE_PATH_FROM_TEXT_TABLE; typedef struct { - BOOLEAN ClassExist; - UINT8 Class; - BOOLEAN SubClassExist; - UINT8 SubClass; + BOOLEAN ClassExist; + UINT8 Class; + BOOLEAN SubClassExist; + UINT8 SubClass; } USB_CLASS_TEXT; -#define USB_CLASS_AUDIO 1 -#define USB_CLASS_CDCCONTROL 2 -#define USB_CLASS_HID 3 -#define USB_CLASS_IMAGE 6 -#define USB_CLASS_PRINTER 7 -#define USB_CLASS_MASS_STORAGE 8 -#define USB_CLASS_HUB 9 -#define USB_CLASS_CDCDATA 10 -#define USB_CLASS_SMART_CARD 11 -#define USB_CLASS_VIDEO 14 -#define USB_CLASS_DIAGNOSTIC 220 -#define USB_CLASS_WIRELESS 224 +#define USB_CLASS_AUDIO 1 +#define USB_CLASS_CDCCONTROL 2 +#define USB_CLASS_HID 3 +#define USB_CLASS_IMAGE 6 +#define USB_CLASS_PRINTER 7 +#define USB_CLASS_MASS_STORAGE 8 +#define USB_CLASS_HUB 9 +#define USB_CLASS_CDCDATA 10 +#define USB_CLASS_SMART_CARD 11 +#define USB_CLASS_VIDEO 14 +#define USB_CLASS_DIAGNOSTIC 220 +#define USB_CLASS_WIRELESS 224 -#define USB_CLASS_RESERVE 254 -#define USB_SUBCLASS_FW_UPDATE 1 -#define USB_SUBCLASS_IRDA_BRIDGE 2 -#define USB_SUBCLASS_TEST 3 +#define USB_CLASS_RESERVE 254 +#define USB_SUBCLASS_FW_UPDATE 1 +#define USB_SUBCLASS_IRDA_BRIDGE 2 +#define USB_SUBCLASS_TEST 3 -#define RFC_1700_UDP_PROTOCOL 17 -#define RFC_1700_TCP_PROTOCOL 6 +#define RFC_1700_UDP_PROTOCOL 17 +#define RFC_1700_TCP_PROTOCOL 6 #pragma pack(1) typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; - EFI_GUID Guid; - UINT8 VendorDefinedData[1]; + EFI_DEVICE_PATH_PROTOCOL Header; + EFI_GUID Guid; + UINT8 VendorDefinedData[1]; } VENDOR_DEFINED_HARDWARE_DEVICE_PATH; typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; - EFI_GUID Guid; - UINT8 VendorDefinedData[1]; + EFI_DEVICE_PATH_PROTOCOL Header; + EFI_GUID Guid; + UINT8 VendorDefinedData[1]; } VENDOR_DEFINED_MESSAGING_DEVICE_PATH; typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; - EFI_GUID Guid; - UINT8 VendorDefinedData[1]; + EFI_DEVICE_PATH_PROTOCOL Header; + EFI_GUID Guid; + UINT8 VendorDefinedData[1]; } VENDOR_DEFINED_MEDIA_DEVICE_PATH; typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; - UINT32 Hid; - UINT32 Uid; - UINT32 Cid; - CHAR8 HidUidCidStr[3]; + EFI_DEVICE_PATH_PROTOCOL Header; + UINT32 Hid; + UINT32 Uid; + UINT32 Cid; + CHAR8 HidUidCidStr[3]; } ACPI_EXTENDED_HID_DEVICE_PATH_WITH_STR; typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; - UINT16 NetworkProtocol; - UINT16 LoginOption; - UINT64 Lun; - UINT16 TargetPortalGroupTag; - CHAR8 TargetName[1]; + EFI_DEVICE_PATH_PROTOCOL Header; + UINT16 NetworkProtocol; + UINT16 LoginOption; + UINT64 Lun; + UINT16 TargetPortalGroupTag; + CHAR8 TargetName[1]; } ISCSI_DEVICE_PATH_WITH_NAME; typedef struct { - EFI_DEVICE_PATH_PROTOCOL Header; - EFI_GUID Guid; - UINT8 VendorDefinedData[1]; + EFI_DEVICE_PATH_PROTOCOL Header; + EFI_GUID Guid; + UINT8 VendorDefinedData[1]; } VENDOR_DEVICE_PATH_WITH_DATA; #pragma pack() @@ -347,8 +346,8 @@ UefiDevicePathLibAppendDevicePathInstance ( EFI_DEVICE_PATH_PROTOCOL * EFIAPI UefiDevicePathLibGetNextDevicePathInstance ( - IN OUT EFI_DEVICE_PATH_PROTOCOL **DevicePath, - OUT UINTN *Size + IN OUT EFI_DEVICE_PATH_PROTOCOL **DevicePath, + OUT UINTN *Size ); /** @@ -373,9 +372,9 @@ UefiDevicePathLibGetNextDevicePathInstance ( EFI_DEVICE_PATH_PROTOCOL * EFIAPI UefiDevicePathLibCreateDeviceNode ( - IN UINT8 NodeType, - IN UINT8 NodeSubType, - IN UINT16 NodeLength + IN UINT8 NodeType, + IN UINT8 NodeSubType, + IN UINT16 NodeLength ); /** @@ -399,7 +398,6 @@ UefiDevicePathLibIsDevicePathMultiInstance ( IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath ); - /** Converts a device path to its text representation. @@ -418,9 +416,9 @@ UefiDevicePathLibIsDevicePathMultiInstance ( CHAR16 * EFIAPI UefiDevicePathLibConvertDevicePathToText ( - IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath, - IN BOOLEAN DisplayOnly, - IN BOOLEAN AllowShortcuts + IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath, + IN BOOLEAN DisplayOnly, + IN BOOLEAN AllowShortcuts ); /** @@ -460,7 +458,7 @@ UefiDevicePathLibConvertDeviceNodeToText ( EFI_DEVICE_PATH_PROTOCOL * EFIAPI UefiDevicePathLibConvertTextToDeviceNode ( - IN CONST CHAR16 *TextDeviceNode + IN CONST CHAR16 *TextDeviceNode ); /** @@ -478,7 +476,7 @@ UefiDevicePathLibConvertTextToDeviceNode ( EFI_DEVICE_PATH_PROTOCOL * EFIAPI UefiDevicePathLibConvertTextToDevicePath ( - IN CONST CHAR16 *TextDevicePath + IN CONST CHAR16 *TextDevicePath ); #else diff --git a/lib/libefivar/uefi-guid.c b/lib/libefivar/uefi-guid.c index c173a449cf09..a4ad7a2a38f9 100644 --- a/lib/libefivar/uefi-guid.c +++ b/lib/libefivar/uefi-guid.c @@ -4,11 +4,11 @@ #include #include -typedef struct { - uint32_t Data1; - uint16_t Data2; - uint16_t Data3; - uint8_t Data4[8]; +typedef struct { + uint32_t Data1; + uint16_t Data2; + uint16_t Data3; + uint8_t Data4[8]; } EFI_GUID; extern EFI_GUID gEfiDebugPortProtocolGuid; @@ -25,12 +25,12 @@ extern EFI_GUID gEfiVirtualDiskGuid; EFI_GUID gEfiDebugPortProtocolGuid = { 0xEBA4E8D2, 0x3858, 0x41EC, { 0xA2, 0x81, 0x26, 0x47, 0xBA, 0x96, 0x60, 0xD0 }} ; EFI_GUID gEfiPcAnsiGuid = { 0xE0C14753, 0xF9BE, 0x11D2, { 0x9A, 0x0C, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }} ; -EFI_GUID gEfiPersistentVirtualCdGuid = { 0x08018188, 0x42CD, 0xBB48, {0x10, 0x0F, 0x53, 0x87, 0xD5, 0x3D, 0xED, 0x3D }} ; -EFI_GUID gEfiPersistentVirtualDiskGuid = { 0x5CEA02C9, 0x4D07, 0x69D3, {0x26, 0x9F ,0x44, 0x96, 0xFB, 0xE0, 0x96, 0xF9 }} ; +EFI_GUID gEfiPersistentVirtualCdGuid = { 0x08018188, 0x42CD, 0xBB48, { 0x10, 0x0F, 0x53, 0x87, 0xD5, 0x3D, 0xED, 0x3D }} ; +EFI_GUID gEfiPersistentVirtualDiskGuid = { 0x5CEA02C9, 0x4D07, 0x69D3, { 0x26, 0x9F ,0x44, 0x96, 0xFB, 0xE0, 0x96, 0xF9 }} ; EFI_GUID gEfiSasDevicePathGuid = { 0xd487ddb4, 0x008b, 0x11d9, { 0xaf, 0xdc, 0x00, 0x10, 0x83, 0xff, 0xca, 0x4d }} ; EFI_GUID gEfiUartDevicePathGuid = { 0x37499a9d, 0x542f, 0x4c89, { 0xa0, 0x26, 0x35, 0xda, 0x14, 0x20, 0x94, 0xe4 }} ; EFI_GUID gEfiVT100Guid = { 0xDFA66065, 0xB419, 0x11D3, { 0x9A, 0x2D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }} ; EFI_GUID gEfiVT100PlusGuid = { 0x7BAEC70B, 0x57E0, 0x4C76, { 0x8E, 0x87, 0x2F, 0x9E, 0x28, 0x08, 0x83, 0x43 }} ; EFI_GUID gEfiVTUTF8Guid = { 0xAD15A0D6, 0x8BEC, 0x4ACF, { 0xA0, 0x73, 0xD0, 0x1D, 0xE7, 0x7E, 0x2D, 0x88 }} ; -EFI_GUID gEfiVirtualCdGuid = { 0x3D5ABD30, 0x4175, 0x87CE, {0x6D, 0x64, 0xD2, 0xAD, 0xE5, 0x23, 0xC4, 0xBB }} ; -EFI_GUID gEfiVirtualDiskGuid = { 0x77AB535A, 0x45FC, 0x624B, {0x55, 0x60, 0xF7, 0xB2, 0x81, 0xD1, 0xF9, 0x6E }} ; +EFI_GUID gEfiVirtualCdGuid = { 0x3D5ABD30, 0x4175, 0x87CE, { 0x6D, 0x64, 0xD2, 0xAD, 0xE5, 0x23, 0xC4, 0xBB }} ; +EFI_GUID gEfiVirtualDiskGuid = { 0x77AB535A, 0x45FC, 0x624B, { 0x55, 0x60, 0xF7, 0xB2, 0x81, 0xD1, 0xF9, 0x6E }} ;