Fixed GCC 4.4 build issues due to EFIAPI not being used when required.

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

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.h
index 1c7ad5676728b50a6e24a19ec794d521405dfa23..eefc5b37a8320b3fb48a1b6fea46f1fb19c05f14 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.h
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.h
@@ -1,7 +1,7 @@
 /** @file\r
   The header file of IScsiDhcp.\r
 \r
-Copyright (c) 2004 - 2008, Intel Corporation.<BR>\r
+Copyright (c) 2004 - 2010, Intel Corporation.<BR>\r
 All rights reserved. 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
@@ -26,14 +26,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define ISCSI_ROOT_PATH_ID              "iscsi:"\r
 #define ISCSI_ROOT_PATH_FIELD_DELIMITER ':'\r
 \r
-typedef enum {\r
-  RP_FIELD_IDX_SERVERNAME = 0,\r
-  RP_FIELD_IDX_PROTOCOL,\r
-  RP_FIELD_IDX_PORT,\r
-  RP_FIELD_IDX_LUN,\r
-  RP_FIELD_IDX_TARGETNAME,\r
-  RP_FIELD_IDX_MAX\r
-} RP_FIELD_IDX;\r
+#define RP_FIELD_IDX_SERVERNAME         0\r
+#define RP_FIELD_IDX_PROTOCOL           1\r
+#define RP_FIELD_IDX_PORT               2\r
+#define RP_FIELD_IDX_LUN                3\r
+#define RP_FIELD_IDX_TARGETNAME         4\r
+#define RP_FIELD_IDX_MAX                5\r
 \r
 typedef struct _ISCSI_ROOT_PATH_FIELD {\r
   CHAR8 *Str;\r
@@ -43,19 +41,21 @@ typedef struct _ISCSI_ROOT_PATH_FIELD {
 /**\r
   Parse the DHCP ACK to get the address configuration and DNS information.\r
   \r
-  @param[in]   Image            The handle of the driver image.\r
-  @param[in]   Controller       The handle of the controller;\r
-  @param[in]   ConfigData       The session configuration data.\r
+  @param[in]       Image            The handle of the driver image.\r
+  @param[in]       Controller       The handle of the controller;\r
+  @param[in, out]  ConfigData       The session configuration data.\r
 \r
   @retval EFI_SUCCESS           The DNS information is got from the DHCP ACK.\r
   @retval EFI_OUT_OF_RESOURCES  Failed to allocate memory.\r
-  @retval Others                Some unexpected error happened.\r
+  @retval EFI_NO_MEDIA          There was a media error.\r
+  @retval Others                Other errors as indicated.\r
+\r
 **/\r
 EFI_STATUS\r
 IScsiDoDhcp (\r
-  IN EFI_HANDLE                 Image,\r
-  IN EFI_HANDLE                 Controller,\r
-  IN ISCSI_SESSION_CONFIG_DATA  *ConfigData\r
+  IN     EFI_HANDLE                 Image,\r
+  IN     EFI_HANDLE                 Controller,\r
+  IN OUT ISCSI_SESSION_CONFIG_DATA  *ConfigData\r
   );\r
 \r
 #endif\r