1. Import UEFI PxeBc module in MdeModulePkg

[mirror_edk2.git] / MdeModulePkg / Universal / Network / PxeBcDxe / Pxe_bc_dhcp.c

diff --git a/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_dhcp.c b/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_dhcp.c
index 7dec5ec2d217f4f0e47015bb90fc9f5670e18c40..3c5b197c16a948237794f1c75ac4704e1125f55e 100644 (file)
--- a/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_dhcp.c
+++ b/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_dhcp.c
@@ -26,8 +26,8 @@ STATIC EFI_PXE_BASE_CODE_UDP_PORT DhcpServerPort        = DHCP_SERVER_PORT;
 STATIC EFI_PXE_BASE_CODE_UDP_PORT DHCPClientPort        = DHCP_CLIENT_PORT;\r
 STATIC EFI_PXE_BASE_CODE_UDP_PORT PseudoDhcpServerPort  = PXE_DISCOVERY_PORT;\r
 #define PSEUDO_DHCP_CLIENT_PORT PseudoDhcpServerPort\r
-STATIC EFI_IP_ADDRESS             BroadcastIP       = { 0xffffffff };\r
-STATIC EFI_IP_ADDRESS             DefaultSubnetMask = { 0xffffff00 };\r
+STATIC EFI_IP_ADDRESS             BroadcastIP       = {{0xffffffff}};\r
+STATIC EFI_IP_ADDRESS             DefaultSubnetMask = {{0xffffff00}};\r
 \r
 typedef union {\r
   DHCPV4_OP_STRUCT          *OpPtr;\r
@@ -214,7 +214,7 @@ OptionsStrucInit (
   CopyMem (DHCPOpStart.DhcpClassIdentifier.Data.UndiMajor, "yyy", sizeof ("yyy"));\r
   CopyMem (DHCPOpStart.DhcpClassIdentifier.Data.UndiMinor, "xxx", sizeof ("xxx"));\r
   DHCPOpStart.End[0] = OP_END;\r
-};\r
+}\r
 \r
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
 \r
@@ -473,7 +473,7 @@ PxeBcLibGetSmbiosSystemGuidAndSerialNumber (
   )\r
 {\r
   EFI_STATUS                Status;\r
-  SMBIOS_STRUCTURE_TABLE    *SmbiosTable;\r
+  SMBIOS_TABLE_ENTRY_POINT  *SmbiosTable;\r
   SMBIOS_STRUCTURE_POINTER  Smbios;\r
   SMBIOS_STRUCTURE_POINTER  SmbiosEnd;\r
   UINT16                    Index;\r
@@ -484,7 +484,7 @@ PxeBcLibGetSmbiosSystemGuidAndSerialNumber (
     return EFI_NOT_FOUND;\r
   }\r
 \r
-  Smbios.Hdr    = (SMBIOS_HEADER *) (UINTN) SmbiosTable->TableAddress;\r
+  Smbios.Hdr    = (SMBIOS_STRUCTURE *) (UINTN) SmbiosTable->TableAddress;\r
   SmbiosEnd.Raw = (UINT8 *) (UINTN) (SmbiosTable->TableAddress + SmbiosTable->TableLength);\r
 \r
   for (Index = 0; Index < SmbiosTable->TableLength; Index++) {\r
@@ -883,7 +883,7 @@ Parse (
   } else if (!RxBufPtr->OpAdds.PktOptAdds[OP_DHCP_BOOTFILE_IX - 1] && RxBufPtr->u.Dhcpv4.file[0]) {\r
     RxBufPtr->OpAdds.PktOptAdds[OP_DHCP_BOOTFILE_IX - 1] = (DHCPV4_OP_STRUCT *) (RxBufPtr->u.Dhcpv4.file - sizeof (DHCPV4_OP_HEADER));\r
 \r
-    RxBufPtr->OpAdds.PktOptAdds[OP_DHCP_BOOTFILE_IX - 1]->Header.Length = (UINT8) AsciiStrLen (RxBufPtr->u.Dhcpv4.file);\r
+    RxBufPtr->OpAdds.PktOptAdds[OP_DHCP_BOOTFILE_IX - 1]->Header.Length = (UINT8) AsciiStrLen ((CHAR8 *) RxBufPtr->u.Dhcpv4.file);\r
   }\r
 \r
   LocalPtr.OpPtr = RxBufPtr->OpAdds.PktOptAdds[OP_DHCP_CLASS_IDENTIFIER_IX - 1];\r
@@ -1421,7 +1421,7 @@ DeclineOffer (
     OP_PAD\r
     );\r
   DHCPDECLINEoptions.DhcpMessageType.Type = DHCPDECLINE;\r
-  CopyMem (&DHCPDECLINEoptions.OpDeclineEnd, &DHCP_REQ_OPTIONS, sizeof (struct requestopendstr));\r
+  CopyMem (&DHCPDECLINEoptions.OpDeclineEnd, &DHCP_REQ_OPTIONS, sizeof (DHCPDECLINEoptions.OpDeclineEnd));\r
 \r
   {\r
     EFI_IP_ADDRESS  TmpIp;\r
@@ -1470,7 +1470,7 @@ Release (
 \r
   CopyMem (\r
     &DHCPRELEASEoptions.DhcServerIpPtr,\r
-    &(DHCPV4_OP_SERVER_IP *) DHCPV4_ACK_BUFFER.OpAdds.PktOptAdds[OP_DHCP_SERVER_IP_IX - 1],\r
+    (DHCPV4_OP_SERVER_IP *) DHCPV4_ACK_BUFFER.OpAdds.PktOptAdds[OP_DHCP_SERVER_IP_IX - 1],\r
     sizeof DHCPRELEASEoptions.DhcServerIpPtr\r
     );\r
 \r
@@ -1729,8 +1729,7 @@ TryFinishDORA (
   //\r
   DhcpRxBuf = &DHCPV4_ACK_BUFFER;\r
   DHCPV4_OPTIONS_BUFFER.DhcpMessageType.Type  = DHCPREQUEST;\r
-  CopyMem (&DHCP_REQ_OPTIONS, &RequestOpEndStr, sizeof (RequestOpEndStr));\r
-//  DHCP_REQ_OPTIONS = RequestOpEndStr;\r
+  CopyMem (&DHCP_REQ_OPTIONS, &RequestOpEndStr, sizeof (DHCP_REQ_OPTIONS));\r
   DHCP_REQ_OPTIONS.OpReqIP.Ip = *(EFI_IPv4_ADDRESS *) &RxBuf[OfferIx].u.Dhcpv4.yiaddr;\r
 \r
   CopyMem (\r
@@ -3169,13 +3168,11 @@ BcSetPackets (
 {\r
   EFI_PXE_BASE_CODE_MODE  *PxebcMode;\r
   EFI_STATUS              Status;\r
-  EFI_STATUS              StatCode;\r
   PXE_BASECODE_DEVICE     *Private;\r
 \r
   //\r
   // Lock the instance data and make sure started\r
   //\r
-  StatCode = EFI_SUCCESS;\r
 \r
   if (This == NULL) {\r
     DEBUG ((DEBUG_ERROR, "BC *This pointer == NULL"));\r