]> git.proxmox.com Git - mirror_edk2.git/blobdiff - MdePkg/Library/UefiDevicePathLib/DevicePathFromText.c
MdePkg: Apply uncrustify changes
[mirror_edk2.git] / MdePkg / Library / UefiDevicePathLib / DevicePathFromText.c
index 1515d2d5907eb76590d3a8711d5798ea6a38f125..1aaa968d6fb543b2d3b7458824e91db6706a4ea2 100644 (file)
@@ -38,8 +38,8 @@ UefiDevicePathLibStrDuplicate (
 **/\r
 CHAR16 *\r
 GetParamByNodeName (\r
-  IN CHAR16 *Str,\r
-  IN CHAR16 *NodeName\r
+  IN CHAR16  *Str,\r
+  IN CHAR16  *NodeName\r
   )\r
 {\r
   CHAR16  *ParamStr;\r
@@ -65,14 +65,16 @@ GetParamByNodeName (
   //\r
   ParamStr++;\r
   ParameterLength = 0;\r
-  StrPointer = ParamStr;\r
+  StrPointer      = ParamStr;\r
   while (!IS_NULL (*StrPointer)) {\r
     if (IS_RIGHT_PARENTH (*StrPointer)) {\r
       break;\r
     }\r
+\r
     StrPointer++;\r
     ParameterLength++;\r
   }\r
+\r
   if (IS_NULL (*StrPointer)) {\r
     //\r
     // ')' not found\r
@@ -84,6 +86,7 @@ GetParamByNodeName (
   if (ParamStr == NULL) {\r
     return NULL;\r
   }\r
+\r
   //\r
   // Terminate the parameter string\r
   //\r
@@ -106,14 +109,14 @@ GetParamByNodeName (
 **/\r
 CHAR16 *\r
 SplitStr (\r
-  IN OUT CHAR16 **List,\r
-  IN     CHAR16 Separator\r
+  IN OUT CHAR16  **List,\r
+  IN     CHAR16  Separator\r
   )\r
 {\r
   CHAR16  *Str;\r
   CHAR16  *ReturnStr;\r
 \r
-  Str = *List;\r
+  Str       = *List;\r
   ReturnStr = Str;\r
 \r
   if (IS_NULL (*Str)) {\r
@@ -127,6 +130,7 @@ SplitStr (
     if (*Str == Separator) {\r
       break;\r
     }\r
+\r
     Str++;\r
   }\r
 \r
@@ -156,7 +160,7 @@ SplitStr (
 **/\r
 CHAR16 *\r
 GetNextParamStr (\r
-  IN OUT CHAR16 **List\r
+  IN OUT CHAR16  **List\r
   )\r
 {\r
   //\r
@@ -196,9 +200,11 @@ GetNextDeviceNodeStr (
     if (!IS_SLASH (*Str) &&\r
         !IS_COMMA (*Str) &&\r
         !IS_LEFT_PARENTH (*Str) &&\r
-        !IS_RIGHT_PARENTH (*Str)) {\r
+        !IS_RIGHT_PARENTH (*Str))\r
+    {\r
       break;\r
     }\r
+\r
     Str++;\r
   }\r
 \r
@@ -231,7 +237,7 @@ GetNextDeviceNodeStr (
 \r
   if (IS_COMMA (*Str)) {\r
     *IsInstanceEnd = TRUE;\r
-    *Str = L'\0';\r
+    *Str           = L'\0';\r
     Str++;\r
   } else {\r
     *IsInstanceEnd = FALSE;\r
@@ -246,7 +252,6 @@ GetNextDeviceNodeStr (
   return ReturnStr;\r
 }\r
 \r
-\r
 /**\r
   Return whether the integer string is a hex string.\r
 \r
@@ -258,23 +263,24 @@ GetNextDeviceNodeStr (
 **/\r
 BOOLEAN\r
 IsHexStr (\r
-  IN CHAR16   *Str\r
+  IN CHAR16  *Str\r
   )\r
 {\r
   //\r
   // skip preceeding white space\r
   //\r
   while ((*Str != 0) && *Str == L' ') {\r
-    Str ++;\r
+    Str++;\r
   }\r
+\r
   //\r
   // skip preceeding zeros\r
   //\r
   while ((*Str != 0) && *Str == L'0') {\r
-    Str ++;\r
+    Str++;\r
   }\r
 \r
-  return (BOOLEAN) (*Str == L'x' || *Str == L'X');\r
+  return (BOOLEAN)(*Str == L'x' || *Str == L'X');\r
 }\r
 \r
 /**\r
@@ -329,16 +335,17 @@ Strtoi64 (
 **/\r
 VOID\r
 StrToAscii (\r
-  IN     CHAR16 *Str,\r
-  IN OUT CHAR8  **AsciiStr\r
+  IN     CHAR16  *Str,\r
+  IN OUT CHAR8   **AsciiStr\r
   )\r
 {\r
-  CHAR8 *Dest;\r
+  CHAR8  *Dest;\r
 \r
   Dest = *AsciiStr;\r
   while (!IS_NULL (*Str)) {\r
-    *(Dest++) = (CHAR8) *(Str++);\r
+    *(Dest++) = (CHAR8)*(Str++);\r
   }\r
+\r
   *Dest = 0;\r
 \r
   //\r
@@ -357,14 +364,14 @@ StrToAscii (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextGenericPath (\r
-  IN UINT8  Type,\r
-  IN CHAR16 *TextDeviceNode\r
+  IN UINT8   Type,\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
-  EFI_DEVICE_PATH_PROTOCOL *Node;\r
-  CHAR16                   *SubtypeStr;\r
-  CHAR16                   *DataStr;\r
-  UINTN                    DataLength;\r
+  EFI_DEVICE_PATH_PROTOCOL  *Node;\r
+  CHAR16                    *SubtypeStr;\r
+  CHAR16                    *DataStr;\r
+  UINTN                     DataLength;\r
 \r
   SubtypeStr = GetNextParamStr (&TextDeviceNode);\r
   DataStr    = GetNextParamStr (&TextDeviceNode);\r
@@ -374,13 +381,14 @@ DevPathFromTextGenericPath (
   } else {\r
     DataLength = StrLen (DataStr) / 2;\r
   }\r
+\r
   Node = CreateDeviceNode (\r
            Type,\r
-           (UINT8) Strtoi (SubtypeStr),\r
-           (UINT16) (sizeof (EFI_DEVICE_PATH_PROTOCOL) + DataLength)\r
+           (UINT8)Strtoi (SubtypeStr),\r
+           (UINT16)(sizeof (EFI_DEVICE_PATH_PROTOCOL) + DataLength)\r
            );\r
 \r
-  StrHexToBytes (DataStr, DataLength * 2, (UINT8 *) (Node + 1), DataLength);\r
+  StrHexToBytes (DataStr, DataLength * 2, (UINT8 *)(Node + 1), DataLength);\r
   return Node;\r
 }\r
 \r
@@ -394,14 +402,14 @@ DevPathFromTextGenericPath (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextPath (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
-  CHAR16                   *TypeStr;\r
+  CHAR16  *TypeStr;\r
 \r
-  TypeStr    = GetNextParamStr (&TextDeviceNode);\r
+  TypeStr = GetNextParamStr (&TextDeviceNode);\r
 \r
-  return DevPathFromTextGenericPath ((UINT8) Strtoi (TypeStr), TextDeviceNode);\r
+  return DevPathFromTextGenericPath ((UINT8)Strtoi (TypeStr), TextDeviceNode);\r
 }\r
 \r
 /**\r
@@ -414,7 +422,7 @@ DevPathFromTextPath (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextHardwarePath (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   return DevPathFromTextGenericPath (HARDWARE_DEVICE_PATH, TextDeviceNode);\r
@@ -430,25 +438,25 @@ DevPathFromTextHardwarePath (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextPci (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
-  CHAR16          *FunctionStr;\r
-  CHAR16          *DeviceStr;\r
-  PCI_DEVICE_PATH *Pci;\r
+  CHAR16           *FunctionStr;\r
+  CHAR16           *DeviceStr;\r
+  PCI_DEVICE_PATH  *Pci;\r
 \r
   DeviceStr   = GetNextParamStr (&TextDeviceNode);\r
   FunctionStr = GetNextParamStr (&TextDeviceNode);\r
-  Pci         = (PCI_DEVICE_PATH *) CreateDeviceNode (\r
-                                      HARDWARE_DEVICE_PATH,\r
-                                      HW_PCI_DP,\r
-                                      (UINT16) sizeof (PCI_DEVICE_PATH)\r
-                                      );\r
+  Pci         = (PCI_DEVICE_PATH *)CreateDeviceNode (\r
+                                     HARDWARE_DEVICE_PATH,\r
+                                     HW_PCI_DP,\r
+                                     (UINT16)sizeof (PCI_DEVICE_PATH)\r
+                                     );\r
 \r
-  Pci->Function = (UINT8) Strtoi (FunctionStr);\r
-  Pci->Device   = (UINT8) Strtoi (DeviceStr);\r
+  Pci->Function = (UINT8)Strtoi (FunctionStr);\r
+  Pci->Device   = (UINT8)Strtoi (DeviceStr);\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) Pci;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)Pci;\r
 }\r
 \r
 /**\r
@@ -461,22 +469,22 @@ DevPathFromTextPci (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextPcCard (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   CHAR16              *FunctionNumberStr;\r
   PCCARD_DEVICE_PATH  *Pccard;\r
 \r
   FunctionNumberStr = GetNextParamStr (&TextDeviceNode);\r
-  Pccard            = (PCCARD_DEVICE_PATH *) CreateDeviceNode (\r
-                                               HARDWARE_DEVICE_PATH,\r
-                                               HW_PCCARD_DP,\r
-                                               (UINT16) sizeof (PCCARD_DEVICE_PATH)\r
-                                               );\r
+  Pccard            = (PCCARD_DEVICE_PATH *)CreateDeviceNode (\r
+                                              HARDWARE_DEVICE_PATH,\r
+                                              HW_PCCARD_DP,\r
+                                              (UINT16)sizeof (PCCARD_DEVICE_PATH)\r
+                                              );\r
 \r
-  Pccard->FunctionNumber  = (UINT8) Strtoi (FunctionNumberStr);\r
+  Pccard->FunctionNumber = (UINT8)Strtoi (FunctionNumberStr);\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) Pccard;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)Pccard;\r
 }\r
 \r
 /**\r
@@ -489,7 +497,7 @@ DevPathFromTextPcCard (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextMemoryMapped (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   CHAR16              *MemoryTypeStr;\r
@@ -500,17 +508,17 @@ DevPathFromTextMemoryMapped (
   MemoryTypeStr      = GetNextParamStr (&TextDeviceNode);\r
   StartingAddressStr = GetNextParamStr (&TextDeviceNode);\r
   EndingAddressStr   = GetNextParamStr (&TextDeviceNode);\r
-  MemMap             = (MEMMAP_DEVICE_PATH *) CreateDeviceNode (\r
+  MemMap             = (MEMMAP_DEVICE_PATH *)CreateDeviceNode (\r
                                                HARDWARE_DEVICE_PATH,\r
                                                HW_MEMMAP_DP,\r
-                                               (UINT16) sizeof (MEMMAP_DEVICE_PATH)\r
+                                               (UINT16)sizeof (MEMMAP_DEVICE_PATH)\r
                                                );\r
 \r
-  MemMap->MemoryType = (UINT32) Strtoi (MemoryTypeStr);\r
+  MemMap->MemoryType = (UINT32)Strtoi (MemoryTypeStr);\r
   Strtoi64 (StartingAddressStr, &MemMap->StartingAddress);\r
   Strtoi64 (EndingAddressStr, &MemMap->EndingAddress);\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) MemMap;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)MemMap;\r
 }\r
 \r
 /**\r
@@ -526,9 +534,9 @@ DevPathFromTextMemoryMapped (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 ConvertFromTextVendor (\r
-  IN CHAR16 *TextDeviceNode,\r
-  IN UINT8  Type,\r
-  IN UINT8  SubType\r
+  IN CHAR16  *TextDeviceNode,\r
+  IN UINT8   Type,\r
+  IN UINT8   SubType\r
   )\r
 {\r
   CHAR16              *GuidStr;\r
@@ -543,18 +551,18 @@ ConvertFromTextVendor (
   //\r
   // Two hex characters make up 1 buffer byte\r
   //\r
-  Length  = (Length + 1) / 2;\r
+  Length = (Length + 1) / 2;\r
 \r
-  Vendor  = (VENDOR_DEVICE_PATH *) CreateDeviceNode (\r
-                                     Type,\r
-                                     SubType,\r
-                                     (UINT16) (sizeof (VENDOR_DEVICE_PATH) + Length)\r
-                                     );\r
+  Vendor = (VENDOR_DEVICE_PATH *)CreateDeviceNode (\r
+                                   Type,\r
+                                   SubType,\r
+                                   (UINT16)(sizeof (VENDOR_DEVICE_PATH) + Length)\r
+                                   );\r
 \r
   StrToGuid (GuidStr, &Vendor->Guid);\r
-  StrHexToBytes (DataStr, Length * 2, (UINT8 *) (Vendor + 1), Length);\r
+  StrHexToBytes (DataStr, Length * 2, (UINT8 *)(Vendor + 1), Length);\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) Vendor;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)Vendor;\r
 }\r
 \r
 /**\r
@@ -567,7 +575,7 @@ ConvertFromTextVendor (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextVenHw (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   return ConvertFromTextVendor (\r
@@ -587,21 +595,21 @@ DevPathFromTextVenHw (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextCtrl (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   CHAR16                  *ControllerStr;\r
   CONTROLLER_DEVICE_PATH  *Controller;\r
 \r
   ControllerStr = GetNextParamStr (&TextDeviceNode);\r
-  Controller    = (CONTROLLER_DEVICE_PATH *) CreateDeviceNode (\r
-                                               HARDWARE_DEVICE_PATH,\r
-                                               HW_CONTROLLER_DP,\r
-                                               (UINT16) sizeof (CONTROLLER_DEVICE_PATH)\r
-                                               );\r
-  Controller->ControllerNumber = (UINT32) Strtoi (ControllerStr);\r
+  Controller    = (CONTROLLER_DEVICE_PATH *)CreateDeviceNode (\r
+                                              HARDWARE_DEVICE_PATH,\r
+                                              HW_CONTROLLER_DP,\r
+                                              (UINT16)sizeof (CONTROLLER_DEVICE_PATH)\r
+                                              );\r
+  Controller->ControllerNumber = (UINT32)Strtoi (ControllerStr);\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) Controller;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)Controller;\r
 }\r
 \r
 /**\r
@@ -614,28 +622,28 @@ DevPathFromTextCtrl (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextBmc (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
-  CHAR16                *InterfaceTypeStr;\r
-  CHAR16                *BaseAddressStr;\r
-  BMC_DEVICE_PATH       *BmcDp;\r
+  CHAR16           *InterfaceTypeStr;\r
+  CHAR16           *BaseAddressStr;\r
+  BMC_DEVICE_PATH  *BmcDp;\r
 \r
   InterfaceTypeStr = GetNextParamStr (&TextDeviceNode);\r
   BaseAddressStr   = GetNextParamStr (&TextDeviceNode);\r
-  BmcDp            = (BMC_DEVICE_PATH *) CreateDeviceNode (\r
-                                           HARDWARE_DEVICE_PATH,\r
-                                           HW_BMC_DP,\r
-                                           (UINT16) sizeof (BMC_DEVICE_PATH)\r
-                                           );\r
+  BmcDp            = (BMC_DEVICE_PATH *)CreateDeviceNode (\r
+                                          HARDWARE_DEVICE_PATH,\r
+                                          HW_BMC_DP,\r
+                                          (UINT16)sizeof (BMC_DEVICE_PATH)\r
+                                          );\r
 \r
-  BmcDp->InterfaceType = (UINT8) Strtoi (InterfaceTypeStr);\r
+  BmcDp->InterfaceType = (UINT8)Strtoi (InterfaceTypeStr);\r
   WriteUnaligned64 (\r
-    (UINT64 *) (&BmcDp->BaseAddress),\r
+    (UINT64 *)(&BmcDp->BaseAddress),\r
     StrHexToUint64 (BaseAddressStr)\r
     );\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) BmcDp;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)BmcDp;\r
 }\r
 \r
 /**\r
@@ -648,7 +656,7 @@ DevPathFromTextBmc (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextAcpiPath (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   return DevPathFromTextGenericPath (ACPI_DEVICE_PATH, TextDeviceNode);\r
@@ -663,14 +671,14 @@ DevPathFromTextAcpiPath (
 **/\r
 UINT32\r
 EisaIdFromText (\r
-  IN CHAR16 *Text\r
+  IN CHAR16  *Text\r
   )\r
 {\r
   return (((Text[0] - 'A' + 1) & 0x1f) << 10)\r
-       + (((Text[1] - 'A' + 1) & 0x1f) <<  5)\r
-       + (((Text[2] - 'A' + 1) & 0x1f) <<  0)\r
-       + (UINT32) (StrHexToUintn (&Text[3]) << 16)\r
-       ;\r
+         + (((Text[1] - 'A' + 1) & 0x1f) <<  5)\r
+         + (((Text[2] - 'A' + 1) & 0x1f) <<  0)\r
+         + (UINT32)(StrHexToUintn (&Text[3]) << 16)\r
+  ;\r
 }\r
 \r
 /**\r
@@ -683,7 +691,7 @@ EisaIdFromText (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextAcpi (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   CHAR16                *HIDStr;\r
@@ -692,16 +700,16 @@ DevPathFromTextAcpi (
 \r
   HIDStr = GetNextParamStr (&TextDeviceNode);\r
   UIDStr = GetNextParamStr (&TextDeviceNode);\r
-  Acpi   = (ACPI_HID_DEVICE_PATH *) CreateDeviceNode (\r
-                                      ACPI_DEVICE_PATH,\r
-                                      ACPI_DP,\r
-                                      (UINT16) sizeof (ACPI_HID_DEVICE_PATH)\r
-                                      );\r
+  Acpi   = (ACPI_HID_DEVICE_PATH *)CreateDeviceNode (\r
+                                     ACPI_DEVICE_PATH,\r
+                                     ACPI_DP,\r
+                                     (UINT16)sizeof (ACPI_HID_DEVICE_PATH)\r
+                                     );\r
 \r
   Acpi->HID = EisaIdFromText (HIDStr);\r
-  Acpi->UID = (UINT32) Strtoi (UIDStr);\r
+  Acpi->UID = (UINT32)Strtoi (UIDStr);\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) Acpi;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)Acpi;\r
 }\r
 \r
 /**\r
@@ -715,7 +723,7 @@ DevPathFromTextAcpi (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 ConvertFromTextAcpi (\r
-  IN CHAR16 *TextDeviceNode,\r
+  IN CHAR16  *TextDeviceNode,\r
   IN UINT32  PnPId\r
   )\r
 {\r
@@ -723,16 +731,16 @@ ConvertFromTextAcpi (
   ACPI_HID_DEVICE_PATH  *Acpi;\r
 \r
   UIDStr = GetNextParamStr (&TextDeviceNode);\r
-  Acpi   = (ACPI_HID_DEVICE_PATH *) CreateDeviceNode (\r
-                                      ACPI_DEVICE_PATH,\r
-                                      ACPI_DP,\r
-                                      (UINT16) sizeof (ACPI_HID_DEVICE_PATH)\r
-                                      );\r
+  Acpi   = (ACPI_HID_DEVICE_PATH *)CreateDeviceNode (\r
+                                     ACPI_DEVICE_PATH,\r
+                                     ACPI_DP,\r
+                                     (UINT16)sizeof (ACPI_HID_DEVICE_PATH)\r
+                                     );\r
 \r
   Acpi->HID = EFI_PNP_ID (PnPId);\r
-  Acpi->UID = (UINT32) Strtoi (UIDStr);\r
+  Acpi->UID = (UINT32)Strtoi (UIDStr);\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) Acpi;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)Acpi;\r
 }\r
 \r
 /**\r
@@ -745,7 +753,7 @@ ConvertFromTextAcpi (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextPciRoot (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   return ConvertFromTextAcpi (TextDeviceNode, 0x0a03);\r
@@ -761,7 +769,7 @@ DevPathFromTextPciRoot (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextPcieRoot (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   return ConvertFromTextAcpi (TextDeviceNode, 0x0a08);\r
@@ -777,7 +785,7 @@ DevPathFromTextPcieRoot (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextFloppy (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   return ConvertFromTextAcpi (TextDeviceNode, 0x0604);\r
@@ -793,7 +801,7 @@ DevPathFromTextFloppy (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextKeyboard (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   return ConvertFromTextAcpi (TextDeviceNode, 0x0301);\r
@@ -809,7 +817,7 @@ DevPathFromTextKeyboard (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextSerial (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   return ConvertFromTextAcpi (TextDeviceNode, 0x0501);\r
@@ -825,7 +833,7 @@ DevPathFromTextSerial (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextParallelPort (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   return ConvertFromTextAcpi (TextDeviceNode, 0x0401);\r
@@ -841,7 +849,7 @@ DevPathFromTextParallelPort (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextAcpiEx (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   CHAR16                         *HIDStr;\r
@@ -861,25 +869,25 @@ DevPathFromTextAcpiEx (
   CIDSTRStr = GetNextParamStr (&TextDeviceNode);\r
   UIDSTRStr = GetNextParamStr (&TextDeviceNode);\r
 \r
-  Length    = (UINT16) (sizeof (ACPI_EXTENDED_HID_DEVICE_PATH) + StrLen (HIDSTRStr) + 1);\r
-  Length    = (UINT16) (Length + StrLen (UIDSTRStr) + 1);\r
-  Length    = (UINT16) (Length + StrLen (CIDSTRStr) + 1);\r
-  AcpiEx = (ACPI_EXTENDED_HID_DEVICE_PATH *) CreateDeviceNode (\r
-                                               ACPI_DEVICE_PATH,\r
-                                               ACPI_EXTENDED_DP,\r
-                                               Length\r
-                                               );\r
+  Length = (UINT16)(sizeof (ACPI_EXTENDED_HID_DEVICE_PATH) + StrLen (HIDSTRStr) + 1);\r
+  Length = (UINT16)(Length + StrLen (UIDSTRStr) + 1);\r
+  Length = (UINT16)(Length + StrLen (CIDSTRStr) + 1);\r
+  AcpiEx = (ACPI_EXTENDED_HID_DEVICE_PATH *)CreateDeviceNode (\r
+                                              ACPI_DEVICE_PATH,\r
+                                              ACPI_EXTENDED_DP,\r
+                                              Length\r
+                                              );\r
 \r
   AcpiEx->HID = EisaIdFromText (HIDStr);\r
   AcpiEx->CID = EisaIdFromText (CIDStr);\r
-  AcpiEx->UID = (UINT32) Strtoi (UIDStr);\r
+  AcpiEx->UID = (UINT32)Strtoi (UIDStr);\r
 \r
-  AsciiStr = (CHAR8 *) ((UINT8 *)AcpiEx + sizeof (ACPI_EXTENDED_HID_DEVICE_PATH));\r
+  AsciiStr = (CHAR8 *)((UINT8 *)AcpiEx + sizeof (ACPI_EXTENDED_HID_DEVICE_PATH));\r
   StrToAscii (HIDSTRStr, &AsciiStr);\r
   StrToAscii (UIDSTRStr, &AsciiStr);\r
   StrToAscii (CIDSTRStr, &AsciiStr);\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) AcpiEx;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)AcpiEx;\r
 }\r
 \r
 /**\r
@@ -892,7 +900,7 @@ DevPathFromTextAcpiEx (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextAcpiExp (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   CHAR16                         *HIDStr;\r
@@ -905,12 +913,12 @@ DevPathFromTextAcpiExp (
   HIDStr    = GetNextParamStr (&TextDeviceNode);\r
   CIDStr    = GetNextParamStr (&TextDeviceNode);\r
   UIDSTRStr = GetNextParamStr (&TextDeviceNode);\r
-  Length    = (UINT16) (sizeof (ACPI_EXTENDED_HID_DEVICE_PATH) + StrLen (UIDSTRStr) + 3);\r
-  AcpiEx    = (ACPI_EXTENDED_HID_DEVICE_PATH *) CreateDeviceNode (\r
-                                                  ACPI_DEVICE_PATH,\r
-                                                  ACPI_EXTENDED_DP,\r
-                                                  Length\r
-                                                  );\r
+  Length    = (UINT16)(sizeof (ACPI_EXTENDED_HID_DEVICE_PATH) + StrLen (UIDSTRStr) + 3);\r
+  AcpiEx    = (ACPI_EXTENDED_HID_DEVICE_PATH *)CreateDeviceNode (\r
+                                                 ACPI_DEVICE_PATH,\r
+                                                 ACPI_EXTENDED_DP,\r
+                                                 Length\r
+                                                 );\r
 \r
   AcpiEx->HID = EisaIdFromText (HIDStr);\r
   //\r
@@ -918,14 +926,15 @@ DevPathFromTextAcpiExp (
   // So when the CID parametr is not specified or specified as 0 in the text device node.\r
   // Set the CID to 0 in the ACPI extension device path structure.\r
   //\r
-  if (*CIDStr == L'\0' || *CIDStr == L'0') {\r
+  if ((*CIDStr == L'\0') || (*CIDStr == L'0')) {\r
     AcpiEx->CID = 0;\r
   } else {\r
     AcpiEx->CID = EisaIdFromText (CIDStr);\r
   }\r
+\r
   AcpiEx->UID = 0;\r
 \r
-  AsciiStr = (CHAR8 *) ((UINT8 *)AcpiEx + sizeof (ACPI_EXTENDED_HID_DEVICE_PATH));\r
+  AsciiStr = (CHAR8 *)((UINT8 *)AcpiEx + sizeof (ACPI_EXTENDED_HID_DEVICE_PATH));\r
   //\r
   // HID string is NULL\r
   //\r
@@ -940,7 +949,7 @@ DevPathFromTextAcpiExp (
   //\r
   *AsciiStr = '\0';\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) AcpiEx;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)AcpiEx;\r
 }\r
 \r
 /**\r
@@ -953,7 +962,7 @@ DevPathFromTextAcpiExp (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextAcpiAdr (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   CHAR16                *DisplayDeviceStr;\r
@@ -961,11 +970,11 @@ DevPathFromTextAcpiAdr (
   UINTN                 Index;\r
   UINTN                 Length;\r
 \r
-  AcpiAdr = (ACPI_ADR_DEVICE_PATH *) CreateDeviceNode (\r
-                                       ACPI_DEVICE_PATH,\r
-                                       ACPI_ADR_DP,\r
-                                       (UINT16) sizeof (ACPI_ADR_DEVICE_PATH)\r
-                                       );\r
+  AcpiAdr = (ACPI_ADR_DEVICE_PATH *)CreateDeviceNode (\r
+                                      ACPI_DEVICE_PATH,\r
+                                      ACPI_ADR_DP,\r
+                                      (UINT16)sizeof (ACPI_ADR_DEVICE_PATH)\r
+                                      );\r
   ASSERT (AcpiAdr != NULL);\r
 \r
   for (Index = 0; ; Index++) {\r
@@ -973,6 +982,7 @@ DevPathFromTextAcpiAdr (
     if (IS_NULL (*DisplayDeviceStr)) {\r
       break;\r
     }\r
+\r
     if (Index > 0) {\r
       Length  = DevicePathNodeLength (AcpiAdr);\r
       AcpiAdr = ReallocatePool (\r
@@ -984,10 +994,10 @@ DevPathFromTextAcpiAdr (
       SetDevicePathNodeLength (AcpiAdr, Length + sizeof (UINT32));\r
     }\r
 \r
-    (&AcpiAdr->ADR)[Index] = (UINT32) Strtoi (DisplayDeviceStr);\r
+    (&AcpiAdr->ADR)[Index] = (UINT32)Strtoi (DisplayDeviceStr);\r
   }\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) AcpiAdr;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)AcpiAdr;\r
 }\r
 \r
 /**\r
@@ -1000,7 +1010,7 @@ DevPathFromTextAcpiAdr (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextMsg (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   return DevPathFromTextGenericPath (MESSAGING_DEVICE_PATH, TextDeviceNode);\r
@@ -1016,19 +1026,19 @@ DevPathFromTextMsg (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextAta (\r
-IN CHAR16 *TextDeviceNode\r
-)\r
+  IN CHAR16  *TextDeviceNode\r
+  )\r
 {\r
-  CHAR16            *PrimarySecondaryStr;\r
-  CHAR16            *SlaveMasterStr;\r
-  CHAR16            *LunStr;\r
-  ATAPI_DEVICE_PATH *Atapi;\r
+  CHAR16             *PrimarySecondaryStr;\r
+  CHAR16             *SlaveMasterStr;\r
+  CHAR16             *LunStr;\r
+  ATAPI_DEVICE_PATH  *Atapi;\r
 \r
-  Atapi = (ATAPI_DEVICE_PATH *) CreateDeviceNode (\r
-    MESSAGING_DEVICE_PATH,\r
-    MSG_ATAPI_DP,\r
-    (UINT16) sizeof (ATAPI_DEVICE_PATH)\r
-    );\r
+  Atapi = (ATAPI_DEVICE_PATH *)CreateDeviceNode (\r
+                                 MESSAGING_DEVICE_PATH,\r
+                                 MSG_ATAPI_DP,\r
+                                 (UINT16)sizeof (ATAPI_DEVICE_PATH)\r
+                                 );\r
 \r
   PrimarySecondaryStr = GetNextParamStr (&TextDeviceNode);\r
   SlaveMasterStr      = GetNextParamStr (&TextDeviceNode);\r
@@ -1039,19 +1049,20 @@ IN CHAR16 *TextDeviceNode
   } else if (StrCmp (PrimarySecondaryStr, L"Secondary") == 0) {\r
     Atapi->PrimarySecondary = 1;\r
   } else {\r
-    Atapi->PrimarySecondary = (UINT8) Strtoi (PrimarySecondaryStr);\r
+    Atapi->PrimarySecondary = (UINT8)Strtoi (PrimarySecondaryStr);\r
   }\r
+\r
   if (StrCmp (SlaveMasterStr, L"Master") == 0) {\r
-    Atapi->SlaveMaster      = 0;\r
+    Atapi->SlaveMaster = 0;\r
   } else if (StrCmp (SlaveMasterStr, L"Slave") == 0) {\r
-    Atapi->SlaveMaster      = 1;\r
+    Atapi->SlaveMaster = 1;\r
   } else {\r
-    Atapi->SlaveMaster      = (UINT8) Strtoi (SlaveMasterStr);\r
+    Atapi->SlaveMaster = (UINT8)Strtoi (SlaveMasterStr);\r
   }\r
 \r
-  Atapi->Lun                = (UINT16) Strtoi (LunStr);\r
+  Atapi->Lun = (UINT16)Strtoi (LunStr);\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) Atapi;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)Atapi;\r
 }\r
 \r
 /**\r
@@ -1064,7 +1075,7 @@ IN CHAR16 *TextDeviceNode
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextScsi (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   CHAR16            *PunStr;\r
@@ -1073,16 +1084,16 @@ DevPathFromTextScsi (
 \r
   PunStr = GetNextParamStr (&TextDeviceNode);\r
   LunStr = GetNextParamStr (&TextDeviceNode);\r
-  Scsi   = (SCSI_DEVICE_PATH *) CreateDeviceNode (\r
-                                   MESSAGING_DEVICE_PATH,\r
-                                   MSG_SCSI_DP,\r
-                                   (UINT16) sizeof (SCSI_DEVICE_PATH)\r
-                                   );\r
+  Scsi   = (SCSI_DEVICE_PATH *)CreateDeviceNode (\r
+                                 MESSAGING_DEVICE_PATH,\r
+                                 MSG_SCSI_DP,\r
+                                 (UINT16)sizeof (SCSI_DEVICE_PATH)\r
+                                 );\r
 \r
-  Scsi->Pun = (UINT16) Strtoi (PunStr);\r
-  Scsi->Lun = (UINT16) Strtoi (LunStr);\r
+  Scsi->Pun = (UINT16)Strtoi (PunStr);\r
+  Scsi->Lun = (UINT16)Strtoi (LunStr);\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) Scsi;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)Scsi;\r
 }\r
 \r
 /**\r
@@ -1095,7 +1106,7 @@ DevPathFromTextScsi (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextFibre (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   CHAR16                    *WWNStr;\r
@@ -1104,17 +1115,17 @@ DevPathFromTextFibre (
 \r
   WWNStr = GetNextParamStr (&TextDeviceNode);\r
   LunStr = GetNextParamStr (&TextDeviceNode);\r
-  Fibre  = (FIBRECHANNEL_DEVICE_PATH *) CreateDeviceNode (\r
-                                          MESSAGING_DEVICE_PATH,\r
-                                          MSG_FIBRECHANNEL_DP,\r
-                                          (UINT16) sizeof (FIBRECHANNEL_DEVICE_PATH)\r
-                                          );\r
+  Fibre  = (FIBRECHANNEL_DEVICE_PATH *)CreateDeviceNode (\r
+                                         MESSAGING_DEVICE_PATH,\r
+                                         MSG_FIBRECHANNEL_DP,\r
+                                         (UINT16)sizeof (FIBRECHANNEL_DEVICE_PATH)\r
+                                         );\r
 \r
   Fibre->Reserved = 0;\r
   Strtoi64 (WWNStr, &Fibre->WWN);\r
   Strtoi64 (LunStr, &Fibre->Lun);\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) Fibre;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)Fibre;\r
 }\r
 \r
 /**\r
@@ -1127,7 +1138,7 @@ DevPathFromTextFibre (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextFibreEx (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   CHAR16                      *WWNStr;\r
@@ -1136,20 +1147,20 @@ DevPathFromTextFibreEx (
 \r
   WWNStr  = GetNextParamStr (&TextDeviceNode);\r
   LunStr  = GetNextParamStr (&TextDeviceNode);\r
-  FibreEx = (FIBRECHANNELEX_DEVICE_PATH *) CreateDeviceNode (\r
-                                             MESSAGING_DEVICE_PATH,\r
-                                             MSG_FIBRECHANNELEX_DP,\r
-                                             (UINT16) sizeof (FIBRECHANNELEX_DEVICE_PATH)\r
-                                             );\r
+  FibreEx = (FIBRECHANNELEX_DEVICE_PATH *)CreateDeviceNode (\r
+                                            MESSAGING_DEVICE_PATH,\r
+                                            MSG_FIBRECHANNELEX_DP,\r
+                                            (UINT16)sizeof (FIBRECHANNELEX_DEVICE_PATH)\r
+                                            );\r
 \r
   FibreEx->Reserved = 0;\r
-  Strtoi64 (WWNStr, (UINT64 *) (&FibreEx->WWN));\r
-  Strtoi64 (LunStr, (UINT64 *) (&FibreEx->Lun));\r
+  Strtoi64 (WWNStr, (UINT64 *)(&FibreEx->WWN));\r
+  Strtoi64 (LunStr, (UINT64 *)(&FibreEx->Lun));\r
 \r
-  *(UINT64 *) (&FibreEx->WWN) = SwapBytes64 (*(UINT64 *) (&FibreEx->WWN));\r
-  *(UINT64 *) (&FibreEx->Lun) = SwapBytes64 (*(UINT64 *) (&FibreEx->Lun));\r
+  *(UINT64 *)(&FibreEx->WWN) = SwapBytes64 (*(UINT64 *)(&FibreEx->WWN));\r
+  *(UINT64 *)(&FibreEx->Lun) = SwapBytes64 (*(UINT64 *)(&FibreEx->Lun));\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) FibreEx;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)FibreEx;\r
 }\r
 \r
 /**\r
@@ -1162,23 +1173,23 @@ DevPathFromTextFibreEx (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromText1394 (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
-  CHAR16            *GuidStr;\r
-  F1394_DEVICE_PATH *F1394DevPath;\r
+  CHAR16             *GuidStr;\r
+  F1394_DEVICE_PATH  *F1394DevPath;\r
 \r
-  GuidStr = GetNextParamStr (&TextDeviceNode);\r
-  F1394DevPath  = (F1394_DEVICE_PATH *) CreateDeviceNode (\r
-                                          MESSAGING_DEVICE_PATH,\r
-                                          MSG_1394_DP,\r
-                                          (UINT16) sizeof (F1394_DEVICE_PATH)\r
-                                          );\r
+  GuidStr      = GetNextParamStr (&TextDeviceNode);\r
+  F1394DevPath = (F1394_DEVICE_PATH *)CreateDeviceNode (\r
+                                        MESSAGING_DEVICE_PATH,\r
+                                        MSG_1394_DP,\r
+                                        (UINT16)sizeof (F1394_DEVICE_PATH)\r
+                                        );\r
 \r
   F1394DevPath->Reserved = 0;\r
   F1394DevPath->Guid     = StrHexToUint64 (GuidStr);\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) F1394DevPath;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)F1394DevPath;\r
 }\r
 \r
 /**\r
@@ -1191,25 +1202,25 @@ DevPathFromText1394 (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextUsb (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
-  CHAR16          *PortStr;\r
-  CHAR16          *InterfaceStr;\r
-  USB_DEVICE_PATH *Usb;\r
+  CHAR16           *PortStr;\r
+  CHAR16           *InterfaceStr;\r
+  USB_DEVICE_PATH  *Usb;\r
 \r
-  PortStr               = GetNextParamStr (&TextDeviceNode);\r
-  InterfaceStr          = GetNextParamStr (&TextDeviceNode);\r
-  Usb                   = (USB_DEVICE_PATH *) CreateDeviceNode (\r
-                                                MESSAGING_DEVICE_PATH,\r
-                                                MSG_USB_DP,\r
-                                                (UINT16) sizeof (USB_DEVICE_PATH)\r
-                                                );\r
+  PortStr      = GetNextParamStr (&TextDeviceNode);\r
+  InterfaceStr = GetNextParamStr (&TextDeviceNode);\r
+  Usb          = (USB_DEVICE_PATH *)CreateDeviceNode (\r
+                                      MESSAGING_DEVICE_PATH,\r
+                                      MSG_USB_DP,\r
+                                      (UINT16)sizeof (USB_DEVICE_PATH)\r
+                                      );\r
 \r
-  Usb->ParentPortNumber = (UINT8) Strtoi (PortStr);\r
-  Usb->InterfaceNumber  = (UINT8) Strtoi (InterfaceStr);\r
+  Usb->ParentPortNumber = (UINT8)Strtoi (PortStr);\r
+  Usb->InterfaceNumber  = (UINT8)Strtoi (InterfaceStr);\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) Usb;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)Usb;\r
 }\r
 \r
 /**\r
@@ -1222,22 +1233,22 @@ DevPathFromTextUsb (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextI2O (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
-  CHAR16          *TIDStr;\r
-  I2O_DEVICE_PATH *I2ODevPath;\r
+  CHAR16           *TIDStr;\r
+  I2O_DEVICE_PATH  *I2ODevPath;\r
 \r
   TIDStr     = GetNextParamStr (&TextDeviceNode);\r
-  I2ODevPath = (I2O_DEVICE_PATH *) CreateDeviceNode (\r
+  I2ODevPath = (I2O_DEVICE_PATH *)CreateDeviceNode (\r
                                     MESSAGING_DEVICE_PATH,\r
                                     MSG_I2O_DP,\r
-                                    (UINT16) sizeof (I2O_DEVICE_PATH)\r
+                                    (UINT16)sizeof (I2O_DEVICE_PATH)\r
                                     );\r
 \r
-  I2ODevPath->Tid  = (UINT32) Strtoi (TIDStr);\r
+  I2ODevPath->Tid = (UINT32)Strtoi (TIDStr);\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) I2ODevPath;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)I2ODevPath;\r
 }\r
 \r
 /**\r
@@ -1250,7 +1261,7 @@ DevPathFromTextI2O (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextInfiniband (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   CHAR16                  *FlagsStr;\r
@@ -1265,19 +1276,19 @@ DevPathFromTextInfiniband (
   SidStr     = GetNextParamStr (&TextDeviceNode);\r
   TidStr     = GetNextParamStr (&TextDeviceNode);\r
   DidStr     = GetNextParamStr (&TextDeviceNode);\r
-  InfiniBand = (INFINIBAND_DEVICE_PATH *) CreateDeviceNode (\r
-                                            MESSAGING_DEVICE_PATH,\r
-                                            MSG_INFINIBAND_DP,\r
-                                            (UINT16) sizeof (INFINIBAND_DEVICE_PATH)\r
-                                            );\r
+  InfiniBand = (INFINIBAND_DEVICE_PATH *)CreateDeviceNode (\r
+                                           MESSAGING_DEVICE_PATH,\r
+                                           MSG_INFINIBAND_DP,\r
+                                           (UINT16)sizeof (INFINIBAND_DEVICE_PATH)\r
+                                           );\r
 \r
-  InfiniBand->ResourceFlags = (UINT32) Strtoi (FlagsStr);\r
-  StrToGuid (GuidStr, (EFI_GUID *) InfiniBand->PortGid);\r
+  InfiniBand->ResourceFlags = (UINT32)Strtoi (FlagsStr);\r
+  StrToGuid (GuidStr, (EFI_GUID *)InfiniBand->PortGid);\r
   Strtoi64 (SidStr, &InfiniBand->ServiceId);\r
   Strtoi64 (TidStr, &InfiniBand->TargetPortId);\r
   Strtoi64 (DidStr, &InfiniBand->DeviceId);\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) InfiniBand;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)InfiniBand;\r
 }\r
 \r
 /**\r
@@ -1290,14 +1301,14 @@ DevPathFromTextInfiniband (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextVenMsg (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   return ConvertFromTextVendor (\r
-            TextDeviceNode,\r
-            MESSAGING_DEVICE_PATH,\r
-            MSG_VENDOR_DP\r
-            );\r
+           TextDeviceNode,\r
+           MESSAGING_DEVICE_PATH,\r
+           MSG_VENDOR_DP\r
+           );\r
 }\r
 \r
 /**\r
@@ -1310,18 +1321,19 @@ DevPathFromTextVenMsg (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextVenPcAnsi (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   VENDOR_DEVICE_PATH  *Vendor;\r
 \r
-  Vendor = (VENDOR_DEVICE_PATH *) CreateDeviceNode (\r
-                                    MESSAGING_DEVICE_PATH,\r
-                                    MSG_VENDOR_DP,\r
-                                    (UINT16) sizeof (VENDOR_DEVICE_PATH));\r
+  Vendor = (VENDOR_DEVICE_PATH *)CreateDeviceNode (\r
+                                   MESSAGING_DEVICE_PATH,\r
+                                   MSG_VENDOR_DP,\r
+                                   (UINT16)sizeof (VENDOR_DEVICE_PATH)\r
+                                   );\r
   CopyGuid (&Vendor->Guid, &gEfiPcAnsiGuid);\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) Vendor;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)Vendor;\r
 }\r
 \r
 /**\r
@@ -1334,18 +1346,19 @@ DevPathFromTextVenPcAnsi (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextVenVt100 (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   VENDOR_DEVICE_PATH  *Vendor;\r
 \r
-  Vendor = (VENDOR_DEVICE_PATH *) CreateDeviceNode (\r
-                                    MESSAGING_DEVICE_PATH,\r
-                                    MSG_VENDOR_DP,\r
-                                    (UINT16) sizeof (VENDOR_DEVICE_PATH));\r
+  Vendor = (VENDOR_DEVICE_PATH *)CreateDeviceNode (\r
+                                   MESSAGING_DEVICE_PATH,\r
+                                   MSG_VENDOR_DP,\r
+                                   (UINT16)sizeof (VENDOR_DEVICE_PATH)\r
+                                   );\r
   CopyGuid (&Vendor->Guid, &gEfiVT100Guid);\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) Vendor;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)Vendor;\r
 }\r
 \r
 /**\r
@@ -1358,18 +1371,19 @@ DevPathFromTextVenVt100 (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextVenVt100Plus (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   VENDOR_DEVICE_PATH  *Vendor;\r
 \r
-  Vendor = (VENDOR_DEVICE_PATH *) CreateDeviceNode (\r
-                                    MESSAGING_DEVICE_PATH,\r
-                                    MSG_VENDOR_DP,\r
-                                    (UINT16) sizeof (VENDOR_DEVICE_PATH));\r
+  Vendor = (VENDOR_DEVICE_PATH *)CreateDeviceNode (\r
+                                   MESSAGING_DEVICE_PATH,\r
+                                   MSG_VENDOR_DP,\r
+                                   (UINT16)sizeof (VENDOR_DEVICE_PATH)\r
+                                   );\r
   CopyGuid (&Vendor->Guid, &gEfiVT100PlusGuid);\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) Vendor;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)Vendor;\r
 }\r
 \r
 /**\r
@@ -1382,18 +1396,19 @@ DevPathFromTextVenVt100Plus (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextVenUtf8 (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   VENDOR_DEVICE_PATH  *Vendor;\r
 \r
-  Vendor = (VENDOR_DEVICE_PATH *) CreateDeviceNode (\r
-                                    MESSAGING_DEVICE_PATH,\r
-                                    MSG_VENDOR_DP,\r
-                                    (UINT16) sizeof (VENDOR_DEVICE_PATH));\r
+  Vendor = (VENDOR_DEVICE_PATH *)CreateDeviceNode (\r
+                                   MESSAGING_DEVICE_PATH,\r
+                                   MSG_VENDOR_DP,\r
+                                   (UINT16)sizeof (VENDOR_DEVICE_PATH)\r
+                                   );\r
   CopyGuid (&Vendor->Guid, &gEfiVTUTF8Guid);\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) Vendor;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)Vendor;\r
 }\r
 \r
 /**\r
@@ -1406,18 +1421,18 @@ DevPathFromTextVenUtf8 (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextUartFlowCtrl (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
-  CHAR16                        *ValueStr;\r
-  UART_FLOW_CONTROL_DEVICE_PATH *UartFlowControl;\r
+  CHAR16                         *ValueStr;\r
+  UART_FLOW_CONTROL_DEVICE_PATH  *UartFlowControl;\r
 \r
   ValueStr        = GetNextParamStr (&TextDeviceNode);\r
-  UartFlowControl = (UART_FLOW_CONTROL_DEVICE_PATH *) CreateDeviceNode (\r
-                                                        MESSAGING_DEVICE_PATH,\r
-                                                        MSG_VENDOR_DP,\r
-                                                        (UINT16) sizeof (UART_FLOW_CONTROL_DEVICE_PATH)\r
-                                                        );\r
+  UartFlowControl = (UART_FLOW_CONTROL_DEVICE_PATH *)CreateDeviceNode (\r
+                                                       MESSAGING_DEVICE_PATH,\r
+                                                       MSG_VENDOR_DP,\r
+                                                       (UINT16)sizeof (UART_FLOW_CONTROL_DEVICE_PATH)\r
+                                                       );\r
 \r
   CopyGuid (&UartFlowControl->Guid, &gEfiUartDevicePathGuid);\r
   if (StrCmp (ValueStr, L"XonXoff") == 0) {\r
@@ -1428,7 +1443,7 @@ DevPathFromTextUartFlowCtrl (
     UartFlowControl->FlowControlMap = 0;\r
   }\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) UartFlowControl;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)UartFlowControl;\r
 }\r
 \r
 /**\r
@@ -1441,20 +1456,20 @@ DevPathFromTextUartFlowCtrl (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextSAS (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
-  CHAR16          *AddressStr;\r
-  CHAR16          *LunStr;\r
-  CHAR16          *RTPStr;\r
-  CHAR16          *SASSATAStr;\r
-  CHAR16          *LocationStr;\r
-  CHAR16          *ConnectStr;\r
-  CHAR16          *DriveBayStr;\r
-  CHAR16          *ReservedStr;\r
-  UINT16          Info;\r
-  UINT16          Uint16;\r
-  SAS_DEVICE_PATH *Sas;\r
+  CHAR16           *AddressStr;\r
+  CHAR16           *LunStr;\r
+  CHAR16           *RTPStr;\r
+  CHAR16           *SASSATAStr;\r
+  CHAR16           *LocationStr;\r
+  CHAR16           *ConnectStr;\r
+  CHAR16           *DriveBayStr;\r
+  CHAR16           *ReservedStr;\r
+  UINT16           Info;\r
+  UINT16           Uint16;\r
+  SAS_DEVICE_PATH  *Sas;\r
 \r
   AddressStr  = GetNextParamStr (&TextDeviceNode);\r
   LunStr      = GetNextParamStr (&TextDeviceNode);\r
@@ -1464,27 +1479,25 @@ DevPathFromTextSAS (
   ConnectStr  = GetNextParamStr (&TextDeviceNode);\r
   DriveBayStr = GetNextParamStr (&TextDeviceNode);\r
   ReservedStr = GetNextParamStr (&TextDeviceNode);\r
-  Sas         = (SAS_DEVICE_PATH *) CreateDeviceNode (\r
-                                       MESSAGING_DEVICE_PATH,\r
-                                       MSG_VENDOR_DP,\r
-                                       (UINT16) sizeof (SAS_DEVICE_PATH)\r
-                                       );\r
+  Sas         = (SAS_DEVICE_PATH *)CreateDeviceNode (\r
+                                     MESSAGING_DEVICE_PATH,\r
+                                     MSG_VENDOR_DP,\r
+                                     (UINT16)sizeof (SAS_DEVICE_PATH)\r
+                                     );\r
 \r
   CopyGuid (&Sas->Guid, &gEfiSasDevicePathGuid);\r
   Strtoi64 (AddressStr, &Sas->SasAddress);\r
   Strtoi64 (LunStr, &Sas->Lun);\r
-  Sas->RelativeTargetPort = (UINT16) Strtoi (RTPStr);\r
+  Sas->RelativeTargetPort = (UINT16)Strtoi (RTPStr);\r
 \r
   if (StrCmp (SASSATAStr, L"NoTopology") == 0) {\r
     Info = 0x0;\r
-\r
   } else if ((StrCmp (SASSATAStr, L"SATA") == 0) || (StrCmp (SASSATAStr, L"SAS") == 0)) {\r
-\r
-    Uint16 = (UINT16) Strtoi (DriveBayStr);\r
+    Uint16 = (UINT16)Strtoi (DriveBayStr);\r
     if (Uint16 == 0) {\r
       Info = 0x1;\r
     } else {\r
-      Info = (UINT16) (0x2 | ((Uint16 - 1) << 8));\r
+      Info = (UINT16)(0x2 | ((Uint16 - 1) << 8));\r
     }\r
 \r
     if (StrCmp (SASSATAStr, L"SATA") == 0) {\r
@@ -1500,8 +1513,9 @@ DevPathFromTextSAS (
     } else if (StrCmp (LocationStr, L"Internal") == 0) {\r
       Uint16 = 0;\r
     } else {\r
-      Uint16 = ((UINT16) Strtoi (LocationStr) & BIT0);\r
+      Uint16 = ((UINT16)Strtoi (LocationStr) & BIT0);\r
     }\r
+\r
     Info |= (Uint16 << 5);\r
 \r
     //\r
@@ -1513,18 +1527,18 @@ DevPathFromTextSAS (
     } else if (StrCmp (ConnectStr, L"Direct") == 0) {\r
       Uint16 = 0;\r
     } else {\r
-      Uint16 = ((UINT16) Strtoi (ConnectStr) & (BIT0 | BIT1));\r
+      Uint16 = ((UINT16)Strtoi (ConnectStr) & (BIT0 | BIT1));\r
     }\r
-    Info |= (Uint16 << 6);\r
 \r
+    Info |= (Uint16 << 6);\r
   } else {\r
-    Info = (UINT16) Strtoi (SASSATAStr);\r
+    Info = (UINT16)Strtoi (SASSATAStr);\r
   }\r
 \r
   Sas->DeviceTopology = Info;\r
-  Sas->Reserved       = (UINT32) Strtoi (ReservedStr);\r
+  Sas->Reserved       = (UINT32)Strtoi (ReservedStr);\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) Sas;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)Sas;\r
 }\r
 \r
 /**\r
@@ -1537,21 +1551,21 @@ DevPathFromTextSAS (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextSasEx (\r
-  IN CHAR16 *TextDeviceNode\r
-  )\r
-{\r
-  CHAR16            *AddressStr;\r
-  CHAR16            *LunStr;\r
-  CHAR16            *RTPStr;\r
-  CHAR16            *SASSATAStr;\r
-  CHAR16            *LocationStr;\r
-  CHAR16            *ConnectStr;\r
-  CHAR16            *DriveBayStr;\r
-  UINT16            Info;\r
-  UINT16            Uint16;\r
-  UINT64            SasAddress;\r
-  UINT64            Lun;\r
-  SASEX_DEVICE_PATH *SasEx;\r
+  IN CHAR16  *TextDeviceNode\r
+  )\r
+{\r
+  CHAR16             *AddressStr;\r
+  CHAR16             *LunStr;\r
+  CHAR16             *RTPStr;\r
+  CHAR16             *SASSATAStr;\r
+  CHAR16             *LocationStr;\r
+  CHAR16             *ConnectStr;\r
+  CHAR16             *DriveBayStr;\r
+  UINT16             Info;\r
+  UINT16             Uint16;\r
+  UINT64             SasAddress;\r
+  UINT64             Lun;\r
+  SASEX_DEVICE_PATH  *SasEx;\r
 \r
   AddressStr  = GetNextParamStr (&TextDeviceNode);\r
   LunStr      = GetNextParamStr (&TextDeviceNode);\r
@@ -1560,28 +1574,26 @@ DevPathFromTextSasEx (
   LocationStr = GetNextParamStr (&TextDeviceNode);\r
   ConnectStr  = GetNextParamStr (&TextDeviceNode);\r
   DriveBayStr = GetNextParamStr (&TextDeviceNode);\r
-  SasEx       = (SASEX_DEVICE_PATH *) CreateDeviceNode (\r
-                                        MESSAGING_DEVICE_PATH,\r
-                                        MSG_SASEX_DP,\r
-                                        (UINT16) sizeof (SASEX_DEVICE_PATH)\r
-                                        );\r
+  SasEx       = (SASEX_DEVICE_PATH *)CreateDeviceNode (\r
+                                       MESSAGING_DEVICE_PATH,\r
+                                       MSG_SASEX_DP,\r
+                                       (UINT16)sizeof (SASEX_DEVICE_PATH)\r
+                                       );\r
 \r
   Strtoi64 (AddressStr, &SasAddress);\r
-  Strtoi64 (LunStr,     &Lun);\r
-  WriteUnaligned64 ((UINT64 *) &SasEx->SasAddress, SwapBytes64 (SasAddress));\r
-  WriteUnaligned64 ((UINT64 *) &SasEx->Lun,        SwapBytes64 (Lun));\r
-  SasEx->RelativeTargetPort      = (UINT16) Strtoi (RTPStr);\r
+  Strtoi64 (LunStr, &Lun);\r
+  WriteUnaligned64 ((UINT64 *)&SasEx->SasAddress, SwapBytes64 (SasAddress));\r
+  WriteUnaligned64 ((UINT64 *)&SasEx->Lun, SwapBytes64 (Lun));\r
+  SasEx->RelativeTargetPort = (UINT16)Strtoi (RTPStr);\r
 \r
   if (StrCmp (SASSATAStr, L"NoTopology") == 0) {\r
     Info = 0x0;\r
-\r
   } else if ((StrCmp (SASSATAStr, L"SATA") == 0) || (StrCmp (SASSATAStr, L"SAS") == 0)) {\r
-\r
-    Uint16 = (UINT16) Strtoi (DriveBayStr);\r
+    Uint16 = (UINT16)Strtoi (DriveBayStr);\r
     if (Uint16 == 0) {\r
       Info = 0x1;\r
     } else {\r
-      Info = (UINT16) (0x2 | ((Uint16 - 1) << 8));\r
+      Info = (UINT16)(0x2 | ((Uint16 - 1) << 8));\r
     }\r
 \r
     if (StrCmp (SASSATAStr, L"SATA") == 0) {\r
@@ -1597,8 +1609,9 @@ DevPathFromTextSasEx (
     } else if (StrCmp (LocationStr, L"Internal") == 0) {\r
       Uint16 = 0;\r
     } else {\r
-      Uint16 = ((UINT16) Strtoi (LocationStr) & BIT0);\r
+      Uint16 = ((UINT16)Strtoi (LocationStr) & BIT0);\r
     }\r
+\r
     Info |= (Uint16 << 5);\r
 \r
     //\r
@@ -1610,17 +1623,17 @@ DevPathFromTextSasEx (
     } else if (StrCmp (ConnectStr, L"Direct") == 0) {\r
       Uint16 = 0;\r
     } else {\r
-      Uint16 = ((UINT16) Strtoi (ConnectStr) & (BIT0 | BIT1));\r
+      Uint16 = ((UINT16)Strtoi (ConnectStr) & (BIT0 | BIT1));\r
     }\r
-    Info |= (Uint16 << 6);\r
 \r
+    Info |= (Uint16 << 6);\r
   } else {\r
-    Info = (UINT16) Strtoi (SASSATAStr);\r
+    Info = (UINT16)Strtoi (SASSATAStr);\r
   }\r
 \r
   SasEx->DeviceTopology = Info;\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) SasEx;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)SasEx;\r
 }\r
 \r
 /**\r
@@ -1633,32 +1646,32 @@ DevPathFromTextSasEx (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextNVMe (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
-  CHAR16                     *NamespaceIdStr;\r
-  CHAR16                     *NamespaceUuidStr;\r
-  NVME_NAMESPACE_DEVICE_PATH *Nvme;\r
-  UINT8                      *Uuid;\r
-  UINTN                      Index;\r
+  CHAR16                      *NamespaceIdStr;\r
+  CHAR16                      *NamespaceUuidStr;\r
+  NVME_NAMESPACE_DEVICE_PATH  *Nvme;\r
+  UINT8                       *Uuid;\r
+  UINTN                       Index;\r
 \r
   NamespaceIdStr   = GetNextParamStr (&TextDeviceNode);\r
   NamespaceUuidStr = GetNextParamStr (&TextDeviceNode);\r
-  Nvme = (NVME_NAMESPACE_DEVICE_PATH *) CreateDeviceNode (\r
-    MESSAGING_DEVICE_PATH,\r
-    MSG_NVME_NAMESPACE_DP,\r
-    (UINT16) sizeof (NVME_NAMESPACE_DEVICE_PATH)\r
-    );\r
+  Nvme             = (NVME_NAMESPACE_DEVICE_PATH *)CreateDeviceNode (\r
+                                                     MESSAGING_DEVICE_PATH,\r
+                                                     MSG_NVME_NAMESPACE_DP,\r
+                                                     (UINT16)sizeof (NVME_NAMESPACE_DEVICE_PATH)\r
+                                                     );\r
 \r
-  Nvme->NamespaceId = (UINT32) Strtoi (NamespaceIdStr);\r
-  Uuid = (UINT8 *) &Nvme->NamespaceUuid;\r
+  Nvme->NamespaceId = (UINT32)Strtoi (NamespaceIdStr);\r
+  Uuid              = (UINT8 *)&Nvme->NamespaceUuid;\r
 \r
   Index = sizeof (Nvme->NamespaceUuid) / sizeof (UINT8);\r
   while (Index-- != 0) {\r
-    Uuid[Index] = (UINT8) StrHexToUintn (SplitStr (&NamespaceUuidStr, L'-'));\r
+    Uuid[Index] = (UINT8)StrHexToUintn (SplitStr (&NamespaceUuidStr, L'-'));\r
   }\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) Nvme;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)Nvme;\r
 }\r
 \r
 /**\r
@@ -1671,25 +1684,25 @@ DevPathFromTextNVMe (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextUfs (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
-  CHAR16            *PunStr;\r
-  CHAR16            *LunStr;\r
-  UFS_DEVICE_PATH   *Ufs;\r
+  CHAR16           *PunStr;\r
+  CHAR16           *LunStr;\r
+  UFS_DEVICE_PATH  *Ufs;\r
 \r
   PunStr = GetNextParamStr (&TextDeviceNode);\r
   LunStr = GetNextParamStr (&TextDeviceNode);\r
-  Ufs    = (UFS_DEVICE_PATH *) CreateDeviceNode (\r
-                                 MESSAGING_DEVICE_PATH,\r
-                                 MSG_UFS_DP,\r
-                                 (UINT16) sizeof (UFS_DEVICE_PATH)\r
-                                 );\r
+  Ufs    = (UFS_DEVICE_PATH *)CreateDeviceNode (\r
+                                MESSAGING_DEVICE_PATH,\r
+                                MSG_UFS_DP,\r
+                                (UINT16)sizeof (UFS_DEVICE_PATH)\r
+                                );\r
 \r
-  Ufs->Pun = (UINT8) Strtoi (PunStr);\r
-  Ufs->Lun = (UINT8) Strtoi (LunStr);\r
+  Ufs->Pun = (UINT8)Strtoi (PunStr);\r
+  Ufs->Lun = (UINT8)Strtoi (LunStr);\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) Ufs;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)Ufs;\r
 }\r
 \r
 /**\r
@@ -1702,22 +1715,22 @@ DevPathFromTextUfs (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextSd (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
-  CHAR16            *SlotNumberStr;\r
-  SD_DEVICE_PATH    *Sd;\r
+  CHAR16          *SlotNumberStr;\r
+  SD_DEVICE_PATH  *Sd;\r
 \r
   SlotNumberStr = GetNextParamStr (&TextDeviceNode);\r
-  Sd            = (SD_DEVICE_PATH *) CreateDeviceNode (\r
-                                       MESSAGING_DEVICE_PATH,\r
-                                       MSG_SD_DP,\r
-                                       (UINT16) sizeof (SD_DEVICE_PATH)\r
-                                       );\r
+  Sd            = (SD_DEVICE_PATH *)CreateDeviceNode (\r
+                                      MESSAGING_DEVICE_PATH,\r
+                                      MSG_SD_DP,\r
+                                      (UINT16)sizeof (SD_DEVICE_PATH)\r
+                                      );\r
 \r
-  Sd->SlotNumber = (UINT8) Strtoi (SlotNumberStr);\r
+  Sd->SlotNumber = (UINT8)Strtoi (SlotNumberStr);\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) Sd;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)Sd;\r
 }\r
 \r
 /**\r
@@ -1730,22 +1743,22 @@ DevPathFromTextSd (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextEmmc (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   CHAR16            *SlotNumberStr;\r
   EMMC_DEVICE_PATH  *Emmc;\r
 \r
   SlotNumberStr = GetNextParamStr (&TextDeviceNode);\r
-  Emmc          = (EMMC_DEVICE_PATH *) CreateDeviceNode (\r
-                                       MESSAGING_DEVICE_PATH,\r
-                                       MSG_EMMC_DP,\r
-                                       (UINT16) sizeof (EMMC_DEVICE_PATH)\r
-                                       );\r
+  Emmc          = (EMMC_DEVICE_PATH *)CreateDeviceNode (\r
+                                        MESSAGING_DEVICE_PATH,\r
+                                        MSG_EMMC_DP,\r
+                                        (UINT16)sizeof (EMMC_DEVICE_PATH)\r
+                                        );\r
 \r
-  Emmc->SlotNumber = (UINT8) Strtoi (SlotNumberStr);\r
+  Emmc->SlotNumber = (UINT8)Strtoi (SlotNumberStr);\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) Emmc;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)Emmc;\r
 }\r
 \r
 /**\r
@@ -1758,20 +1771,20 @@ DevPathFromTextEmmc (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextDebugPort (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   VENDOR_DEVICE_PATH  *Vend;\r
 \r
-  Vend = (VENDOR_DEVICE_PATH *) CreateDeviceNode (\r
-                                                    MESSAGING_DEVICE_PATH,\r
-                                                    MSG_VENDOR_DP,\r
-                                                    (UINT16) sizeof (VENDOR_DEVICE_PATH)\r
-                                                    );\r
+  Vend = (VENDOR_DEVICE_PATH *)CreateDeviceNode (\r
+                                 MESSAGING_DEVICE_PATH,\r
+                                 MSG_VENDOR_DP,\r
+                                 (UINT16)sizeof (VENDOR_DEVICE_PATH)\r
+                                 );\r
 \r
   CopyGuid (&Vend->Guid, &gEfiDebugPortProtocolGuid);\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) Vend;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)Vend;\r
 }\r
 \r
 /**\r
@@ -1784,7 +1797,7 @@ DevPathFromTextDebugPort (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextMAC (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   CHAR16                *AddressStr;\r
@@ -1792,27 +1805,26 @@ DevPathFromTextMAC (
   UINTN                 Length;\r
   MAC_ADDR_DEVICE_PATH  *MACDevPath;\r
 \r
-  AddressStr    = GetNextParamStr (&TextDeviceNode);\r
-  IfTypeStr     = GetNextParamStr (&TextDeviceNode);\r
-  MACDevPath    = (MAC_ADDR_DEVICE_PATH *) CreateDeviceNode (\r
-                                              MESSAGING_DEVICE_PATH,\r
-                                              MSG_MAC_ADDR_DP,\r
-                                              (UINT16) sizeof (MAC_ADDR_DEVICE_PATH)\r
-                                              );\r
+  AddressStr = GetNextParamStr (&TextDeviceNode);\r
+  IfTypeStr  = GetNextParamStr (&TextDeviceNode);\r
+  MACDevPath = (MAC_ADDR_DEVICE_PATH *)CreateDeviceNode (\r
+                                         MESSAGING_DEVICE_PATH,\r
+                                         MSG_MAC_ADDR_DP,\r
+                                         (UINT16)sizeof (MAC_ADDR_DEVICE_PATH)\r
+                                         );\r
 \r
-  MACDevPath->IfType   = (UINT8) Strtoi (IfTypeStr);\r
+  MACDevPath->IfType = (UINT8)Strtoi (IfTypeStr);\r
 \r
   Length = sizeof (EFI_MAC_ADDRESS);\r
-  if (MACDevPath->IfType == 0x01 || MACDevPath->IfType == 0x00) {\r
+  if ((MACDevPath->IfType == 0x01) || (MACDevPath->IfType == 0x00)) {\r
     Length = 6;\r
   }\r
 \r
   StrHexToBytes (AddressStr, Length * 2, MACDevPath->MacAddress.Addr, Length);\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) MACDevPath;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)MACDevPath;\r
 }\r
 \r
-\r
 /**\r
   Converts a text format to the network protocol ID.\r
 \r
@@ -1823,7 +1835,7 @@ DevPathFromTextMAC (
 **/\r
 UINTN\r
 NetworkProtocolFromText (\r
-  IN CHAR16 *Text\r
+  IN CHAR16  *Text\r
   )\r
 {\r
   if (StrCmp (Text, L"UDP") == 0) {\r
@@ -1837,7 +1849,6 @@ NetworkProtocolFromText (
   return Strtoi (Text);\r
 }\r
 \r
-\r
 /**\r
   Converts a text device path node to IPV4 device path structure.\r
 \r
@@ -1848,7 +1859,7 @@ NetworkProtocolFromText (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextIPv4 (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   CHAR16            *RemoteIPStr;\r
@@ -1859,20 +1870,20 @@ DevPathFromTextIPv4 (
   CHAR16            *SubnetMaskStr;\r
   IPv4_DEVICE_PATH  *IPv4;\r
 \r
-  RemoteIPStr           = GetNextParamStr (&TextDeviceNode);\r
-  ProtocolStr           = GetNextParamStr (&TextDeviceNode);\r
-  TypeStr               = GetNextParamStr (&TextDeviceNode);\r
-  LocalIPStr            = GetNextParamStr (&TextDeviceNode);\r
-  GatewayIPStr          = GetNextParamStr (&TextDeviceNode);\r
-  SubnetMaskStr         = GetNextParamStr (&TextDeviceNode);\r
-  IPv4                  = (IPv4_DEVICE_PATH *) CreateDeviceNode (\r
-                                                 MESSAGING_DEVICE_PATH,\r
-                                                 MSG_IPv4_DP,\r
-                                                 (UINT16) sizeof (IPv4_DEVICE_PATH)\r
-                                                 );\r
+  RemoteIPStr   = GetNextParamStr (&TextDeviceNode);\r
+  ProtocolStr   = GetNextParamStr (&TextDeviceNode);\r
+  TypeStr       = GetNextParamStr (&TextDeviceNode);\r
+  LocalIPStr    = GetNextParamStr (&TextDeviceNode);\r
+  GatewayIPStr  = GetNextParamStr (&TextDeviceNode);\r
+  SubnetMaskStr = GetNextParamStr (&TextDeviceNode);\r
+  IPv4          = (IPv4_DEVICE_PATH *)CreateDeviceNode (\r
+                                        MESSAGING_DEVICE_PATH,\r
+                                        MSG_IPv4_DP,\r
+                                        (UINT16)sizeof (IPv4_DEVICE_PATH)\r
+                                        );\r
 \r
   StrToIpv4Address (RemoteIPStr, NULL, &IPv4->RemoteIpAddress, NULL);\r
-  IPv4->Protocol = (UINT16) NetworkProtocolFromText (ProtocolStr);\r
+  IPv4->Protocol = (UINT16)NetworkProtocolFromText (ProtocolStr);\r
   if (StrCmp (TypeStr, L"Static") == 0) {\r
     IPv4->StaticIpAddress = TRUE;\r
   } else {\r
@@ -1881,17 +1892,17 @@ DevPathFromTextIPv4 (
 \r
   StrToIpv4Address (LocalIPStr, NULL, &IPv4->LocalIpAddress, NULL);\r
   if (!IS_NULL (*GatewayIPStr) && !IS_NULL (*SubnetMaskStr)) {\r
-    StrToIpv4Address (GatewayIPStr,  NULL, &IPv4->GatewayIpAddress, NULL);\r
-    StrToIpv4Address (SubnetMaskStr, NULL, &IPv4->SubnetMask,       NULL);\r
+    StrToIpv4Address (GatewayIPStr, NULL, &IPv4->GatewayIpAddress, NULL);\r
+    StrToIpv4Address (SubnetMaskStr, NULL, &IPv4->SubnetMask, NULL);\r
   } else {\r
     ZeroMem (&IPv4->GatewayIpAddress, sizeof (IPv4->GatewayIpAddress));\r
-    ZeroMem (&IPv4->SubnetMask,    sizeof (IPv4->SubnetMask));\r
+    ZeroMem (&IPv4->SubnetMask, sizeof (IPv4->SubnetMask));\r
   }\r
 \r
-  IPv4->LocalPort       = 0;\r
-  IPv4->RemotePort      = 0;\r
+  IPv4->LocalPort  = 0;\r
+  IPv4->RemotePort = 0;\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) IPv4;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)IPv4;\r
 }\r
 \r
 /**\r
@@ -1904,7 +1915,7 @@ DevPathFromTextIPv4 (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextIPv6 (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   CHAR16            *RemoteIPStr;\r
@@ -1915,20 +1926,20 @@ DevPathFromTextIPv6 (
   CHAR16            *PrefixLengthStr;\r
   IPv6_DEVICE_PATH  *IPv6;\r
 \r
-  RemoteIPStr           = GetNextParamStr (&TextDeviceNode);\r
-  ProtocolStr           = GetNextParamStr (&TextDeviceNode);\r
-  TypeStr               = GetNextParamStr (&TextDeviceNode);\r
-  LocalIPStr            = GetNextParamStr (&TextDeviceNode);\r
-  PrefixLengthStr       = GetNextParamStr (&TextDeviceNode);\r
-  GatewayIPStr          = GetNextParamStr (&TextDeviceNode);\r
-  IPv6                  = (IPv6_DEVICE_PATH *) CreateDeviceNode (\r
-                                                 MESSAGING_DEVICE_PATH,\r
-                                                 MSG_IPv6_DP,\r
-                                                 (UINT16) sizeof (IPv6_DEVICE_PATH)\r
-                                                 );\r
+  RemoteIPStr     = GetNextParamStr (&TextDeviceNode);\r
+  ProtocolStr     = GetNextParamStr (&TextDeviceNode);\r
+  TypeStr         = GetNextParamStr (&TextDeviceNode);\r
+  LocalIPStr      = GetNextParamStr (&TextDeviceNode);\r
+  PrefixLengthStr = GetNextParamStr (&TextDeviceNode);\r
+  GatewayIPStr    = GetNextParamStr (&TextDeviceNode);\r
+  IPv6            = (IPv6_DEVICE_PATH *)CreateDeviceNode (\r
+                                          MESSAGING_DEVICE_PATH,\r
+                                          MSG_IPv6_DP,\r
+                                          (UINT16)sizeof (IPv6_DEVICE_PATH)\r
+                                          );\r
 \r
   StrToIpv6Address (RemoteIPStr, NULL, &IPv6->RemoteIpAddress, NULL);\r
-  IPv6->Protocol        = (UINT16) NetworkProtocolFromText (ProtocolStr);\r
+  IPv6->Protocol = (UINT16)NetworkProtocolFromText (ProtocolStr);\r
   if (StrCmp (TypeStr, L"Static") == 0) {\r
     IPv6->IpAddressOrigin = 0;\r
   } else if (StrCmp (TypeStr, L"StatelessAutoConfigure") == 0) {\r
@@ -1940,16 +1951,16 @@ DevPathFromTextIPv6 (
   StrToIpv6Address (LocalIPStr, NULL, &IPv6->LocalIpAddress, NULL);\r
   if (!IS_NULL (*GatewayIPStr) && !IS_NULL (*PrefixLengthStr)) {\r
     StrToIpv6Address (GatewayIPStr, NULL, &IPv6->GatewayIpAddress, NULL);\r
-    IPv6->PrefixLength = (UINT8) Strtoi (PrefixLengthStr);\r
+    IPv6->PrefixLength = (UINT8)Strtoi (PrefixLengthStr);\r
   } else {\r
     ZeroMem (&IPv6->GatewayIpAddress, sizeof (IPv6->GatewayIpAddress));\r
     IPv6->PrefixLength = 0;\r
   }\r
 \r
-  IPv6->LocalPort       = 0;\r
-  IPv6->RemotePort      = 0;\r
+  IPv6->LocalPort  = 0;\r
+  IPv6->RemotePort = 0;\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) IPv6;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)IPv6;\r
 }\r
 \r
 /**\r
@@ -1962,7 +1973,7 @@ DevPathFromTextIPv6 (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextUart (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   CHAR16            *BaudStr;\r
@@ -1971,65 +1982,66 @@ DevPathFromTextUart (
   CHAR16            *StopBitsStr;\r
   UART_DEVICE_PATH  *Uart;\r
 \r
-  BaudStr         = GetNextParamStr (&TextDeviceNode);\r
-  DataBitsStr     = GetNextParamStr (&TextDeviceNode);\r
-  ParityStr       = GetNextParamStr (&TextDeviceNode);\r
-  StopBitsStr     = GetNextParamStr (&TextDeviceNode);\r
-  Uart            = (UART_DEVICE_PATH *) CreateDeviceNode (\r
-                                           MESSAGING_DEVICE_PATH,\r
-                                           MSG_UART_DP,\r
-                                           (UINT16) sizeof (UART_DEVICE_PATH)\r
-                                           );\r
+  BaudStr     = GetNextParamStr (&TextDeviceNode);\r
+  DataBitsStr = GetNextParamStr (&TextDeviceNode);\r
+  ParityStr   = GetNextParamStr (&TextDeviceNode);\r
+  StopBitsStr = GetNextParamStr (&TextDeviceNode);\r
+  Uart        = (UART_DEVICE_PATH *)CreateDeviceNode (\r
+                                      MESSAGING_DEVICE_PATH,\r
+                                      MSG_UART_DP,\r
+                                      (UINT16)sizeof (UART_DEVICE_PATH)\r
+                                      );\r
 \r
   if (StrCmp (BaudStr, L"DEFAULT") == 0) {\r
     Uart->BaudRate = 115200;\r
   } else {\r
     Strtoi64 (BaudStr, &Uart->BaudRate);\r
   }\r
-  Uart->DataBits  = (UINT8) ((StrCmp (DataBitsStr, L"DEFAULT") == 0) ? 8 : Strtoi (DataBitsStr));\r
+\r
+  Uart->DataBits = (UINT8)((StrCmp (DataBitsStr, L"DEFAULT") == 0) ? 8 : Strtoi (DataBitsStr));\r
   switch (*ParityStr) {\r
-  case L'D':\r
-    Uart->Parity = 0;\r
-    break;\r
+    case L'D':\r
+      Uart->Parity = 0;\r
+      break;\r
 \r
-  case L'N':\r
-    Uart->Parity = 1;\r
-    break;\r
+    case L'N':\r
+      Uart->Parity = 1;\r
+      break;\r
 \r
-  case L'E':\r
-    Uart->Parity = 2;\r
-    break;\r
+    case L'E':\r
+      Uart->Parity = 2;\r
+      break;\r
 \r
-  case L'O':\r
-    Uart->Parity = 3;\r
-    break;\r
+    case L'O':\r
+      Uart->Parity = 3;\r
+      break;\r
 \r
-  case L'M':\r
-    Uart->Parity = 4;\r
-    break;\r
+    case L'M':\r
+      Uart->Parity = 4;\r
+      break;\r
 \r
-  case L'S':\r
-    Uart->Parity = 5;\r
-    break;\r
+    case L'S':\r
+      Uart->Parity = 5;\r
+      break;\r
 \r
-  default:\r
-    Uart->Parity = (UINT8) Strtoi (ParityStr);\r
-    break;\r
+    default:\r
+      Uart->Parity = (UINT8)Strtoi (ParityStr);\r
+      break;\r
   }\r
 \r
   if (StrCmp (StopBitsStr, L"D") == 0) {\r
-    Uart->StopBits = (UINT8) 0;\r
+    Uart->StopBits = (UINT8)0;\r
   } else if (StrCmp (StopBitsStr, L"1") == 0) {\r
-    Uart->StopBits = (UINT8) 1;\r
+    Uart->StopBits = (UINT8)1;\r
   } else if (StrCmp (StopBitsStr, L"1.5") == 0) {\r
-    Uart->StopBits = (UINT8) 2;\r
+    Uart->StopBits = (UINT8)2;\r
   } else if (StrCmp (StopBitsStr, L"2") == 0) {\r
-    Uart->StopBits = (UINT8) 3;\r
+    Uart->StopBits = (UINT8)3;\r
   } else {\r
-    Uart->StopBits = (UINT8) Strtoi (StopBitsStr);\r
+    Uart->StopBits = (UINT8)Strtoi (StopBitsStr);\r
   }\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) Uart;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)Uart;\r
 }\r
 \r
 /**\r
@@ -2043,41 +2055,42 @@ DevPathFromTextUart (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 ConvertFromTextUsbClass (\r
-  IN CHAR16         *TextDeviceNode,\r
-  IN USB_CLASS_TEXT *UsbClassText\r
+  IN CHAR16          *TextDeviceNode,\r
+  IN USB_CLASS_TEXT  *UsbClassText\r
   )\r
 {\r
-  CHAR16                *VIDStr;\r
-  CHAR16                *PIDStr;\r
-  CHAR16                *ClassStr;\r
-  CHAR16                *SubClassStr;\r
-  CHAR16                *ProtocolStr;\r
-  USB_CLASS_DEVICE_PATH *UsbClass;\r
+  CHAR16                 *VIDStr;\r
+  CHAR16                 *PIDStr;\r
+  CHAR16                 *ClassStr;\r
+  CHAR16                 *SubClassStr;\r
+  CHAR16                 *ProtocolStr;\r
+  USB_CLASS_DEVICE_PATH  *UsbClass;\r
 \r
-  UsbClass    = (USB_CLASS_DEVICE_PATH *) CreateDeviceNode (\r
-                                            MESSAGING_DEVICE_PATH,\r
-                                            MSG_USB_CLASS_DP,\r
-                                            (UINT16) sizeof (USB_CLASS_DEVICE_PATH)\r
-                                            );\r
+  UsbClass = (USB_CLASS_DEVICE_PATH *)CreateDeviceNode (\r
+                                        MESSAGING_DEVICE_PATH,\r
+                                        MSG_USB_CLASS_DP,\r
+                                        (UINT16)sizeof (USB_CLASS_DEVICE_PATH)\r
+                                        );\r
 \r
-  VIDStr      = GetNextParamStr (&TextDeviceNode);\r
-  PIDStr      = GetNextParamStr (&TextDeviceNode);\r
+  VIDStr = GetNextParamStr (&TextDeviceNode);\r
+  PIDStr = GetNextParamStr (&TextDeviceNode);\r
   if (UsbClassText->ClassExist) {\r
     ClassStr = GetNextParamStr (&TextDeviceNode);\r
     if (*ClassStr == L'\0') {\r
       UsbClass->DeviceClass = 0xFF;\r
     } else {\r
-      UsbClass->DeviceClass = (UINT8) Strtoi (ClassStr);\r
+      UsbClass->DeviceClass = (UINT8)Strtoi (ClassStr);\r
     }\r
   } else {\r
     UsbClass->DeviceClass = UsbClassText->Class;\r
   }\r
+\r
   if (UsbClassText->SubClassExist) {\r
     SubClassStr = GetNextParamStr (&TextDeviceNode);\r
     if (*SubClassStr == L'\0') {\r
       UsbClass->DeviceSubClass = 0xFF;\r
     } else {\r
-      UsbClass->DeviceSubClass = (UINT8) Strtoi (SubClassStr);\r
+      UsbClass->DeviceSubClass = (UINT8)Strtoi (SubClassStr);\r
     }\r
   } else {\r
     UsbClass->DeviceSubClass = UsbClassText->SubClass;\r
@@ -2086,25 +2099,26 @@ ConvertFromTextUsbClass (
   ProtocolStr = GetNextParamStr (&TextDeviceNode);\r
 \r
   if (*VIDStr == L'\0') {\r
-    UsbClass->VendorId        = 0xFFFF;\r
+    UsbClass->VendorId = 0xFFFF;\r
   } else {\r
-    UsbClass->VendorId        = (UINT16) Strtoi (VIDStr);\r
+    UsbClass->VendorId = (UINT16)Strtoi (VIDStr);\r
   }\r
+\r
   if (*PIDStr == L'\0') {\r
-    UsbClass->ProductId       = 0xFFFF;\r
+    UsbClass->ProductId = 0xFFFF;\r
   } else {\r
-    UsbClass->ProductId       = (UINT16) Strtoi (PIDStr);\r
+    UsbClass->ProductId = (UINT16)Strtoi (PIDStr);\r
   }\r
+\r
   if (*ProtocolStr == L'\0') {\r
-    UsbClass->DeviceProtocol  = 0xFF;\r
+    UsbClass->DeviceProtocol = 0xFF;\r
   } else {\r
-    UsbClass->DeviceProtocol  = (UINT8) Strtoi (ProtocolStr);\r
+    UsbClass->DeviceProtocol = (UINT8)Strtoi (ProtocolStr);\r
   }\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) UsbClass;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)UsbClass;\r
 }\r
 \r
-\r
 /**\r
   Converts a text device path node to USB class device path structure.\r
 \r
@@ -2115,7 +2129,7 @@ ConvertFromTextUsbClass (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextUsbClass (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   USB_CLASS_TEXT  UsbClassText;\r
@@ -2136,7 +2150,7 @@ DevPathFromTextUsbClass (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextUsbAudio (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   USB_CLASS_TEXT  UsbClassText;\r
@@ -2158,7 +2172,7 @@ DevPathFromTextUsbAudio (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextUsbCDCControl (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   USB_CLASS_TEXT  UsbClassText;\r
@@ -2180,7 +2194,7 @@ DevPathFromTextUsbCDCControl (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextUsbHID (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   USB_CLASS_TEXT  UsbClassText;\r
@@ -2202,7 +2216,7 @@ DevPathFromTextUsbHID (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextUsbImage (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   USB_CLASS_TEXT  UsbClassText;\r
@@ -2224,7 +2238,7 @@ DevPathFromTextUsbImage (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextUsbPrinter (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   USB_CLASS_TEXT  UsbClassText;\r
@@ -2246,7 +2260,7 @@ DevPathFromTextUsbPrinter (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextUsbMassStorage (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   USB_CLASS_TEXT  UsbClassText;\r
@@ -2268,7 +2282,7 @@ DevPathFromTextUsbMassStorage (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextUsbHub (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   USB_CLASS_TEXT  UsbClassText;\r
@@ -2290,7 +2304,7 @@ DevPathFromTextUsbHub (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextUsbCDCData (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   USB_CLASS_TEXT  UsbClassText;\r
@@ -2312,7 +2326,7 @@ DevPathFromTextUsbCDCData (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextUsbSmartCard (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   USB_CLASS_TEXT  UsbClassText;\r
@@ -2334,7 +2348,7 @@ DevPathFromTextUsbSmartCard (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextUsbVideo (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   USB_CLASS_TEXT  UsbClassText;\r
@@ -2356,7 +2370,7 @@ DevPathFromTextUsbVideo (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextUsbDiagnostic (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   USB_CLASS_TEXT  UsbClassText;\r
@@ -2378,7 +2392,7 @@ DevPathFromTextUsbDiagnostic (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextUsbWireless (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   USB_CLASS_TEXT  UsbClassText;\r
@@ -2400,7 +2414,7 @@ DevPathFromTextUsbWireless (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextUsbDeviceFirmwareUpdate (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   USB_CLASS_TEXT  UsbClassText;\r
@@ -2423,7 +2437,7 @@ DevPathFromTextUsbDeviceFirmwareUpdate (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextUsbIrdaBridge (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   USB_CLASS_TEXT  UsbClassText;\r
@@ -2446,7 +2460,7 @@ DevPathFromTextUsbIrdaBridge (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextUsbTestAndMeasurement (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   USB_CLASS_TEXT  UsbClassText;\r
@@ -2469,7 +2483,7 @@ DevPathFromTextUsbTestAndMeasurement (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextUsbWwid (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   CHAR16                *VIDStr;\r
@@ -2479,39 +2493,41 @@ DevPathFromTextUsbWwid (
   USB_WWID_DEVICE_PATH  *UsbWwid;\r
   UINTN                 SerialNumberStrLen;\r
 \r
-  VIDStr                   = GetNextParamStr (&TextDeviceNode);\r
-  PIDStr                   = GetNextParamStr (&TextDeviceNode);\r
-  InterfaceNumStr          = GetNextParamStr (&TextDeviceNode);\r
-  SerialNumberStr          = GetNextParamStr (&TextDeviceNode);\r
-  SerialNumberStrLen       = StrLen (SerialNumberStr);\r
-  if (SerialNumberStrLen >= 2 &&\r
-      SerialNumberStr[0] == L'\"' &&\r
-      SerialNumberStr[SerialNumberStrLen - 1] == L'\"'\r
-    ) {\r
+  VIDStr             = GetNextParamStr (&TextDeviceNode);\r
+  PIDStr             = GetNextParamStr (&TextDeviceNode);\r
+  InterfaceNumStr    = GetNextParamStr (&TextDeviceNode);\r
+  SerialNumberStr    = GetNextParamStr (&TextDeviceNode);\r
+  SerialNumberStrLen = StrLen (SerialNumberStr);\r
+  if ((SerialNumberStrLen >= 2) &&\r
+      (SerialNumberStr[0] == L'\"') &&\r
+      (SerialNumberStr[SerialNumberStrLen - 1] == L'\"')\r
+      )\r
+  {\r
     SerialNumberStr[SerialNumberStrLen - 1] = L'\0';\r
     SerialNumberStr++;\r
     SerialNumberStrLen -= 2;\r
   }\r
-  UsbWwid                  = (USB_WWID_DEVICE_PATH *) CreateDeviceNode (\r
-                                                         MESSAGING_DEVICE_PATH,\r
-                                                         MSG_USB_WWID_DP,\r
-                                                         (UINT16) (sizeof (USB_WWID_DEVICE_PATH) + SerialNumberStrLen * sizeof (CHAR16))\r
-                                                         );\r
-  UsbWwid->VendorId        = (UINT16) Strtoi (VIDStr);\r
-  UsbWwid->ProductId       = (UINT16) Strtoi (PIDStr);\r
-  UsbWwid->InterfaceNumber = (UINT16) Strtoi (InterfaceNumStr);\r
+\r
+  UsbWwid = (USB_WWID_DEVICE_PATH *)CreateDeviceNode (\r
+                                      MESSAGING_DEVICE_PATH,\r
+                                      MSG_USB_WWID_DP,\r
+                                      (UINT16)(sizeof (USB_WWID_DEVICE_PATH) + SerialNumberStrLen * sizeof (CHAR16))\r
+                                      );\r
+  UsbWwid->VendorId        = (UINT16)Strtoi (VIDStr);\r
+  UsbWwid->ProductId       = (UINT16)Strtoi (PIDStr);\r
+  UsbWwid->InterfaceNumber = (UINT16)Strtoi (InterfaceNumStr);\r
 \r
   //\r
   // There is no memory allocated in UsbWwid for the '\0' in SerialNumberStr.\r
   // Therefore, the '\0' will not be copied.\r
   //\r
   CopyMem (\r
-    (UINT8 *) UsbWwid + sizeof (USB_WWID_DEVICE_PATH),\r
+    (UINT8 *)UsbWwid + sizeof (USB_WWID_DEVICE_PATH),\r
     SerialNumberStr,\r
     SerialNumberStrLen * sizeof (CHAR16)\r
     );\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) UsbWwid;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)UsbWwid;\r
 }\r
 \r
 /**\r
@@ -2524,22 +2540,22 @@ DevPathFromTextUsbWwid (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextUnit (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
-  CHAR16                          *LunStr;\r
-  DEVICE_LOGICAL_UNIT_DEVICE_PATH *LogicalUnit;\r
+  CHAR16                           *LunStr;\r
+  DEVICE_LOGICAL_UNIT_DEVICE_PATH  *LogicalUnit;\r
 \r
   LunStr      = GetNextParamStr (&TextDeviceNode);\r
-  LogicalUnit = (DEVICE_LOGICAL_UNIT_DEVICE_PATH *) CreateDeviceNode (\r
-                                                      MESSAGING_DEVICE_PATH,\r
-                                                      MSG_DEVICE_LOGICAL_UNIT_DP,\r
-                                                      (UINT16) sizeof (DEVICE_LOGICAL_UNIT_DEVICE_PATH)\r
-                                                      );\r
+  LogicalUnit = (DEVICE_LOGICAL_UNIT_DEVICE_PATH *)CreateDeviceNode (\r
+                                                     MESSAGING_DEVICE_PATH,\r
+                                                     MSG_DEVICE_LOGICAL_UNIT_DP,\r
+                                                     (UINT16)sizeof (DEVICE_LOGICAL_UNIT_DEVICE_PATH)\r
+                                                     );\r
 \r
-  LogicalUnit->Lun  = (UINT8) Strtoi (LunStr);\r
+  LogicalUnit->Lun = (UINT8)Strtoi (LunStr);\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) LogicalUnit;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)LogicalUnit;\r
 }\r
 \r
 /**\r
@@ -2552,20 +2568,20 @@ DevPathFromTextUnit (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextiSCSI (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
-  UINT16                      Options;\r
-  CHAR16                      *NameStr;\r
-  CHAR16                      *PortalGroupStr;\r
-  CHAR16                      *LunStr;\r
-  CHAR16                      *HeaderDigestStr;\r
-  CHAR16                      *DataDigestStr;\r
-  CHAR16                      *AuthenticationStr;\r
-  CHAR16                      *ProtocolStr;\r
-  CHAR8                       *AsciiStr;\r
-  ISCSI_DEVICE_PATH_WITH_NAME *ISCSIDevPath;\r
-  UINT64                      Lun;\r
+  UINT16                       Options;\r
+  CHAR16                       *NameStr;\r
+  CHAR16                       *PortalGroupStr;\r
+  CHAR16                       *LunStr;\r
+  CHAR16                       *HeaderDigestStr;\r
+  CHAR16                       *DataDigestStr;\r
+  CHAR16                       *AuthenticationStr;\r
+  CHAR16                       *ProtocolStr;\r
+  CHAR8                        *AsciiStr;\r
+  ISCSI_DEVICE_PATH_WITH_NAME  *ISCSIDevPath;\r
+  UINT64                       Lun;\r
 \r
   NameStr           = GetNextParamStr (&TextDeviceNode);\r
   PortalGroupStr    = GetNextParamStr (&TextDeviceNode);\r
@@ -2574,18 +2590,18 @@ DevPathFromTextiSCSI (
   DataDigestStr     = GetNextParamStr (&TextDeviceNode);\r
   AuthenticationStr = GetNextParamStr (&TextDeviceNode);\r
   ProtocolStr       = GetNextParamStr (&TextDeviceNode);\r
-  ISCSIDevPath      = (ISCSI_DEVICE_PATH_WITH_NAME *) CreateDeviceNode (\r
-                                                        MESSAGING_DEVICE_PATH,\r
-                                                        MSG_ISCSI_DP,\r
-                                                        (UINT16) (sizeof (ISCSI_DEVICE_PATH_WITH_NAME) + StrLen (NameStr))\r
-                                                        );\r
+  ISCSIDevPath      = (ISCSI_DEVICE_PATH_WITH_NAME *)CreateDeviceNode (\r
+                                                       MESSAGING_DEVICE_PATH,\r
+                                                       MSG_ISCSI_DP,\r
+                                                       (UINT16)(sizeof (ISCSI_DEVICE_PATH_WITH_NAME) + StrLen (NameStr))\r
+                                                       );\r
 \r
   AsciiStr = ISCSIDevPath->TargetName;\r
   StrToAscii (NameStr, &AsciiStr);\r
 \r
-  ISCSIDevPath->TargetPortalGroupTag = (UINT16) Strtoi (PortalGroupStr);\r
+  ISCSIDevPath->TargetPortalGroupTag = (UINT16)Strtoi (PortalGroupStr);\r
   Strtoi64 (LunStr, &Lun);\r
-  WriteUnaligned64 ((UINT64 *) &ISCSIDevPath->Lun, SwapBytes64 (Lun));\r
+  WriteUnaligned64 ((UINT64 *)&ISCSIDevPath->Lun, SwapBytes64 (Lun));\r
 \r
   Options = 0x0000;\r
   if (StrCmp (HeaderDigestStr, L"CRC32C") == 0) {\r
@@ -2604,7 +2620,7 @@ DevPathFromTextiSCSI (
     Options |= 0x1000;\r
   }\r
 \r
-  ISCSIDevPath->LoginOption      = (UINT16) Options;\r
+  ISCSIDevPath->LoginOption = (UINT16)Options;\r
 \r
   if (IS_NULL (*ProtocolStr) || (StrCmp (ProtocolStr, L"TCP") == 0)) {\r
     ISCSIDevPath->NetworkProtocol = 0;\r
@@ -2615,7 +2631,7 @@ DevPathFromTextiSCSI (
     ISCSIDevPath->NetworkProtocol = 1;\r
   }\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) ISCSIDevPath;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)ISCSIDevPath;\r
 }\r
 \r
 /**\r
@@ -2628,22 +2644,22 @@ DevPathFromTextiSCSI (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextVlan (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   CHAR16            *VlanStr;\r
   VLAN_DEVICE_PATH  *Vlan;\r
 \r
   VlanStr = GetNextParamStr (&TextDeviceNode);\r
-  Vlan    = (VLAN_DEVICE_PATH *) CreateDeviceNode (\r
-                                   MESSAGING_DEVICE_PATH,\r
-                                   MSG_VLAN_DP,\r
-                                   (UINT16) sizeof (VLAN_DEVICE_PATH)\r
-                                   );\r
+  Vlan    = (VLAN_DEVICE_PATH *)CreateDeviceNode (\r
+                                  MESSAGING_DEVICE_PATH,\r
+                                  MSG_VLAN_DP,\r
+                                  (UINT16)sizeof (VLAN_DEVICE_PATH)\r
+                                  );\r
 \r
-  Vlan->VlanId = (UINT16) Strtoi (VlanStr);\r
+  Vlan->VlanId = (UINT16)Strtoi (VlanStr);\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) Vlan;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)Vlan;\r
 }\r
 \r
 /**\r
@@ -2656,25 +2672,25 @@ DevPathFromTextVlan (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextBluetooth (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
-  CHAR16                  *BluetoothStr;\r
-  BLUETOOTH_DEVICE_PATH   *BluetoothDp;\r
+  CHAR16                 *BluetoothStr;\r
+  BLUETOOTH_DEVICE_PATH  *BluetoothDp;\r
 \r
   BluetoothStr = GetNextParamStr (&TextDeviceNode);\r
-  BluetoothDp  = (BLUETOOTH_DEVICE_PATH *) CreateDeviceNode (\r
-                                             MESSAGING_DEVICE_PATH,\r
-                                             MSG_BLUETOOTH_DP,\r
-                                             (UINT16) sizeof (BLUETOOTH_DEVICE_PATH)\r
-                                             );\r
+  BluetoothDp  = (BLUETOOTH_DEVICE_PATH *)CreateDeviceNode (\r
+                                            MESSAGING_DEVICE_PATH,\r
+                                            MSG_BLUETOOTH_DP,\r
+                                            (UINT16)sizeof (BLUETOOTH_DEVICE_PATH)\r
+                                            );\r
   StrHexToBytes (\r
     BluetoothStr,\r
     sizeof (BLUETOOTH_ADDRESS) * 2,\r
     BluetoothDp->BD_ADDR.Address,\r
     sizeof (BLUETOOTH_ADDRESS)\r
     );\r
-  return (EFI_DEVICE_PATH_PROTOCOL *) BluetoothDp;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)BluetoothDp;\r
 }\r
 \r
 /**\r
@@ -2687,20 +2703,20 @@ DevPathFromTextBluetooth (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextWiFi (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
-  CHAR16                *SSIdStr;\r
-  CHAR8                 AsciiStr[33];\r
-  UINTN                 DataLen;\r
-  WIFI_DEVICE_PATH      *WiFiDp;\r
+  CHAR16            *SSIdStr;\r
+  CHAR8             AsciiStr[33];\r
+  UINTN             DataLen;\r
+  WIFI_DEVICE_PATH  *WiFiDp;\r
 \r
   SSIdStr = GetNextParamStr (&TextDeviceNode);\r
-  WiFiDp  = (WIFI_DEVICE_PATH *) CreateDeviceNode (\r
-                                   MESSAGING_DEVICE_PATH,\r
-                                   MSG_WIFI_DP,\r
-                                   (UINT16) sizeof (WIFI_DEVICE_PATH)\r
-                                   );\r
+  WiFiDp  = (WIFI_DEVICE_PATH *)CreateDeviceNode (\r
+                                  MESSAGING_DEVICE_PATH,\r
+                                  MSG_WIFI_DP,\r
+                                  (UINT16)sizeof (WIFI_DEVICE_PATH)\r
+                                  );\r
 \r
   if (NULL != SSIdStr) {\r
     DataLen = StrLen (SSIdStr);\r
@@ -2713,7 +2729,7 @@ DevPathFromTextWiFi (
     CopyMem (WiFiDp->SSId, AsciiStr, DataLen);\r
   }\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) WiFiDp;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)WiFiDp;\r
 }\r
 \r
 /**\r
@@ -2726,27 +2742,29 @@ DevPathFromTextWiFi (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextBluetoothLE (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
-  CHAR16                     *BluetoothLeAddrStr;\r
-  CHAR16                     *BluetoothLeAddrTypeStr;\r
-  BLUETOOTH_LE_DEVICE_PATH   *BluetoothLeDp;\r
+  CHAR16                    *BluetoothLeAddrStr;\r
+  CHAR16                    *BluetoothLeAddrTypeStr;\r
+  BLUETOOTH_LE_DEVICE_PATH  *BluetoothLeDp;\r
 \r
   BluetoothLeAddrStr     = GetNextParamStr (&TextDeviceNode);\r
   BluetoothLeAddrTypeStr = GetNextParamStr (&TextDeviceNode);\r
-  BluetoothLeDp = (BLUETOOTH_LE_DEVICE_PATH *) CreateDeviceNode (\r
-                                                 MESSAGING_DEVICE_PATH,\r
-                                                 MSG_BLUETOOTH_LE_DP,\r
-                                                 (UINT16) sizeof (BLUETOOTH_LE_DEVICE_PATH)\r
-                                                 );\r
+  BluetoothLeDp          = (BLUETOOTH_LE_DEVICE_PATH *)CreateDeviceNode (\r
+                                                         MESSAGING_DEVICE_PATH,\r
+                                                         MSG_BLUETOOTH_LE_DP,\r
+                                                         (UINT16)sizeof (BLUETOOTH_LE_DEVICE_PATH)\r
+                                                         );\r
 \r
-  BluetoothLeDp->Address.Type = (UINT8) Strtoi (BluetoothLeAddrTypeStr);\r
+  BluetoothLeDp->Address.Type = (UINT8)Strtoi (BluetoothLeAddrTypeStr);\r
   StrHexToBytes (\r
-    BluetoothLeAddrStr, sizeof (BluetoothLeDp->Address.Address) * 2,\r
-    BluetoothLeDp->Address.Address, sizeof (BluetoothLeDp->Address.Address)\r
+    BluetoothLeAddrStr,\r
+    sizeof (BluetoothLeDp->Address.Address) * 2,\r
+    BluetoothLeDp->Address.Address,\r
+    sizeof (BluetoothLeDp->Address.Address)\r
     );\r
-  return (EFI_DEVICE_PATH_PROTOCOL *) BluetoothLeDp;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)BluetoothLeDp;\r
 }\r
 \r
 /**\r
@@ -2759,17 +2777,16 @@ DevPathFromTextBluetoothLE (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextDns (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
-  CHAR16            *DeviceNodeStr;\r
-  CHAR16            *DeviceNodeStrPtr;\r
-  UINT32            DnsServerIpCount;\r
-  UINT16            DnsDeviceNodeLength;\r
-  DNS_DEVICE_PATH   *DnsDeviceNode;\r
-  UINT32            DnsServerIpIndex;\r
-  CHAR16            *DnsServerIp;\r
-\r
+  CHAR16           *DeviceNodeStr;\r
+  CHAR16           *DeviceNodeStrPtr;\r
+  UINT32           DnsServerIpCount;\r
+  UINT16           DnsDeviceNodeLength;\r
+  DNS_DEVICE_PATH  *DnsDeviceNode;\r
+  UINT32           DnsServerIpIndex;\r
+  CHAR16           *DnsServerIp;\r
 \r
   //\r
   // Count the DNS server address number.\r
@@ -2784,7 +2801,7 @@ DevPathFromTextDns (
   DnsServerIpCount = 0;\r
   while (DeviceNodeStrPtr != NULL && *DeviceNodeStrPtr != L'\0') {\r
     GetNextParamStr (&DeviceNodeStrPtr);\r
-    DnsServerIpCount ++;\r
+    DnsServerIpCount++;\r
   }\r
 \r
   FreePool (DeviceNodeStr);\r
@@ -2801,12 +2818,12 @@ DevPathFromTextDns (
   //\r
   // Create the DNS DeviceNode.\r
   //\r
-  DnsDeviceNodeLength = (UINT16) (sizeof (EFI_DEVICE_PATH_PROTOCOL) + sizeof (UINT8) + DnsServerIpCount * sizeof (EFI_IP_ADDRESS));\r
-  DnsDeviceNode       = (DNS_DEVICE_PATH *) CreateDeviceNode (\r
-                                              MESSAGING_DEVICE_PATH,\r
-                                              MSG_DNS_DP,\r
-                                              DnsDeviceNodeLength\r
-                                              );\r
+  DnsDeviceNodeLength = (UINT16)(sizeof (EFI_DEVICE_PATH_PROTOCOL) + sizeof (UINT8) + DnsServerIpCount * sizeof (EFI_IP_ADDRESS));\r
+  DnsDeviceNode       = (DNS_DEVICE_PATH *)CreateDeviceNode (\r
+                                             MESSAGING_DEVICE_PATH,\r
+                                             MSG_DNS_DP,\r
+                                             DnsDeviceNodeLength\r
+                                             );\r
   if (DnsDeviceNode == NULL) {\r
     return NULL;\r
   }\r
@@ -2832,13 +2849,13 @@ DevPathFromTextDns (
   for (DnsServerIpIndex = 0; DnsServerIpIndex < DnsServerIpCount; DnsServerIpIndex++) {\r
     DnsServerIp = GetNextParamStr (&TextDeviceNode);\r
     if (DnsDeviceNode->IsIPv6 == 0x00) {\r
-      StrToIpv4Address (DnsServerIp,  NULL, &(DnsDeviceNode->DnsServerIp[DnsServerIpIndex].v4), NULL);\r
+      StrToIpv4Address (DnsServerIp, NULL, &(DnsDeviceNode->DnsServerIp[DnsServerIpIndex].v4), NULL);\r
     } else {\r
       StrToIpv6Address (DnsServerIp, NULL, &(DnsDeviceNode->DnsServerIp[DnsServerIpIndex].v6), NULL);\r
     }\r
   }\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) DnsDeviceNode;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)DnsDeviceNode;\r
 }\r
 \r
 /**\r
@@ -2851,26 +2868,26 @@ DevPathFromTextDns (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextUri (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   CHAR16           *UriStr;\r
   UINTN            UriLength;\r
   URI_DEVICE_PATH  *Uri;\r
 \r
-  UriStr = GetNextParamStr (&TextDeviceNode);\r
+  UriStr    = GetNextParamStr (&TextDeviceNode);\r
   UriLength = StrnLenS (UriStr, MAX_UINT16 - sizeof (URI_DEVICE_PATH));\r
-  Uri    = (URI_DEVICE_PATH *) CreateDeviceNode (\r
-                                 MESSAGING_DEVICE_PATH,\r
-                                 MSG_URI_DP,\r
-                                 (UINT16) (sizeof (URI_DEVICE_PATH) + UriLength)\r
-                                 );\r
+  Uri       = (URI_DEVICE_PATH *)CreateDeviceNode (\r
+                                   MESSAGING_DEVICE_PATH,\r
+                                   MSG_URI_DP,\r
+                                   (UINT16)(sizeof (URI_DEVICE_PATH) + UriLength)\r
+                                   );\r
 \r
   while (UriLength-- != 0) {\r
-    Uri->Uri[UriLength] = (CHAR8) UriStr[UriLength];\r
+    Uri->Uri[UriLength] = (CHAR8)UriStr[UriLength];\r
   }\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) Uri;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)Uri;\r
 }\r
 \r
 /**\r
@@ -2883,7 +2900,7 @@ DevPathFromTextUri (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextMediaPath (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   return DevPathFromTextGenericPath (MEDIA_DEVICE_PATH, TextDeviceNode);\r
@@ -2899,52 +2916,52 @@ DevPathFromTextMediaPath (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextHD (\r
-  IN CHAR16 *TextDeviceNode\r
-  )\r
-{\r
-  CHAR16                *PartitionStr;\r
-  CHAR16                *TypeStr;\r
-  CHAR16                *SignatureStr;\r
-  CHAR16                *StartStr;\r
-  CHAR16                *SizeStr;\r
-  UINT32                Signature32;\r
-  HARDDRIVE_DEVICE_PATH *Hd;\r
-\r
-  PartitionStr        = GetNextParamStr (&TextDeviceNode);\r
-  TypeStr             = GetNextParamStr (&TextDeviceNode);\r
-  SignatureStr        = GetNextParamStr (&TextDeviceNode);\r
-  StartStr            = GetNextParamStr (&TextDeviceNode);\r
-  SizeStr             = GetNextParamStr (&TextDeviceNode);\r
-  Hd                  = (HARDDRIVE_DEVICE_PATH *) CreateDeviceNode (\r
-                                                    MEDIA_DEVICE_PATH,\r
-                                                    MEDIA_HARDDRIVE_DP,\r
-                                                    (UINT16) sizeof (HARDDRIVE_DEVICE_PATH)\r
-                                                    );\r
+  IN CHAR16  *TextDeviceNode\r
+  )\r
+{\r
+  CHAR16                 *PartitionStr;\r
+  CHAR16                 *TypeStr;\r
+  CHAR16                 *SignatureStr;\r
+  CHAR16                 *StartStr;\r
+  CHAR16                 *SizeStr;\r
+  UINT32                 Signature32;\r
+  HARDDRIVE_DEVICE_PATH  *Hd;\r
+\r
+  PartitionStr = GetNextParamStr (&TextDeviceNode);\r
+  TypeStr      = GetNextParamStr (&TextDeviceNode);\r
+  SignatureStr = GetNextParamStr (&TextDeviceNode);\r
+  StartStr     = GetNextParamStr (&TextDeviceNode);\r
+  SizeStr      = GetNextParamStr (&TextDeviceNode);\r
+  Hd           = (HARDDRIVE_DEVICE_PATH *)CreateDeviceNode (\r
+                                            MEDIA_DEVICE_PATH,\r
+                                            MEDIA_HARDDRIVE_DP,\r
+                                            (UINT16)sizeof (HARDDRIVE_DEVICE_PATH)\r
+                                            );\r
 \r
-  Hd->PartitionNumber = (UINT32) Strtoi (PartitionStr);\r
+  Hd->PartitionNumber = (UINT32)Strtoi (PartitionStr);\r
 \r
   ZeroMem (Hd->Signature, 16);\r
-  Hd->MBRType = (UINT8) 0;\r
+  Hd->MBRType = (UINT8)0;\r
 \r
   if (StrCmp (TypeStr, L"MBR") == 0) {\r
     Hd->SignatureType = SIGNATURE_TYPE_MBR;\r
     Hd->MBRType       = 0x01;\r
 \r
-    Signature32       = (UINT32) Strtoi (SignatureStr);\r
+    Signature32 = (UINT32)Strtoi (SignatureStr);\r
     CopyMem (Hd->Signature, &Signature32, sizeof (UINT32));\r
   } else if (StrCmp (TypeStr, L"GPT") == 0) {\r
     Hd->SignatureType = SIGNATURE_TYPE_GUID;\r
     Hd->MBRType       = 0x02;\r
 \r
-    StrToGuid (SignatureStr, (EFI_GUID *) Hd->Signature);\r
+    StrToGuid (SignatureStr, (EFI_GUID *)Hd->Signature);\r
   } else {\r
-    Hd->SignatureType = (UINT8) Strtoi (TypeStr);\r
+    Hd->SignatureType = (UINT8)Strtoi (TypeStr);\r
   }\r
 \r
   Strtoi64 (StartStr, &Hd->PartitionStart);\r
   Strtoi64 (SizeStr, &Hd->PartitionSize);\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) Hd;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)Hd;\r
 }\r
 \r
 /**\r
@@ -2957,28 +2974,28 @@ DevPathFromTextHD (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextCDROM (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
-  CHAR16            *EntryStr;\r
-  CHAR16            *StartStr;\r
-  CHAR16            *SizeStr;\r
-  CDROM_DEVICE_PATH *CDROMDevPath;\r
+  CHAR16             *EntryStr;\r
+  CHAR16             *StartStr;\r
+  CHAR16             *SizeStr;\r
+  CDROM_DEVICE_PATH  *CDROMDevPath;\r
 \r
-  EntryStr              = GetNextParamStr (&TextDeviceNode);\r
-  StartStr              = GetNextParamStr (&TextDeviceNode);\r
-  SizeStr               = GetNextParamStr (&TextDeviceNode);\r
-  CDROMDevPath          = (CDROM_DEVICE_PATH *) CreateDeviceNode (\r
-                                                  MEDIA_DEVICE_PATH,\r
-                                                  MEDIA_CDROM_DP,\r
-                                                  (UINT16) sizeof (CDROM_DEVICE_PATH)\r
-                                                  );\r
+  EntryStr     = GetNextParamStr (&TextDeviceNode);\r
+  StartStr     = GetNextParamStr (&TextDeviceNode);\r
+  SizeStr      = GetNextParamStr (&TextDeviceNode);\r
+  CDROMDevPath = (CDROM_DEVICE_PATH *)CreateDeviceNode (\r
+                                        MEDIA_DEVICE_PATH,\r
+                                        MEDIA_CDROM_DP,\r
+                                        (UINT16)sizeof (CDROM_DEVICE_PATH)\r
+                                        );\r
 \r
-  CDROMDevPath->BootEntry = (UINT32) Strtoi (EntryStr);\r
+  CDROMDevPath->BootEntry = (UINT32)Strtoi (EntryStr);\r
   Strtoi64 (StartStr, &CDROMDevPath->PartitionStart);\r
   Strtoi64 (SizeStr, &CDROMDevPath->PartitionSize);\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) CDROMDevPath;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)CDROMDevPath;\r
 }\r
 \r
 /**\r
@@ -2991,7 +3008,7 @@ DevPathFromTextCDROM (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextVenMedia (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   return ConvertFromTextVendor (\r
@@ -3011,20 +3028,20 @@ DevPathFromTextVenMedia (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextFilePath (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   FILEPATH_DEVICE_PATH  *File;\r
 \r
-  File = (FILEPATH_DEVICE_PATH *) CreateDeviceNode (\r
-                                    MEDIA_DEVICE_PATH,\r
-                                    MEDIA_FILEPATH_DP,\r
-                                    (UINT16) (sizeof (FILEPATH_DEVICE_PATH) + StrLen (TextDeviceNode) * 2)\r
-                                    );\r
+  File = (FILEPATH_DEVICE_PATH *)CreateDeviceNode (\r
+                                   MEDIA_DEVICE_PATH,\r
+                                   MEDIA_FILEPATH_DP,\r
+                                   (UINT16)(sizeof (FILEPATH_DEVICE_PATH) + StrLen (TextDeviceNode) * 2)\r
+                                   );\r
 \r
   StrCpyS (File->PathName, StrLen (TextDeviceNode) + 1, TextDeviceNode);\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) File;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)File;\r
 }\r
 \r
 /**\r
@@ -3037,22 +3054,22 @@ DevPathFromTextFilePath (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextMedia (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   CHAR16                      *GuidStr;\r
   MEDIA_PROTOCOL_DEVICE_PATH  *Media;\r
 \r
   GuidStr = GetNextParamStr (&TextDeviceNode);\r
-  Media   = (MEDIA_PROTOCOL_DEVICE_PATH *) CreateDeviceNode (\r
-                                             MEDIA_DEVICE_PATH,\r
-                                             MEDIA_PROTOCOL_DP,\r
-                                             (UINT16) sizeof (MEDIA_PROTOCOL_DEVICE_PATH)\r
-                                             );\r
+  Media   = (MEDIA_PROTOCOL_DEVICE_PATH *)CreateDeviceNode (\r
+                                            MEDIA_DEVICE_PATH,\r
+                                            MEDIA_PROTOCOL_DP,\r
+                                            (UINT16)sizeof (MEDIA_PROTOCOL_DEVICE_PATH)\r
+                                            );\r
 \r
   StrToGuid (GuidStr, &Media->Protocol);\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) Media;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)Media;\r
 }\r
 \r
 /**\r
@@ -3065,22 +3082,22 @@ DevPathFromTextMedia (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextFv (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   CHAR16                    *GuidStr;\r
   MEDIA_FW_VOL_DEVICE_PATH  *Fv;\r
 \r
   GuidStr = GetNextParamStr (&TextDeviceNode);\r
-  Fv      = (MEDIA_FW_VOL_DEVICE_PATH *) CreateDeviceNode (\r
-                                           MEDIA_DEVICE_PATH,\r
-                                           MEDIA_PIWG_FW_VOL_DP,\r
-                                           (UINT16) sizeof (MEDIA_FW_VOL_DEVICE_PATH)\r
-                                           );\r
+  Fv      = (MEDIA_FW_VOL_DEVICE_PATH *)CreateDeviceNode (\r
+                                          MEDIA_DEVICE_PATH,\r
+                                          MEDIA_PIWG_FW_VOL_DP,\r
+                                          (UINT16)sizeof (MEDIA_FW_VOL_DEVICE_PATH)\r
+                                          );\r
 \r
   StrToGuid (GuidStr, &Fv->FvName);\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) Fv;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)Fv;\r
 }\r
 \r
 /**\r
@@ -3093,22 +3110,22 @@ DevPathFromTextFv (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextFvFile (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   CHAR16                             *GuidStr;\r
   MEDIA_FW_VOL_FILEPATH_DEVICE_PATH  *FvFile;\r
 \r
   GuidStr = GetNextParamStr (&TextDeviceNode);\r
-  FvFile  = (MEDIA_FW_VOL_FILEPATH_DEVICE_PATH *) CreateDeviceNode (\r
-                                                    MEDIA_DEVICE_PATH,\r
-                                                    MEDIA_PIWG_FW_FILE_DP,\r
-                                                    (UINT16) sizeof (MEDIA_FW_VOL_FILEPATH_DEVICE_PATH)\r
-                                                    );\r
+  FvFile  = (MEDIA_FW_VOL_FILEPATH_DEVICE_PATH *)CreateDeviceNode (\r
+                                                   MEDIA_DEVICE_PATH,\r
+                                                   MEDIA_PIWG_FW_FILE_DP,\r
+                                                   (UINT16)sizeof (MEDIA_FW_VOL_FILEPATH_DEVICE_PATH)\r
+                                                   );\r
 \r
   StrToGuid (GuidStr, &FvFile->FvFileName);\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) FvFile;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)FvFile;\r
 }\r
 \r
 /**\r
@@ -3121,25 +3138,25 @@ DevPathFromTextFvFile (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextRelativeOffsetRange (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
-  CHAR16                                  *StartingOffsetStr;\r
-  CHAR16                                  *EndingOffsetStr;\r
-  MEDIA_RELATIVE_OFFSET_RANGE_DEVICE_PATH *Offset;\r
+  CHAR16                                   *StartingOffsetStr;\r
+  CHAR16                                   *EndingOffsetStr;\r
+  MEDIA_RELATIVE_OFFSET_RANGE_DEVICE_PATH  *Offset;\r
 \r
   StartingOffsetStr = GetNextParamStr (&TextDeviceNode);\r
   EndingOffsetStr   = GetNextParamStr (&TextDeviceNode);\r
-  Offset            = (MEDIA_RELATIVE_OFFSET_RANGE_DEVICE_PATH *) CreateDeviceNode (\r
-                                                                    MEDIA_DEVICE_PATH,\r
-                                                                    MEDIA_RELATIVE_OFFSET_RANGE_DP,\r
-                                                                    (UINT16) sizeof (MEDIA_RELATIVE_OFFSET_RANGE_DEVICE_PATH)\r
-                                                                    );\r
+  Offset            = (MEDIA_RELATIVE_OFFSET_RANGE_DEVICE_PATH *)CreateDeviceNode (\r
+                                                                   MEDIA_DEVICE_PATH,\r
+                                                                   MEDIA_RELATIVE_OFFSET_RANGE_DP,\r
+                                                                   (UINT16)sizeof (MEDIA_RELATIVE_OFFSET_RANGE_DEVICE_PATH)\r
+                                                                   );\r
 \r
   Strtoi64 (StartingOffsetStr, &Offset->StartingOffset);\r
   Strtoi64 (EndingOffsetStr, &Offset->EndingOffset);\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) Offset;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)Offset;\r
 }\r
 \r
 /**\r
@@ -3152,35 +3169,35 @@ DevPathFromTextRelativeOffsetRange (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextRamDisk (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
-  CHAR16                                  *StartingAddrStr;\r
-  CHAR16                                  *EndingAddrStr;\r
-  CHAR16                                  *TypeGuidStr;\r
-  CHAR16                                  *InstanceStr;\r
-  MEDIA_RAM_DISK_DEVICE_PATH              *RamDisk;\r
-  UINT64                                  StartingAddr;\r
-  UINT64                                  EndingAddr;\r
+  CHAR16                      *StartingAddrStr;\r
+  CHAR16                      *EndingAddrStr;\r
+  CHAR16                      *TypeGuidStr;\r
+  CHAR16                      *InstanceStr;\r
+  MEDIA_RAM_DISK_DEVICE_PATH  *RamDisk;\r
+  UINT64                      StartingAddr;\r
+  UINT64                      EndingAddr;\r
 \r
   StartingAddrStr = GetNextParamStr (&TextDeviceNode);\r
   EndingAddrStr   = GetNextParamStr (&TextDeviceNode);\r
   InstanceStr     = GetNextParamStr (&TextDeviceNode);\r
   TypeGuidStr     = GetNextParamStr (&TextDeviceNode);\r
-  RamDisk         = (MEDIA_RAM_DISK_DEVICE_PATH *) CreateDeviceNode (\r
-                                                     MEDIA_DEVICE_PATH,\r
-                                                     MEDIA_RAM_DISK_DP,\r
-                                                     (UINT16) sizeof (MEDIA_RAM_DISK_DEVICE_PATH)\r
-                                                     );\r
+  RamDisk         = (MEDIA_RAM_DISK_DEVICE_PATH *)CreateDeviceNode (\r
+                                                    MEDIA_DEVICE_PATH,\r
+                                                    MEDIA_RAM_DISK_DP,\r
+                                                    (UINT16)sizeof (MEDIA_RAM_DISK_DEVICE_PATH)\r
+                                                    );\r
 \r
   Strtoi64 (StartingAddrStr, &StartingAddr);\r
-  WriteUnaligned64 ((UINT64 *) &(RamDisk->StartingAddr[0]), StartingAddr);\r
+  WriteUnaligned64 ((UINT64 *)&(RamDisk->StartingAddr[0]), StartingAddr);\r
   Strtoi64 (EndingAddrStr, &EndingAddr);\r
-  WriteUnaligned64 ((UINT64 *) &(RamDisk->EndingAddr[0]), EndingAddr);\r
-  RamDisk->Instance = (UINT16) Strtoi (InstanceStr);\r
+  WriteUnaligned64 ((UINT64 *)&(RamDisk->EndingAddr[0]), EndingAddr);\r
+  RamDisk->Instance = (UINT16)Strtoi (InstanceStr);\r
   StrToGuid (TypeGuidStr, &RamDisk->TypeGuid);\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) RamDisk;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)RamDisk;\r
 }\r
 \r
 /**\r
@@ -3193,34 +3210,34 @@ DevPathFromTextRamDisk (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextVirtualDisk (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
-  CHAR16                                  *StartingAddrStr;\r
-  CHAR16                                  *EndingAddrStr;\r
-  CHAR16                                  *InstanceStr;\r
-  MEDIA_RAM_DISK_DEVICE_PATH              *RamDisk;\r
-  UINT64                                  StartingAddr;\r
-  UINT64                                  EndingAddr;\r
+  CHAR16                      *StartingAddrStr;\r
+  CHAR16                      *EndingAddrStr;\r
+  CHAR16                      *InstanceStr;\r
+  MEDIA_RAM_DISK_DEVICE_PATH  *RamDisk;\r
+  UINT64                      StartingAddr;\r
+  UINT64                      EndingAddr;\r
 \r
   StartingAddrStr = GetNextParamStr (&TextDeviceNode);\r
   EndingAddrStr   = GetNextParamStr (&TextDeviceNode);\r
   InstanceStr     = GetNextParamStr (&TextDeviceNode);\r
 \r
-  RamDisk         = (MEDIA_RAM_DISK_DEVICE_PATH *) CreateDeviceNode (\r
-                                                     MEDIA_DEVICE_PATH,\r
-                                                     MEDIA_RAM_DISK_DP,\r
-                                                     (UINT16) sizeof (MEDIA_RAM_DISK_DEVICE_PATH)\r
-                                                     );\r
+  RamDisk = (MEDIA_RAM_DISK_DEVICE_PATH *)CreateDeviceNode (\r
+                                            MEDIA_DEVICE_PATH,\r
+                                            MEDIA_RAM_DISK_DP,\r
+                                            (UINT16)sizeof (MEDIA_RAM_DISK_DEVICE_PATH)\r
+                                            );\r
 \r
   Strtoi64 (StartingAddrStr, &StartingAddr);\r
-  WriteUnaligned64 ((UINT64 *) &(RamDisk->StartingAddr[0]), StartingAddr);\r
+  WriteUnaligned64 ((UINT64 *)&(RamDisk->StartingAddr[0]), StartingAddr);\r
   Strtoi64 (EndingAddrStr, &EndingAddr);\r
-  WriteUnaligned64 ((UINT64 *) &(RamDisk->EndingAddr[0]), EndingAddr);\r
-  RamDisk->Instance = (UINT16) Strtoi (InstanceStr);\r
+  WriteUnaligned64 ((UINT64 *)&(RamDisk->EndingAddr[0]), EndingAddr);\r
+  RamDisk->Instance = (UINT16)Strtoi (InstanceStr);\r
   CopyGuid (&RamDisk->TypeGuid, &gEfiVirtualDiskGuid);\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) RamDisk;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)RamDisk;\r
 }\r
 \r
 /**\r
@@ -3233,34 +3250,34 @@ DevPathFromTextVirtualDisk (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextVirtualCd (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
-  CHAR16                                  *StartingAddrStr;\r
-  CHAR16                                  *EndingAddrStr;\r
-  CHAR16                                  *InstanceStr;\r
-  MEDIA_RAM_DISK_DEVICE_PATH              *RamDisk;\r
-  UINT64                                  StartingAddr;\r
-  UINT64                                  EndingAddr;\r
+  CHAR16                      *StartingAddrStr;\r
+  CHAR16                      *EndingAddrStr;\r
+  CHAR16                      *InstanceStr;\r
+  MEDIA_RAM_DISK_DEVICE_PATH  *RamDisk;\r
+  UINT64                      StartingAddr;\r
+  UINT64                      EndingAddr;\r
 \r
   StartingAddrStr = GetNextParamStr (&TextDeviceNode);\r
   EndingAddrStr   = GetNextParamStr (&TextDeviceNode);\r
   InstanceStr     = GetNextParamStr (&TextDeviceNode);\r
 \r
-  RamDisk         = (MEDIA_RAM_DISK_DEVICE_PATH *) CreateDeviceNode (\r
-                                                     MEDIA_DEVICE_PATH,\r
-                                                     MEDIA_RAM_DISK_DP,\r
-                                                     (UINT16) sizeof (MEDIA_RAM_DISK_DEVICE_PATH)\r
-                                                     );\r
+  RamDisk = (MEDIA_RAM_DISK_DEVICE_PATH *)CreateDeviceNode (\r
+                                            MEDIA_DEVICE_PATH,\r
+                                            MEDIA_RAM_DISK_DP,\r
+                                            (UINT16)sizeof (MEDIA_RAM_DISK_DEVICE_PATH)\r
+                                            );\r
 \r
   Strtoi64 (StartingAddrStr, &StartingAddr);\r
-  WriteUnaligned64 ((UINT64 *) &(RamDisk->StartingAddr[0]), StartingAddr);\r
+  WriteUnaligned64 ((UINT64 *)&(RamDisk->StartingAddr[0]), StartingAddr);\r
   Strtoi64 (EndingAddrStr, &EndingAddr);\r
-  WriteUnaligned64 ((UINT64 *) &(RamDisk->EndingAddr[0]), EndingAddr);\r
-  RamDisk->Instance = (UINT16) Strtoi (InstanceStr);\r
+  WriteUnaligned64 ((UINT64 *)&(RamDisk->EndingAddr[0]), EndingAddr);\r
+  RamDisk->Instance = (UINT16)Strtoi (InstanceStr);\r
   CopyGuid (&RamDisk->TypeGuid, &gEfiVirtualCdGuid);\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) RamDisk;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)RamDisk;\r
 }\r
 \r
 /**\r
@@ -3273,34 +3290,34 @@ DevPathFromTextVirtualCd (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextPersistentVirtualDisk (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
-  CHAR16                                  *StartingAddrStr;\r
-  CHAR16                                  *EndingAddrStr;\r
-  CHAR16                                  *InstanceStr;\r
-  MEDIA_RAM_DISK_DEVICE_PATH              *RamDisk;\r
-  UINT64                                  StartingAddr;\r
-  UINT64                                  EndingAddr;\r
+  CHAR16                      *StartingAddrStr;\r
+  CHAR16                      *EndingAddrStr;\r
+  CHAR16                      *InstanceStr;\r
+  MEDIA_RAM_DISK_DEVICE_PATH  *RamDisk;\r
+  UINT64                      StartingAddr;\r
+  UINT64                      EndingAddr;\r
 \r
   StartingAddrStr = GetNextParamStr (&TextDeviceNode);\r
   EndingAddrStr   = GetNextParamStr (&TextDeviceNode);\r
   InstanceStr     = GetNextParamStr (&TextDeviceNode);\r
 \r
-  RamDisk         = (MEDIA_RAM_DISK_DEVICE_PATH *) CreateDeviceNode (\r
-                                                     MEDIA_DEVICE_PATH,\r
-                                                     MEDIA_RAM_DISK_DP,\r
-                                                     (UINT16) sizeof (MEDIA_RAM_DISK_DEVICE_PATH)\r
-                                                     );\r
+  RamDisk = (MEDIA_RAM_DISK_DEVICE_PATH *)CreateDeviceNode (\r
+                                            MEDIA_DEVICE_PATH,\r
+                                            MEDIA_RAM_DISK_DP,\r
+                                            (UINT16)sizeof (MEDIA_RAM_DISK_DEVICE_PATH)\r
+                                            );\r
 \r
   Strtoi64 (StartingAddrStr, &StartingAddr);\r
-  WriteUnaligned64 ((UINT64 *) &(RamDisk->StartingAddr[0]), StartingAddr);\r
+  WriteUnaligned64 ((UINT64 *)&(RamDisk->StartingAddr[0]), StartingAddr);\r
   Strtoi64 (EndingAddrStr, &EndingAddr);\r
-  WriteUnaligned64 ((UINT64 *) &(RamDisk->EndingAddr[0]), EndingAddr);\r
-  RamDisk->Instance = (UINT16) Strtoi (InstanceStr);\r
+  WriteUnaligned64 ((UINT64 *)&(RamDisk->EndingAddr[0]), EndingAddr);\r
+  RamDisk->Instance = (UINT16)Strtoi (InstanceStr);\r
   CopyGuid (&RamDisk->TypeGuid, &gEfiPersistentVirtualDiskGuid);\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) RamDisk;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)RamDisk;\r
 }\r
 \r
 /**\r
@@ -3313,34 +3330,34 @@ DevPathFromTextPersistentVirtualDisk (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextPersistentVirtualCd (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
-  CHAR16                                  *StartingAddrStr;\r
-  CHAR16                                  *EndingAddrStr;\r
-  CHAR16                                  *InstanceStr;\r
-  MEDIA_RAM_DISK_DEVICE_PATH              *RamDisk;\r
-  UINT64                                  StartingAddr;\r
-  UINT64                                  EndingAddr;\r
+  CHAR16                      *StartingAddrStr;\r
+  CHAR16                      *EndingAddrStr;\r
+  CHAR16                      *InstanceStr;\r
+  MEDIA_RAM_DISK_DEVICE_PATH  *RamDisk;\r
+  UINT64                      StartingAddr;\r
+  UINT64                      EndingAddr;\r
 \r
   StartingAddrStr = GetNextParamStr (&TextDeviceNode);\r
   EndingAddrStr   = GetNextParamStr (&TextDeviceNode);\r
   InstanceStr     = GetNextParamStr (&TextDeviceNode);\r
 \r
-  RamDisk         = (MEDIA_RAM_DISK_DEVICE_PATH *) CreateDeviceNode (\r
-                                                     MEDIA_DEVICE_PATH,\r
-                                                     MEDIA_RAM_DISK_DP,\r
-                                                     (UINT16) sizeof (MEDIA_RAM_DISK_DEVICE_PATH)\r
-                                                     );\r
+  RamDisk = (MEDIA_RAM_DISK_DEVICE_PATH *)CreateDeviceNode (\r
+                                            MEDIA_DEVICE_PATH,\r
+                                            MEDIA_RAM_DISK_DP,\r
+                                            (UINT16)sizeof (MEDIA_RAM_DISK_DEVICE_PATH)\r
+                                            );\r
 \r
   Strtoi64 (StartingAddrStr, &StartingAddr);\r
-  WriteUnaligned64 ((UINT64 *) &(RamDisk->StartingAddr[0]), StartingAddr);\r
+  WriteUnaligned64 ((UINT64 *)&(RamDisk->StartingAddr[0]), StartingAddr);\r
   Strtoi64 (EndingAddrStr, &EndingAddr);\r
-  WriteUnaligned64 ((UINT64 *) &(RamDisk->EndingAddr[0]), EndingAddr);\r
-  RamDisk->Instance = (UINT16) Strtoi (InstanceStr);\r
+  WriteUnaligned64 ((UINT64 *)&(RamDisk->EndingAddr[0]), EndingAddr);\r
+  RamDisk->Instance = (UINT16)Strtoi (InstanceStr);\r
   CopyGuid (&RamDisk->TypeGuid, &gEfiPersistentVirtualCdGuid);\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) RamDisk;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)RamDisk;\r
 }\r
 \r
 /**\r
@@ -3353,7 +3370,7 @@ DevPathFromTextPersistentVirtualCd (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextBbsPath (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
   return DevPathFromTextGenericPath (BBS_DEVICE_PATH, TextDeviceNode);\r
@@ -3369,23 +3386,23 @@ DevPathFromTextBbsPath (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextBBS (\r
-  IN CHAR16 *TextDeviceNode\r
-  )\r
-{\r
-  CHAR16              *TypeStr;\r
-  CHAR16              *IdStr;\r
-  CHAR16              *FlagsStr;\r
-  CHAR8               *AsciiStr;\r
-  BBS_BBS_DEVICE_PATH *Bbs;\r
-\r
-  TypeStr   = GetNextParamStr (&TextDeviceNode);\r
-  IdStr     = GetNextParamStr (&TextDeviceNode);\r
-  FlagsStr  = GetNextParamStr (&TextDeviceNode);\r
-  Bbs       = (BBS_BBS_DEVICE_PATH *) CreateDeviceNode (\r
-                                        BBS_DEVICE_PATH,\r
-                                        BBS_BBS_DP,\r
-                                        (UINT16) (sizeof (BBS_BBS_DEVICE_PATH) + StrLen (IdStr))\r
-                                        );\r
+  IN CHAR16  *TextDeviceNode\r
+  )\r
+{\r
+  CHAR16               *TypeStr;\r
+  CHAR16               *IdStr;\r
+  CHAR16               *FlagsStr;\r
+  CHAR8                *AsciiStr;\r
+  BBS_BBS_DEVICE_PATH  *Bbs;\r
+\r
+  TypeStr  = GetNextParamStr (&TextDeviceNode);\r
+  IdStr    = GetNextParamStr (&TextDeviceNode);\r
+  FlagsStr = GetNextParamStr (&TextDeviceNode);\r
+  Bbs      = (BBS_BBS_DEVICE_PATH *)CreateDeviceNode (\r
+                                      BBS_DEVICE_PATH,\r
+                                      BBS_BBS_DP,\r
+                                      (UINT16)(sizeof (BBS_BBS_DEVICE_PATH) + StrLen (IdStr))\r
+                                      );\r
 \r
   if (StrCmp (TypeStr, L"Floppy") == 0) {\r
     Bbs->DeviceType = BBS_TYPE_FLOPPY;\r
@@ -3400,15 +3417,15 @@ DevPathFromTextBBS (
   } else if (StrCmp (TypeStr, L"Network") == 0) {\r
     Bbs->DeviceType = BBS_TYPE_EMBEDDED_NETWORK;\r
   } else {\r
-    Bbs->DeviceType = (UINT16) Strtoi (TypeStr);\r
+    Bbs->DeviceType = (UINT16)Strtoi (TypeStr);\r
   }\r
 \r
   AsciiStr = Bbs->String;\r
   StrToAscii (IdStr, &AsciiStr);\r
 \r
-  Bbs->StatusFlag = (UINT16) Strtoi (FlagsStr);\r
+  Bbs->StatusFlag = (UINT16)Strtoi (FlagsStr);\r
 \r
-  return (EFI_DEVICE_PATH_PROTOCOL *) Bbs;\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)Bbs;\r
 }\r
 \r
 /**\r
@@ -3421,24 +3438,24 @@ DevPathFromTextBBS (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 DevPathFromTextSata (\r
-  IN CHAR16 *TextDeviceNode\r
+  IN CHAR16  *TextDeviceNode\r
   )\r
 {\r
-  SATA_DEVICE_PATH *Sata;\r
-  CHAR16           *Param1;\r
-  CHAR16           *Param2;\r
-  CHAR16           *Param3;\r
+  SATA_DEVICE_PATH  *Sata;\r
+  CHAR16            *Param1;\r
+  CHAR16            *Param2;\r
+  CHAR16            *Param3;\r
 \r
   Param1 = GetNextParamStr (&TextDeviceNode);\r
   Param2 = GetNextParamStr (&TextDeviceNode);\r
   Param3 = GetNextParamStr (&TextDeviceNode);\r
 \r
-  Sata = (SATA_DEVICE_PATH *) CreateDeviceNode (\r
-                                MESSAGING_DEVICE_PATH,\r
-                                MSG_SATA_DP,\r
-                                (UINT16) sizeof (SATA_DEVICE_PATH)\r
-                                );\r
-  Sata->HBAPortNumber            = (UINT16) Strtoi (Param1);\r
+  Sata = (SATA_DEVICE_PATH *)CreateDeviceNode (\r
+                               MESSAGING_DEVICE_PATH,\r
+                               MSG_SATA_DP,\r
+                               (UINT16)sizeof (SATA_DEVICE_PATH)\r
+                               );\r
+  Sata->HBAPortNumber = (UINT16)Strtoi (Param1);\r
 \r
   //\r
   // According to UEFI spec, if PMPN is not provided, the default is 0xFFFF\r
@@ -3446,105 +3463,106 @@ DevPathFromTextSata (
   if (*Param2 == L'\0' ) {\r
     Sata->PortMultiplierPortNumber = 0xFFFF;\r
   } else {\r
-    Sata->PortMultiplierPortNumber = (UINT16) Strtoi (Param2);\r
-  }\r
-  Sata->Lun                      = (UINT16) Strtoi (Param3);\r
-\r
-  return (EFI_DEVICE_PATH_PROTOCOL *) Sata;\r
-}\r
-\r
-GLOBAL_REMOVE_IF_UNREFERENCED DEVICE_PATH_FROM_TEXT_TABLE mUefiDevicePathLibDevPathFromTextTable[] = {\r
-  {L"Path",                    DevPathFromTextPath                    },\r
-\r
-  {L"HardwarePath",            DevPathFromTextHardwarePath            },\r
-  {L"Pci",                     DevPathFromTextPci                     },\r
-  {L"PcCard",                  DevPathFromTextPcCard                  },\r
-  {L"MemoryMapped",            DevPathFromTextMemoryMapped            },\r
-  {L"VenHw",                   DevPathFromTextVenHw                   },\r
-  {L"Ctrl",                    DevPathFromTextCtrl                    },\r
-  {L"BMC",                     DevPathFromTextBmc                     },\r
-\r
-  {L"AcpiPath",                DevPathFromTextAcpiPath                },\r
-  {L"Acpi",                    DevPathFromTextAcpi                    },\r
-  {L"PciRoot",                 DevPathFromTextPciRoot                 },\r
-  {L"PcieRoot",                DevPathFromTextPcieRoot                },\r
-  {L"Floppy",                  DevPathFromTextFloppy                  },\r
-  {L"Keyboard",                DevPathFromTextKeyboard                },\r
-  {L"Serial",                  DevPathFromTextSerial                  },\r
-  {L"ParallelPort",            DevPathFromTextParallelPort            },\r
-  {L"AcpiEx",                  DevPathFromTextAcpiEx                  },\r
-  {L"AcpiExp",                 DevPathFromTextAcpiExp                 },\r
-  {L"AcpiAdr",                 DevPathFromTextAcpiAdr                 },\r
-\r
-  {L"Msg",                     DevPathFromTextMsg                     },\r
-  {L"Ata",                     DevPathFromTextAta                     },\r
-  {L"Scsi",                    DevPathFromTextScsi                    },\r
-  {L"Fibre",                   DevPathFromTextFibre                   },\r
-  {L"FibreEx",                 DevPathFromTextFibreEx                 },\r
-  {L"I1394",                   DevPathFromText1394                    },\r
-  {L"USB",                     DevPathFromTextUsb                     },\r
-  {L"I2O",                     DevPathFromTextI2O                     },\r
-  {L"Infiniband",              DevPathFromTextInfiniband              },\r
-  {L"VenMsg",                  DevPathFromTextVenMsg                  },\r
-  {L"VenPcAnsi",               DevPathFromTextVenPcAnsi               },\r
-  {L"VenVt100",                DevPathFromTextVenVt100                },\r
-  {L"VenVt100Plus",            DevPathFromTextVenVt100Plus            },\r
-  {L"VenUtf8",                 DevPathFromTextVenUtf8                 },\r
-  {L"UartFlowCtrl",            DevPathFromTextUartFlowCtrl            },\r
-  {L"SAS",                     DevPathFromTextSAS                     },\r
-  {L"SasEx",                   DevPathFromTextSasEx                   },\r
-  {L"NVMe",                    DevPathFromTextNVMe                    },\r
-  {L"UFS",                     DevPathFromTextUfs                     },\r
-  {L"SD",                      DevPathFromTextSd                      },\r
-  {L"eMMC",                    DevPathFromTextEmmc                    },\r
-  {L"DebugPort",               DevPathFromTextDebugPort               },\r
-  {L"MAC",                     DevPathFromTextMAC                     },\r
-  {L"IPv4",                    DevPathFromTextIPv4                    },\r
-  {L"IPv6",                    DevPathFromTextIPv6                    },\r
-  {L"Uart",                    DevPathFromTextUart                    },\r
-  {L"UsbClass",                DevPathFromTextUsbClass                },\r
-  {L"UsbAudio",                DevPathFromTextUsbAudio                },\r
-  {L"UsbCDCControl",           DevPathFromTextUsbCDCControl           },\r
-  {L"UsbHID",                  DevPathFromTextUsbHID                  },\r
-  {L"UsbImage",                DevPathFromTextUsbImage                },\r
-  {L"UsbPrinter",              DevPathFromTextUsbPrinter              },\r
-  {L"UsbMassStorage",          DevPathFromTextUsbMassStorage          },\r
-  {L"UsbHub",                  DevPathFromTextUsbHub                  },\r
-  {L"UsbCDCData",              DevPathFromTextUsbCDCData              },\r
-  {L"UsbSmartCard",            DevPathFromTextUsbSmartCard            },\r
-  {L"UsbVideo",                DevPathFromTextUsbVideo                },\r
-  {L"UsbDiagnostic",           DevPathFromTextUsbDiagnostic           },\r
-  {L"UsbWireless",             DevPathFromTextUsbWireless             },\r
-  {L"UsbDeviceFirmwareUpdate", DevPathFromTextUsbDeviceFirmwareUpdate },\r
-  {L"UsbIrdaBridge",           DevPathFromTextUsbIrdaBridge           },\r
-  {L"UsbTestAndMeasurement",   DevPathFromTextUsbTestAndMeasurement   },\r
-  {L"UsbWwid",                 DevPathFromTextUsbWwid                 },\r
-  {L"Unit",                    DevPathFromTextUnit                    },\r
-  {L"iSCSI",                   DevPathFromTextiSCSI                   },\r
-  {L"Vlan",                    DevPathFromTextVlan                    },\r
-  {L"Dns",                     DevPathFromTextDns                     },\r
-  {L"Uri",                     DevPathFromTextUri                     },\r
-  {L"Bluetooth",               DevPathFromTextBluetooth               },\r
-  {L"Wi-Fi",                   DevPathFromTextWiFi                    },\r
-  {L"BluetoothLE",             DevPathFromTextBluetoothLE             },\r
-  {L"MediaPath",               DevPathFromTextMediaPath               },\r
-  {L"HD",                      DevPathFromTextHD                      },\r
-  {L"CDROM",                   DevPathFromTextCDROM                   },\r
-  {L"VenMedia",                DevPathFromTextVenMedia                },\r
-  {L"Media",                   DevPathFromTextMedia                   },\r
-  {L"Fv",                      DevPathFromTextFv                      },\r
-  {L"FvFile",                  DevPathFromTextFvFile                  },\r
-  {L"Offset",                  DevPathFromTextRelativeOffsetRange     },\r
-  {L"RamDisk",                 DevPathFromTextRamDisk                 },\r
-  {L"VirtualDisk",             DevPathFromTextVirtualDisk             },\r
-  {L"VirtualCD",               DevPathFromTextVirtualCd               },\r
-  {L"PersistentVirtualDisk",   DevPathFromTextPersistentVirtualDisk   },\r
-  {L"PersistentVirtualCD",     DevPathFromTextPersistentVirtualCd     },\r
-\r
-  {L"BbsPath",                 DevPathFromTextBbsPath                 },\r
-  {L"BBS",                     DevPathFromTextBBS                     },\r
-  {L"Sata",                    DevPathFromTextSata                    },\r
-  {NULL, NULL}\r
+    Sata->PortMultiplierPortNumber = (UINT16)Strtoi (Param2);\r
+  }\r
+\r
+  Sata->Lun = (UINT16)Strtoi (Param3);\r
+\r
+  return (EFI_DEVICE_PATH_PROTOCOL *)Sata;\r
+}\r
+\r
+GLOBAL_REMOVE_IF_UNREFERENCED DEVICE_PATH_FROM_TEXT_TABLE  mUefiDevicePathLibDevPathFromTextTable[] = {\r
+  { L"Path",                    DevPathFromTextPath                    },\r
+\r
+  { L"HardwarePath",            DevPathFromTextHardwarePath            },\r
+  { L"Pci",                     DevPathFromTextPci                     },\r
+  { L"PcCard",                  DevPathFromTextPcCard                  },\r
+  { L"MemoryMapped",            DevPathFromTextMemoryMapped            },\r
+  { L"VenHw",                   DevPathFromTextVenHw                   },\r
+  { L"Ctrl",                    DevPathFromTextCtrl                    },\r
+  { L"BMC",                     DevPathFromTextBmc                     },\r
+\r
+  { L"AcpiPath",                DevPathFromTextAcpiPath                },\r
+  { L"Acpi",                    DevPathFromTextAcpi                    },\r
+  { L"PciRoot",                 DevPathFromTextPciRoot                 },\r
+  { L"PcieRoot",                DevPathFromTextPcieRoot                },\r
+  { L"Floppy",                  DevPathFromTextFloppy                  },\r
+  { L"Keyboard",                DevPathFromTextKeyboard                },\r
+  { L"Serial",                  DevPathFromTextSerial                  },\r
+  { L"ParallelPort",            DevPathFromTextParallelPort            },\r
+  { L"AcpiEx",                  DevPathFromTextAcpiEx                  },\r
+  { L"AcpiExp",                 DevPathFromTextAcpiExp                 },\r
+  { L"AcpiAdr",                 DevPathFromTextAcpiAdr                 },\r
+\r
+  { L"Msg",                     DevPathFromTextMsg                     },\r
+  { L"Ata",                     DevPathFromTextAta                     },\r
+  { L"Scsi",                    DevPathFromTextScsi                    },\r
+  { L"Fibre",                   DevPathFromTextFibre                   },\r
+  { L"FibreEx",                 DevPathFromTextFibreEx                 },\r
+  { L"I1394",                   DevPathFromText1394                    },\r
+  { L"USB",                     DevPathFromTextUsb                     },\r
+  { L"I2O",                     DevPathFromTextI2O                     },\r
+  { L"Infiniband",              DevPathFromTextInfiniband              },\r
+  { L"VenMsg",                  DevPathFromTextVenMsg                  },\r
+  { L"VenPcAnsi",               DevPathFromTextVenPcAnsi               },\r
+  { L"VenVt100",                DevPathFromTextVenVt100                },\r
+  { L"VenVt100Plus",            DevPathFromTextVenVt100Plus            },\r
+  { L"VenUtf8",                 DevPathFromTextVenUtf8                 },\r
+  { L"UartFlowCtrl",            DevPathFromTextUartFlowCtrl            },\r
+  { L"SAS",                     DevPathFromTextSAS                     },\r
+  { L"SasEx",                   DevPathFromTextSasEx                   },\r
+  { L"NVMe",                    DevPathFromTextNVMe                    },\r
+  { L"UFS",                     DevPathFromTextUfs                     },\r
+  { L"SD",                      DevPathFromTextSd                      },\r
+  { L"eMMC",                    DevPathFromTextEmmc                    },\r
+  { L"DebugPort",               DevPathFromTextDebugPort               },\r
+  { L"MAC",                     DevPathFromTextMAC                     },\r
+  { L"IPv4",                    DevPathFromTextIPv4                    },\r
+  { L"IPv6",                    DevPathFromTextIPv6                    },\r
+  { L"Uart",                    DevPathFromTextUart                    },\r
+  { L"UsbClass",                DevPathFromTextUsbClass                },\r
+  { L"UsbAudio",                DevPathFromTextUsbAudio                },\r
+  { L"UsbCDCControl",           DevPathFromTextUsbCDCControl           },\r
+  { L"UsbHID",                  DevPathFromTextUsbHID                  },\r
+  { L"UsbImage",                DevPathFromTextUsbImage                },\r
+  { L"UsbPrinter",              DevPathFromTextUsbPrinter              },\r
+  { L"UsbMassStorage",          DevPathFromTextUsbMassStorage          },\r
+  { L"UsbHub",                  DevPathFromTextUsbHub                  },\r
+  { L"UsbCDCData",              DevPathFromTextUsbCDCData              },\r
+  { L"UsbSmartCard",            DevPathFromTextUsbSmartCard            },\r
+  { L"UsbVideo",                DevPathFromTextUsbVideo                },\r
+  { L"UsbDiagnostic",           DevPathFromTextUsbDiagnostic           },\r
+  { L"UsbWireless",             DevPathFromTextUsbWireless             },\r
+  { L"UsbDeviceFirmwareUpdate", DevPathFromTextUsbDeviceFirmwareUpdate },\r
+  { L"UsbIrdaBridge",           DevPathFromTextUsbIrdaBridge           },\r
+  { L"UsbTestAndMeasurement",   DevPathFromTextUsbTestAndMeasurement   },\r
+  { L"UsbWwid",                 DevPathFromTextUsbWwid                 },\r
+  { L"Unit",                    DevPathFromTextUnit                    },\r
+  { L"iSCSI",                   DevPathFromTextiSCSI                   },\r
+  { L"Vlan",                    DevPathFromTextVlan                    },\r
+  { L"Dns",                     DevPathFromTextDns                     },\r
+  { L"Uri",                     DevPathFromTextUri                     },\r
+  { L"Bluetooth",               DevPathFromTextBluetooth               },\r
+  { L"Wi-Fi",                   DevPathFromTextWiFi                    },\r
+  { L"BluetoothLE",             DevPathFromTextBluetoothLE             },\r
+  { L"MediaPath",               DevPathFromTextMediaPath               },\r
+  { L"HD",                      DevPathFromTextHD                      },\r
+  { L"CDROM",                   DevPathFromTextCDROM                   },\r
+  { L"VenMedia",                DevPathFromTextVenMedia                },\r
+  { L"Media",                   DevPathFromTextMedia                   },\r
+  { L"Fv",                      DevPathFromTextFv                      },\r
+  { L"FvFile",                  DevPathFromTextFvFile                  },\r
+  { L"Offset",                  DevPathFromTextRelativeOffsetRange     },\r
+  { L"RamDisk",                 DevPathFromTextRamDisk                 },\r
+  { L"VirtualDisk",             DevPathFromTextVirtualDisk             },\r
+  { L"VirtualCD",               DevPathFromTextVirtualCd               },\r
+  { L"PersistentVirtualDisk",   DevPathFromTextPersistentVirtualDisk   },\r
+  { L"PersistentVirtualCD",     DevPathFromTextPersistentVirtualCd     },\r
+\r
+  { L"BbsPath",                 DevPathFromTextBbsPath                 },\r
+  { L"BBS",                     DevPathFromTextBBS                     },\r
+  { L"Sata",                    DevPathFromTextSata                    },\r
+  { NULL,                       NULL                                   }\r
 };\r
 \r
 /**\r
@@ -3561,14 +3579,14 @@ GLOBAL_REMOVE_IF_UNREFERENCED DEVICE_PATH_FROM_TEXT_TABLE mUefiDevicePathLibDevP
 EFI_DEVICE_PATH_PROTOCOL *\r
 EFIAPI\r
 UefiDevicePathLibConvertTextToDeviceNode (\r
-  IN CONST CHAR16 *TextDeviceNode\r
+  IN CONST CHAR16  *TextDeviceNode\r
   )\r
 {\r
-  DEVICE_PATH_FROM_TEXT    FromText;\r
-  CHAR16                   *ParamStr;\r
-  EFI_DEVICE_PATH_PROTOCOL *DeviceNode;\r
-  CHAR16                   *DeviceNodeStr;\r
-  UINTN                    Index;\r
+  DEVICE_PATH_FROM_TEXT     FromText;\r
+  CHAR16                    *ParamStr;\r
+  EFI_DEVICE_PATH_PROTOCOL  *DeviceNode;\r
+  CHAR16                    *DeviceNodeStr;\r
+  UINTN                     Index;\r
 \r
   if ((TextDeviceNode == NULL) || (IS_NULL (*TextDeviceNode))) {\r
     return NULL;\r
@@ -3591,7 +3609,7 @@ UefiDevicePathLibConvertTextToDeviceNode (
     //\r
     // A file path\r
     //\r
-    FromText = DevPathFromTextFilePath;\r
+    FromText   = DevPathFromTextFilePath;\r
     DeviceNode = FromText (DeviceNodeStr);\r
   } else {\r
     DeviceNode = FromText (ParamStr);\r
@@ -3618,28 +3636,28 @@ UefiDevicePathLibConvertTextToDeviceNode (
 EFI_DEVICE_PATH_PROTOCOL *\r
 EFIAPI\r
 UefiDevicePathLibConvertTextToDevicePath (\r
-  IN CONST CHAR16 *TextDevicePath\r
+  IN CONST CHAR16  *TextDevicePath\r
   )\r
 {\r
-  EFI_DEVICE_PATH_PROTOCOL *DeviceNode;\r
-  EFI_DEVICE_PATH_PROTOCOL *NewDevicePath;\r
-  CHAR16                   *DevicePathStr;\r
-  CHAR16                   *Str;\r
-  CHAR16                   *DeviceNodeStr;\r
-  BOOLEAN                  IsInstanceEnd;\r
-  EFI_DEVICE_PATH_PROTOCOL *DevicePath;\r
+  EFI_DEVICE_PATH_PROTOCOL  *DeviceNode;\r
+  EFI_DEVICE_PATH_PROTOCOL  *NewDevicePath;\r
+  CHAR16                    *DevicePathStr;\r
+  CHAR16                    *Str;\r
+  CHAR16                    *DeviceNodeStr;\r
+  BOOLEAN                   IsInstanceEnd;\r
+  EFI_DEVICE_PATH_PROTOCOL  *DevicePath;\r
 \r
   if ((TextDevicePath == NULL) || (IS_NULL (*TextDevicePath))) {\r
     return NULL;\r
   }\r
 \r
-  DevicePath = (EFI_DEVICE_PATH_PROTOCOL *) AllocatePool (END_DEVICE_PATH_LENGTH);\r
+  DevicePath = (EFI_DEVICE_PATH_PROTOCOL *)AllocatePool (END_DEVICE_PATH_LENGTH);\r
   ASSERT (DevicePath != NULL);\r
   SetDevicePathEndNode (DevicePath);\r
 \r
   DevicePathStr = UefiDevicePathLibStrDuplicate (TextDevicePath);\r
 \r
-  Str           = DevicePathStr;\r
+  Str = DevicePathStr;\r
   while ((DeviceNodeStr = GetNextDeviceNodeStr (&Str, &IsInstanceEnd)) != NULL) {\r
     DeviceNode = UefiDevicePathLibConvertTextToDeviceNode (DeviceNodeStr);\r
 \r
@@ -3649,7 +3667,7 @@ UefiDevicePathLibConvertTextToDevicePath (
     DevicePath = NewDevicePath;\r
 \r
     if (IsInstanceEnd) {\r
-      DeviceNode = (EFI_DEVICE_PATH_PROTOCOL *) AllocatePool (END_DEVICE_PATH_LENGTH);\r
+      DeviceNode = (EFI_DEVICE_PATH_PROTOCOL *)AllocatePool (END_DEVICE_PATH_LENGTH);\r
       ASSERT (DeviceNode != NULL);\r
       SetDevicePathEndNode (DeviceNode);\r
       DeviceNode->SubType = END_INSTANCE_DEVICE_PATH_SUBTYPE;\r