Clean up the private GUID definition in module Level.

[mirror_edk2.git] / MdeModulePkg / Universal / Network / IScsiDxe / IScsiCHAP.h

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.h
index cce7e5a3248a793dc42a36f887ecf2951869150d..59d514fe188bb824b16564086face23320656363 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.h
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.h
@@ -1,8 +1,8 @@
 /** @file\r
   The header file of CHAP configuration.\r
 \r
-Copyright (c) 2004 - 2007, Intel Corporation.<BR>\r
-All rights reserved. This program and the accompanying materials\r
+Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 http://opensource.org/licenses/bsd-license.php\r
@@ -15,13 +15,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _ISCSI_CHAP_H_\r
 #define _ISCSI_CHAP_H_\r
 \r
-#define ISCSI_CHAP_AUTH_INFO_GUID \\r
-  { \\r
-    0x786ec0ac, 0x65ae, 0x4d1b, {0xb1, 0x37, 0xd, 0x11, 0xa, 0x48, 0x37, 0x97} \\r
-  }\r
-\r
-extern EFI_GUID mIScsiCHAPAuthInfoGuid;\r
-\r
 #define ISCSI_AUTH_METHOD_CHAP    "CHAP"\r
 \r
 #define ISCSI_KEY_CHAP_ALGORITHM  "CHAP_A"\r
@@ -37,13 +30,12 @@ extern EFI_GUID mIScsiCHAPAuthInfoGuid;
 /// MD5_HASHSIZE\r
 ///\r
 #define ISCSI_CHAP_RSP_LEN        16  \r
-typedef enum {\r
-  ISCSI_CHAP_INITIAL,\r
-  ISCSI_CHAP_STEP_ONE,\r
-  ISCSI_CHAP_STEP_TWO,\r
-  ISCSI_CHAP_STEP_THREE,\r
-  ISCSI_CHAP_STEP_FOUR\r
-} ISCSI_CHAP_STEP;\r
+\r
+#define ISCSI_CHAP_INITIAL        0 \r
+#define ISCSI_CHAP_STEP_ONE       1\r
+#define ISCSI_CHAP_STEP_TWO       2\r
+#define ISCSI_CHAP_STEP_THREE     3\r
+#define ISCSI_CHAP_STEP_FOUR      4\r
 \r
 #pragma pack(1)\r
 \r