UEFI HII: Merge UEFI HII support changes from branch.

[mirror_edk2.git] / MdeModulePkg / Universal / iScsi / IScsiProto.h

diff --git a/MdeModulePkg/Universal/iScsi/IScsiProto.h b/MdeModulePkg/Universal/iScsi/IScsiProto.h
index d47a5b56799e3446cdc414716cf581d3fef0c6a1..59608fcec7fe2b1a23aa5daa81fef75ad95acb35 100644 (file)
--- a/MdeModulePkg/Universal/iScsi/IScsiProto.h
+++ b/MdeModulePkg/Universal/iScsi/IScsiProto.h
@@ -119,8 +119,8 @@ typedef enum {
 #define ISCSI_IMMEDIATE_ON(PduHdr)          ((PduHdr)->OpCode & ISCSI_REQ_IMMEDIATE)\r
 #define ISCSI_SET_FLAG(PduHdr, Flag)        (((ISCSI_BASIC_HEADER *) (PduHdr))->Flags |= (Flag))\r
 #define ISCSI_CLEAR_FLAG(PduHdr, Flag)      (((ISCSI_BASIC_HEADER *) (PduHdr))->Flags &= ~(Flag))\r
-#define ISCSI_FLAG_ON(PduHdr, Flag)         ((((ISCSI_BASIC_HEADER *) (PduHdr))->Flags & (Flag)) == (BOOLEAN)(Flag))\r
-#define ISCSI_SET_STAGES(PduHdr, Cur, Nxt)  ((PduHdr)->Flags = (UINT8)(((PduHdr)->Flags)|(((Cur) << 2) | (Nxt))))\r
+#define ISCSI_FLAG_ON(PduHdr, Flag)         ((((ISCSI_BASIC_HEADER *) (PduHdr))->Flags & (Flag)) == (Flag))\r
+#define ISCSI_SET_STAGES(PduHdr, Cur, Nxt)  ((PduHdr)->Flags |= ((Cur) << 2 | (Nxt)))\r
 #define ISCSI_GET_CURRENT_STAGE(PduHdr)     (((PduHdr)->Flags >> 2) & 0x3)\r
 #define ISCSI_GET_NEXT_STAGE(PduHdr)        (((PduHdr)->Flags) & 0x3)\r
 \r
@@ -129,9 +129,9 @@ typedef enum {
 \r
 #define HTON24(Dst, Src) \\r
   do { \\r
-    (Dst)[0]  = (UINT8)(((Src) >> 16) & 0xFF); \\r
-    (Dst)[1]  = (UINT8)(((Src) >> 8) & 0xFF); \\r
-    (Dst)[2]  = (UINT8)((Src) & 0xFF); \\r
+    (Dst)[0]  = (UINT8) ((Src) >> 16) & 0xFF; \\r
+    (Dst)[1]  = (UINT8) ((Src) >> 8) & 0xFF; \\r
+    (Dst)[2]  = (UINT8) (Src) & 0xFF; \\r
   } while (0);\r
 \r
 #define NTOH24(src)                         (((src)[0] << 16) | ((src)[1] << 8) | ((src)[2]))\r