NetworkPkg: Apply uncrustify changes

[mirror_edk2.git] / NetworkPkg / IScsiDxe / IScsiMisc.h

diff --git a/NetworkPkg/IScsiDxe/IScsiMisc.h b/NetworkPkg/IScsiDxe/IScsiMisc.h
index fddef4f466dc6dd1a1751cc71403f21a84633726..a951eee70ec96c6d52447f32255365650ea61488 100644 (file)
--- a/NetworkPkg/IScsiDxe/IScsiMisc.h
+++ b/NetworkPkg/IScsiDxe/IScsiMisc.h
@@ -14,49 +14,47 @@ typedef struct _ISCSI_DRIVER_DATA ISCSI_DRIVER_DATA;
 ///\r
 /// IPv4 Device Path Node Length\r
 ///\r
-#define IP4_NODE_LEN_NEW_VERSIONS    27\r
+#define IP4_NODE_LEN_NEW_VERSIONS  27\r
 \r
 ///\r
 /// IPv6 Device Path Node Length\r
 ///\r
-#define IP6_NODE_LEN_OLD_VERSIONS    43\r
-#define IP6_NODE_LEN_NEW_VERSIONS    60\r
+#define IP6_NODE_LEN_OLD_VERSIONS  43\r
+#define IP6_NODE_LEN_NEW_VERSIONS  60\r
 \r
 ///\r
 /// The ignored field StaticIpAddress's offset in old IPv6 Device Path\r
 ///\r
-#define IP6_OLD_IPADDRESS_OFFSET      42\r
-\r
+#define IP6_OLD_IPADDRESS_OFFSET  42\r
 \r
 #pragma pack(1)\r
 typedef struct _ISCSI_SESSION_CONFIG_NVDATA {\r
-  UINT16            TargetPort;\r
-  UINT8             Enabled;\r
-  UINT8             IpMode;\r
-\r
-  EFI_IP_ADDRESS    LocalIp;\r
-  EFI_IPv4_ADDRESS  SubnetMask;\r
-  EFI_IP_ADDRESS    Gateway;\r
+  UINT16              TargetPort;\r
+  UINT8               Enabled;\r
+  UINT8               IpMode;\r
 \r
-  BOOLEAN           InitiatorInfoFromDhcp;\r
-  BOOLEAN           TargetInfoFromDhcp;\r
+  EFI_IP_ADDRESS      LocalIp;\r
+  EFI_IPv4_ADDRESS    SubnetMask;\r
+  EFI_IP_ADDRESS      Gateway;\r
 \r
-  CHAR8             TargetName[ISCSI_NAME_MAX_SIZE];\r
-  EFI_IP_ADDRESS    TargetIp;\r
-  UINT8             PrefixLength;\r
-  UINT8             BootLun[8];\r
+  BOOLEAN             InitiatorInfoFromDhcp;\r
+  BOOLEAN             TargetInfoFromDhcp;\r
 \r
-  UINT16            ConnectTimeout; ///< timeout value in milliseconds.\r
-  UINT8             ConnectRetryCount;\r
-  UINT8             IsId[6];\r
+  CHAR8               TargetName[ISCSI_NAME_MAX_SIZE];\r
+  EFI_IP_ADDRESS      TargetIp;\r
+  UINT8               PrefixLength;\r
+  UINT8               BootLun[8];\r
 \r
-  BOOLEAN           RedirectFlag;\r
-  UINT16            OriginalTargetPort;     // The port of proxy/virtual target.\r
-  EFI_IP_ADDRESS    OriginalTargetIp;       // The address of proxy/virtual target.\r
+  UINT16              ConnectTimeout; ///< timeout value in milliseconds.\r
+  UINT8               ConnectRetryCount;\r
+  UINT8               IsId[6];\r
 \r
-  BOOLEAN           DnsMode;  // Flag indicate whether the Target address is expressed as URL format.\r
-  CHAR8             TargetUrl[ISCSI_TARGET_URI_MAX_SIZE];\r
+  BOOLEAN             RedirectFlag;\r
+  UINT16              OriginalTargetPort;   // The port of proxy/virtual target.\r
+  EFI_IP_ADDRESS      OriginalTargetIp;     // The address of proxy/virtual target.\r
 \r
+  BOOLEAN             DnsMode; // Flag indicate whether the Target address is expressed as URL format.\r
+  CHAR8               TargetUrl[ISCSI_TARGET_URI_MAX_SIZE];\r
 } ISCSI_SESSION_CONFIG_NVDATA;\r
 #pragma pack()\r
 \r
@@ -134,9 +132,9 @@ IScsiMacAddrToStr (
 **/\r
 EFI_STATUS\r
 IScsiAsciiStrToIp (\r
-  IN  CHAR8             *Str,\r
-  IN  UINT8             IpMode,\r
-  OUT EFI_IP_ADDRESS    *Ip\r
+  IN  CHAR8           *Str,\r
+  IN  UINT8           IpMode,\r
+  OUT EFI_IP_ADDRESS  *Ip\r
   );\r
 \r
 /**\r
@@ -156,10 +154,10 @@ IScsiAsciiStrToIp (
 **/\r
 EFI_STATUS\r
 IScsiBinToHex (\r
-  IN     UINT8  *BinBuffer,\r
-  IN     UINT32 BinLength,\r
-  IN OUT CHAR8  *HexStr,\r
-  IN OUT UINT32 *HexLength\r
+  IN     UINT8   *BinBuffer,\r
+  IN     UINT32  BinLength,\r
+  IN OUT CHAR8   *HexStr,\r
+  IN OUT UINT32  *HexLength\r
   );\r
 \r
 /**\r
@@ -180,12 +178,11 @@ IScsiBinToHex (
 **/\r
 EFI_STATUS\r
 IScsiHexToBin (\r
-  IN OUT UINT8  *BinBuffer,\r
-  IN OUT UINT32 *BinLength,\r
-  IN     CHAR8  *HexStr\r
+  IN OUT UINT8   *BinBuffer,\r
+  IN OUT UINT32  *BinLength,\r
+  IN     CHAR8   *HexStr\r
   );\r
 \r
-\r
 /**\r
   Convert the decimal-constant string or hex-constant string into a numerical value.\r
 \r
@@ -255,7 +252,7 @@ IScsiRemoveNic (
 **/\r
 EFI_STATUS\r
 IScsiCreateAttempts (\r
-  IN UINTN            AttemptNum\r
+  IN UINTN  AttemptNum\r
   );\r
 \r
 /**\r
@@ -269,7 +266,7 @@ IScsiCreateAttempts (
 **/\r
 EFI_STATUS\r
 IScsiCreateKeywords (\r
-  IN UINTN            KeywordNum\r
+  IN UINTN  KeywordNum\r
   );\r
 \r
 /**\r
@@ -292,10 +289,9 @@ IScsiCleanAttemptVariable (
 **/\r
 ISCSI_NIC_INFO *\r
 IScsiGetNicInfoByIndex (\r
-  IN UINT8      NicIndex\r
+  IN UINT8  NicIndex\r
   );\r
 \r
-\r
 /**\r
   Get the NIC's PCI location and return it according to the composited\r
   format defined in iSCSI Boot Firmware Table.\r
@@ -331,9 +327,9 @@ IScsiGetNICPciLocation (
 **/\r
 VOID *\r
 IScsiGetVariableAndSize (\r
-  IN  CHAR16              *Name,\r
-  IN  EFI_GUID            *VendorGuid,\r
-  OUT UINTN               *VariableSize\r
+  IN  CHAR16    *Name,\r
+  IN  EFI_GUID  *VendorGuid,\r
+  OUT UINTN     *VariableSize\r
   );\r
 \r
 /**\r
@@ -422,7 +418,7 @@ IScsiGetConfigData (
 **/\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 IScsiGetTcpConnDevicePath (\r
-  IN ISCSI_SESSION      *Session\r
+  IN ISCSI_SESSION  *Session\r
   );\r
 \r
 /**\r
@@ -465,8 +461,9 @@ IScsiOnExitBootService (
 EFI_STATUS\r
 EFIAPI\r
 IScsiTestManagedDevice (\r
-  IN  EFI_HANDLE       ControllerHandle,\r
-  IN  EFI_HANDLE       DriverBindingHandle,\r
-  IN  EFI_GUID         *ProtocolGuid\r
+  IN  EFI_HANDLE  ControllerHandle,\r
+  IN  EFI_HANDLE  DriverBindingHandle,\r
+  IN  EFI_GUID    *ProtocolGuid\r
   );\r
+\r
 #endif\r